diff --git a/Manifest b/Manifest
index 381f680e50b2..1477cad5067d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29432 BLAKE2B 1b79a2c3186367d07dd849b3a302228165c1423049f57afdfba5d01c0d4e4c6512dd2ca641993d38e3d28451ace9c20275c0d6a19480896408be9b4d0ea632ef SHA512 2e6042f64def4623d0373707d1e782dab899095614d69f5dc2d6cc5ec8e9f4914dc8f65b79f582d234e46e6e81c41d5afe5d037387ec48e3394ee76095456ec4
-TIMESTAMP 2020-07-31T09:38:27Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B 293938884d29ceee7bb9cab79adb545029353b2ecfee5428584f9b96e3671443208351a67fc4a100aaf22bf3ea56ad8e3a48bfc3f551a2fb5cbbc026e7119fcb SHA512 b0c8b0e6d295bd1b72c2f48170decdbf54d87f5f02b77aa464ce5647117c1ed87b7bd5a5bc6969507154e66f42cdd415dda97f62d0a8e206d7de27b9ad51ac15
+TIMESTAMP 2020-08-02T16:08:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8j5pNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8m5P1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCVhRAAl+Ehvbsk+cB02TSfhn33MOySOHfAKQ75LcvHyjoscOxhNASLuhU9F3p2
-RdHLwNjNeW0lk8t8G9MZiCEFBcLkDFAeLq3oI4rlkCPVLuHpWlHnQ2OqrjMFMw/h
-KSChtZuQrbpxrmMJ32uWIA7MlAS8vOqMLYCL7XxWp7H8Y6124OBqmHf9k5wtZvum
-SNTGTb/fJczXiXEmlXnv6rZlOeux8W7Rjfo062W5cvC5LYgHpmdnsOvPUX6AxsHx
-dNWGdlnU7SOplyLgjCEti77zfj586q0XJT8EvWx0n5zQNG/BxOeuk2ulTaksZ+dc
-2SGVoyR0V6T1oZVUhgcYUw+BaIjtoyv0T7u/+zfe7zPYNt9cv+vdQ6zMonSvFwMj
-ikHcqIlzvSSAkgocpk6yCEvjjL//JgTBCxBfZFKwE6UmxQzE3zJWjIf1nmyZP5kZ
-WxHr8itmfyW6ZGUNUAjcGsdmhsmTHXvRYLVBfJNTPC86KbG9RCb24qhR4QcrDZab
-v5i2PUjSwOuxKuzsiw7JN8MURytgT88+S4Ua+SvYgX/UjZf/W/T4K+rj4BqaWd4i
-f/3PzxBnVfcPBdqaF8OCXYTh62ZMe1D/WnbdiE2ouchZevDD2fVqyAQNd5xDkdXZ
-4lep5n9I7pEQBRb4YGb9QfSg+H0489B+eyd2I3BfbFHSZ7Cr0Zc=
-=h3Ca
+klAxXA//TnkW5e6a9iQihzYDHxQ1mf/2+hgts7ED7l4HZmAioatEWTvc4mbLFD3m
+DiCyLiA+UYlxUAyHHjygAJsJdVR/wh3oaCjvOuIseJ3xjTiVI9SbAW03U4dN1vDD
+wpjwCelpt8DLMSKuCZv+j60/96ib9+0Yw8OxHPfnJ1Dk3z5Z3Ls+ND4pUta6tMaO
+B+Sy4fiJCzRSeYaR/1Sp6SqgGKxYe2i/wXCI7/UgyDQCdF0tmsp7obQg52a9tZYA
+OP/E+kiEntioO+OIlaxAixkOX/CUtlF5JXWJIouIuoE/FdM0vYOGlRXkfJxZrzf8
+7CCQM6S6JU0eVBt8YhecLKpC6YaZiy5n6bkXtVvtB3muvpCqdEZBfYpKTwGCatWI
+Oa5sCf2xlHOrXHOsqQ0qfab0BHKFhspXGigkWUCN4D1xDaHAvCw3qT8BANx50f5z
+zsDT1SdGjTYHuOX7FsItIlyTUoVgSbaO93pI0JuiVOrETt2t889AUG29tvZtkUOe
+Xg67utBbAU1MJ/7GL0/n3/LAeUUTmT5RGeOU+HmgGNGlkdecUP/GBdPgluBTtEjg
+cntsRO+JRuPguu1mibRrxl5OUxaNB6+UD670R4aTccEFeEcTQYIG9rvoHgh9nofI
+tCA4NHm1lce1qEx6ko/AYGlNejr54uhpTcxJxwZPBNpJaxnBeH0=
+=oMYa
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 73fa587b184e..ddc515ae5f61 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 87ba01f8bc3a..477ce7220862 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 803ae3bd2f06..a4f60b1bdb28 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,5 +1,3 @@
-DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
 DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
-EBUILD accerciser-3.22.0.ebuild 1431 BLAKE2B ff37785fb67fb66c82d04b93d6c08953cabdd67d84e86a36ec69b30a99a1d6aa6a62812deb1a6d020b1e87ed31d818fe051e313684ed2b22c52a32f4e9d08384 SHA512 96f8f708ec564fef31f3ef0c0234cf94d1883a38c8327795fd534df5738b3135fbab2a70e1f15c4c43575ee689b39dfb16f468859ac19daa8fedb756da47db1f
 EBUILD accerciser-3.36.2.ebuild 1144 BLAKE2B d54d49f4837aa5bb830cedb649e9007904cf8b510bdab8bd8c617e5297b68ca3a2fc3421fd8ea52c6043a4ead7311a72177d16e05081f8fecc569ac20338621b SHA512 c8ace1376b7f20148a22b2c2d10bc32d306b18def85366bb0a6e9f4d34851850b8190f465d375969ae7799d97f44099ef8c809e3039ed181b82716db944a00c3
 MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6
diff --git a/app-accessibility/accerciser/accerciser-3.22.0.ebuild b/app-accessibility/accerciser/accerciser-3.22.0.ebuild
deleted file mode 100644
index 9acb9c3494a6..000000000000
--- a/app-accessibility/accerciser/accerciser-3.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection:=
-	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_doscript src/accerciser
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 12a8513fe8d9..72c16927f188 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 686befefc59b..d49039d514bb 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -12,6 +12,7 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f02
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
 DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b
 DIST consul-1.8.0.tar.gz 24065255 BLAKE2B 2e6dd72d5cfb235b5574fdadee9dde44c602604409ffe023d7032d56e7285a82efa51df26bee09ac07116daa87738867fc6fb8052339c35011962f3a178f68c7 SHA512 29f678bfe9012304f5eb49a47c2f2e799268bb4e98262d38b21de88a8bbd51d7035bc0eac8fb72d0a78526e1c2f83d34e897023476871198c543cb9ac43308f1
+DIST consul-1.8.1.tar.gz 24233215 BLAKE2B 55647f845165cced83df395c98df78706245f7a01de26b2e9eeb31576c66612c476b4c4d38811c10b2c4a827408ab77dcabf2682a9e70dee7c050a0b330f25f2 SHA512 4a1839949e2428ae8c1565c1230feec4bf9f737fd0fcd164c1d1f5960ea30a809c8d97bbcf628f19a12dedab444c3cb08eee28671929e611e5d508b7363586bf
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
@@ -48,8 +49,11 @@ DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B a
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip 27548 BLAKE2B ef103ac58733cbf5daa09f5c67cfa3e9256c96b884b63cc039cd644da9f039d78a5047b6473a43bf88c421b3e6a7d8faf5b8b845adb99fdfd7c8558a7b67336f SHA512 689c6ae1c9872dff6f065f1123b8027e77006080a3596359495c6466c6254e85250882e6086b8f9e526ab94c25509c0cc22350c9cc0778a3214eb746474cb0a7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip 34337 BLAKE2B 7caec3639ca080f2da9fe83a9d7d68d7038d5f926bace22c149a52b0c1b09e97a9c37c1c408a77add3391412249f74687ccb8237376122ae307e899df1e09e04 SHA512 f16a6a25abaef19382e50de8c791947ef9d65ed69c275bb20b38aa72c03e6b161b5db1974908c223cb62d393eeda0d9317f6ca9ab1db2fc5f7db5e967e3d730d
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip 97335 BLAKE2B 691e694645968e97b76dd4a58c58492b59a6caf782d340d5a129dfcdc11fb8dc0ffff8f1c751ac484459cd6bc369404eafb4f551198f6e7fdfe612ddf2ac33e3 SHA512 a237b10fad4da7a4571191cee1f1ac77597d73211c8feec5bfc69293640a707b9370d7360e3e4f2ef3d7dbfabd74ccf63de032c9faa4ffa3c0b0c00d6de787c8
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
@@ -63,7 +67,9 @@ DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
@@ -71,6 +77,8 @@ DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.m
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip 44404 BLAKE2B d1706e84ea1345f4e4b76abe2455a85f798dca31fc628a83545f15aed99b2174bf07b2f62bfff7a4baf6c250e0c8d8009991194ac80a7cfeee73c9ef78d07340 SHA512 3f51d990b087a3762eb6895c8afc118a62af946f889a9f4bae0dc74b33bfa43c7a8e7ee50e97013871d67914a7f1986e500501ca7462547af301526f427f2853
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
@@ -81,16 +89,25 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 3
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
 DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip 148431 BLAKE2B dc5c356b179df55561c4b673f7c9b4e7eac70388410f3ead0c3a23165450d12154cdcf44eae51550e8e5f0dcfa92fa4df0439a320feabf8b00a6aa6afc134401 SHA512 51705b4747969ed96b7233c2c0159e8a81c6be1bd35b68e3058fcd9440185df30105293d9b936388aabf9bfefe9670cd930c608ad4058e0285f9b7d2d86352a4
 DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
 DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip 10851 BLAKE2B a0ea711e6fae09612c3911f4526816c7decd163860d5c8bd6c7cb55d4fe30c485d735bc76b817125a8bed9388e17e48fd595dabed55e26b5d7b685f5fb9bf485 SHA512 2908d5b1f9beb4fed31923fdf77ab83d7c992245c4bd08b7655ba3fef1ac0ccefab66fa4c7b06f67a7960e16069f611cb44ff1d9a675bdd2750934349752a030
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip 26805 BLAKE2B f68c71bbb38278547c7a368add92e11804104997d345c14a2cb312ebcdb18e65182fd80ba1ab3dfb3582c846950928ce4283c754d6a3103d6616da0e144704da SHA512 7620504cccb3bb0f0b008b6e75c6a0d956c3cab12c4e811f51212553ec611a5410ee5ad09393df0c82c62b0c6ef786649ad879208d004730f1f0419628b241be
 DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
 DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod 34 BLAKE2B 5f659e02eb0784f23fe0fad723264f2f4ac4e6e9fca2ee0ff6506942de9e4151f91cf7a2f765cd5c3e163043aa649d350404d9240b5dbfb8a9b56eeecfd0e248 SHA512 b61915bf1e9b8a68c240220d89dcb923bb7db6d61cd155a81530daa0316ea03c1e4ad2571725907b4fdbd4603c3ce80ea6752f38a029168aa4077e5fd3b27231
 DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip 594850 BLAKE2B b887705e8fc4a6f9714dacc0204c28efc3fa6efa4588237392badaca453a152dcc9571adc7d6d93c68b4ba06e337707109842b7e9429808a17ef89b90dcdbb68 SHA512 79c541bd344a1cead5f01876786b48dd7052530489636c2eaae48e45e3ee86289bb6bcc0ae438e959a74224763e514af49bc1135958140238595d2f3289f9593
@@ -130,8 +147,13 @@ DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mo
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod 512 BLAKE2B c7472d1e964bafe7b1068ad6cca64400ebbfde84b832db39d05627260a875d8feaa67f75b553d9b0eff1ce7d220f164e174e769c7d22b0e6f198b203297deabd SHA512 4fc9800a1d670734231fdcd8c482801c4a776b275f1843800196f8f793cc747be995364c661f2cc1035f6e263ae117ce2889c8d5f33bb834e664f913a5f90f71
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip 1029374 BLAKE2B 750b1245584cd4e94a0588e2afa05ddcbe35b9c1f18a2e68fd679202b969e375d57972c4970e976c07e9aad233fe618b99235349ceb80597b0e5323c12145d74 SHA512 252200d3ca3157e483f944e34e2b62184112e129fd4018859b0bf9a213e6a055fe2730a8749c74c518b67647d8949c8e584e75701966d6acb8edb6e9546a3c50
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod 471 BLAKE2B 090acc4c9e35d2074ec7e5f821440bcb960c6ed7485eb1cd2587e1745536cfd57f78566275aba7854b394f629be4e053ec314bbef9f4a0c33fd6fd96fbfc6b0a SHA512 7ac07e70b1ff9b9efb434c2c1d3eac4996ecf49b6dc2134b8bf29c09a8ff05193421678eb7691a86c7c141f7cda73d0240b010854bc749c2bbc4b83e16a31358
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip 1896223 BLAKE2B 2212f443d2f122e5265ec338676c2a37f5ccc953b812a0311dfa7e34f44e3a360b375a8c0d1039e943e2a04fe550111a87c023bcacb145f981c5ef5f33eb7882 SHA512 7b7c7ee5d55adde09d1458e01ff4c729d060c38dac40254bf838a2547cac63ecf8b342700b7a4a93001b13b3988bdbe18fa88a56c549b7dd4022532c37cf45ad
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip 183662 BLAKE2B ea6ebbfab900f51bdab7a962e0ef59f1822d7e2b452f7340396206267d0a4f4f370ab331665358a8a3bd77765b5e3d38771187f1bc839dfc68ce34303bc63f8c SHA512 c0af221cf2d1b13502ce26ec4a63bef9337d2e76d95d73424663a553425b172ae25ac7426c27d15c80c70ba19f959889cb7c81d5671cdc65bd855194f1645e03
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip 194391 BLAKE2B 78828261a7d5bee8399f689ed8de5a90e1a74e54a935d166078a477c79aaacb04663382c8531663a5ec8b3d225bd9e11e3ee4f3eb9fc94b2714fd6c8d34e9a25 SHA512 6091a63fbfe97f1b9bc5a9524e1065666ce653ae85b9dc7999f322f08dd48fe1959be515d2daed0dcacc3a83b80505dad5cf5a9d190cf8136a7a663a460806a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
@@ -145,6 +167,7 @@ DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod 31 BLAKE2B ad0f7f1eefdcb8962e8a70fc9d27b8c4618a2374e588db1afa039cdaa34b0b612b7249adba1cf61147e46da5dbad1edcab05085d503c7babe31745de553c7f39 SHA512 42b1f72e0d2eade3b2ff4d6689be08a404e8ee9e565f2f9e141d20e11d2f6865052fa5b829712647662204f496cad00a57fade2003c321b76929773a2777e4ab
 DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 55812 BLAKE2B 404048ef7688e941201d56f92e82c122e33b680bb31b35dcb0ebfafe45ae2fb27d1392198a0b6006cf6769fee17857ad87d8662da0fcc5dbc5d52ae253c1a5c3 SHA512 3aa4ffedc9412d199b82e68581e1cd357b23e1b89531ba3014c341e5c446a230c21baab253fdb7aaf6e4a1cd5d7c489cfc30d8697ec6f650a0743b6b0e038bc7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
@@ -180,6 +203,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -190,6 +215,9 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 9257 BLAKE2B 4082e7b230ac5242c79ba7e1c2ed5d51e76b5cfab0e0b366aac04daeb99d77ce6d2e78fc9ba5d6b7b470cad128bba917a914b6a11ed532559d108e8a0aed3cf1 SHA512 05954f59ae284c142a0526af3b155e78f3b9728fc016e9fb7a8294214139a6268fa8012a8be993f5ce4854022e15eb5d58ba1b1c7811305d575fb69878149ff2
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
@@ -245,6 +273,8 @@ DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip 26063 BLAKE2B a8905f3ce68e07fa295a303cdb9ac8f78f746da9f82e32e44a227dc57608e21dc2a95d7e33f1daf1f91d5dff32e1dfa3a95eae3730e590cb3723f46afe51ec56 SHA512 b374cab2eea5ff0b1b314822094f872df5c07479553611722fc4dce1aff98dd36919f8c1e8d8d36ac7c7da9a51e95e2f6ba971d2f0575ac5f1cad1ceec3d9f13
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip 27085 BLAKE2B 43d07f0c6f351d78cc4bba75c1392574b537a5b8c52b1a86311092ae01cef11c2debc002d1cfb3f71bb74d262e2c24745ae3467d92d6264b5cc4f381a362fc74 SHA512 d5b1da656921ab950265b0789a70232e287b263c61e46122cf0ff2fc7fb294d018909bbdc6988577be990870381c65999f8c9df0d05ed48efe4fc313a28e8f90
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod 102 BLAKE2B a2c5aaa93abab3743458479bbaf9ac71dc111ad72793721fadda1c55bd0c6c28b26ff797f0d79c5a045a6893566447aaff76685f73a0204c9bdf7ec52ad6e56e SHA512 8d73ddc435d2a93ce4daecda7fb2eec3a8cb0ab4a1b5c83f14a514046ccdb52358762c70e72da91a15ad1b970bfae8cc9fa775ce4f87b9e4afbe54075961306d
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip 39600 BLAKE2B 134b58a09e3417ff72b1568d798d63d621d15a069c69852dabc9950dc8567d2f6eed06a0110fd058b9e9f289fbe9213b35977293faf770b0bc1e887161aef0a9 SHA512 b22f0255a075b7666f10b542fa810d99ab2cd15bd49697330e83199c63d2fe21c317247ae03f3814d5ceb4194a9afac96f4b39422f12d669a9086f96d7e2d28e
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
@@ -281,6 +311,8 @@ DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod 32 BLAKE2B fc55666bc550b3f1fb19c148ddcee24a0bde3bd4fac2e7e651bdc300d6bdb5ae0ac88c51b19c905520498e1ccd7bf4846bdfa4d2cd6464ef7dd564dad2fc06cb SHA512 b584d1f966117184e44883b0c057f3a51323e9a6f5a4223655ee1c4e7b5928631d3121abce2505e2a58219cf531d75ad63d3e7e05c12982d73095d4cce21736f
@@ -306,6 +338,8 @@ DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod 637 BLAKE2B 66ea021f5ca48fa
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.zip 548050 BLAKE2B 3c0d1ac113ab2219fad328e7935ef425bf4d5d824dc3ca530d5b39d55fcbe02bae261be2d100d43a3086129afa9094532c32d426ccb7d4fd3ae3a7667780aed2 SHA512 0dd3888646caabe9e65c4d7b0465fa42b76147405dda435f2bfbf688c2b8cdebf3c6e960108f2d0727a1f333b2fd4aae11d75511c56839757671c8033291cad0
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip 549210 BLAKE2B 72ed5b7d30dd04c6fe9bff0811d0cd85790379850fa3b635a9371057097716f1171e70e1a8e1ed54d3e577a28a600de1dc51d263a7534a0b92a8faca97f8700d SHA512 6b4e0ff25e43c00d063c54827b4683732de82cd09366152fa8cfea74cbe874155e8b8323f4878dbd1c5ea208843a24af71bac009362ce23872767208788f17f0
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
@@ -339,6 +373,8 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
@@ -409,6 +445,8 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f7304
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip 28419 BLAKE2B 401adf54267565490e3df3de54063893cdc3dec5babdd5ac4410a85ef16a65dbe13168ffe85a78ed9cf13d02cc873fde44fe5927c691b99587a96dd49aa3ce22 SHA512 33509ea85f0e0b364d5844f27ee5616d53b4665b75851a6a860169d5cb08f9c1e531ffa0b7108dfac4098e17b0d641dfe6ff824ae7abd0a9ee4c1ab47848a1ab
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod 104 BLAKE2B 22fb94f808eec8235c32993a7348c9ccaaaadb1d425ed711b42b30c4f72c214ded4b00f09a0801a07132944675da4b5150c76992b38e3c09c6b33ea9dda995b3 SHA512 bd4fe6712436e85787eea6bcbfa7eb9d4b63e06fa1bcfe357778fdce536d8cd5080b00a41f98f1634b26c1e1e0f2444255fcfab11d0a168678bac405532de5b9
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip 14397 BLAKE2B 9e44364de4d4fc682832d57a60475d3cbc44f1bd64de899dd6857d2bb576d6a64b918cfd6d0bd950f45a30b49715de3d498fc7533279cb0260a4be1abe6d725c SHA512 4482a9382f9a95f747c1f895874bbc317296f0e5c0f34c74f7dad4c6a1cbf70a491d0edb0267523f8bce6e4f519f18f5961ab6206861631575df59f49ac9c701
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
@@ -468,22 +506,32 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 193855 BLAKE2B 99
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip 211100 BLAKE2B 82df0588c836241be81b4dac2a5a5fbef1d358c23d9443f9ec516e87cd618a9af9a9c6fbf891f679d4ffac2830e5a0915d397f131db37db9f1327c5f2a3f03a2 SHA512 84caa262ad3014b633f4cbb3deafaa9a2ea486b2d8d4c871994efaea4ebde04a15a025a03e4996863fb294744b38ab647aca90b3d29814dfd52f4d63ac0f709e
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 132691 BLAKE2B 9bfe80a4f61a6b7a2e0dbd235e1a05ca032982ef14a9989c415ad143c84c42cdcace926a5683f2273b84c5babe8c0e5b95c680805324217a7afa18b3c82b0bec SHA512 4459c32fb8b90650c6fca37477e2ec49c5e3eb68a8151c88099017fd2c9c13d2a066bef75061a47ed27398e96aa40a6cbe2524146ad1f315d94d7359d0a7ba74
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip 161521 BLAKE2B a412eaeb17bb3e932cb53393de6eeab563068918c9ff384ce32d2caf958b3e3e472f554c70b518b472663f42e2060a97062029e55b694a6c93a67af4eec2d626 SHA512 692c2ceadacddee42e9415892d7eaec95cbf5319db3cfd6b5406b39c99df942b4dec7095003ffb8a36a82424b9ebb312f8bf28913ff902320cad2253337e899e
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 103337 BLAKE2B 0bbcc8096a261b4697bf5cb23b3141a885a5d987db3187d776860206ee796c41e78210e5e36942fdee76862033d629f2e2fbe72522a50c846aef973c22ff6d74 SHA512 132a26cbef951377102cff398932b442920500d12e80ad50bbe05ced623d1618e0d56d95ec5fa36354f4295ef9757e4750fe91a25add4f2175d12e6245269425
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip 210499 BLAKE2B c21ca6fdd64535b648cacfb74fa2d23d05d493703cb7b775ec014a9efcf3e07557e0276901db2c309174f12800c6e2f438fadc5054f0ca233c65d3523937bebb SHA512 f9f9fe1e114a4e2fe4d27a836d3989b838b1bad72cbc1652570d26ac9253cc26aab01ca28c949b2c4441a7cb17e87c1689d21588093836873350d7342e8d543b
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod 85 BLAKE2B b5702bb668542b4c88cc63201fedb0fa72a00f6134ac660f5fd392e425a61e4b94a1fca8df1917242f2d6b83b8f810b20f3524a870d1ae1d67fc04ba718abd2b SHA512 0649a85ce1922565fdb4f3eea0c095560bbeb655a382ef6603cfc0fbf1ea4053050a17672c30e91e62ae7816cf178fdcb00e7ef395cfdc2245dad5b63f835184
 DIST github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip 6533 BLAKE2B 087713f137203900b2118c96d7cbaa0a0279095d236ef3050cf4accdfbdec03711917e898da4363851b01c7e0b4144f0848cb1fa5599bdd126504f415699b860 SHA512 8e0ea31f6ba2b89da5c78033796d351279bd981437df2ad40d1c426fdedb07b006ed90318a6429030cae2ce0bea4d0cc7228c22887f4d137768527baa7f8598f
@@ -540,6 +588,8 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip 1101286 BLAKE2B fedec4637e5f7bdc4edcc0cbbf3aa451125c95f932d81316351554bbce5b45b68ad359936afbc5d46d602e5cab4a7534fc8a80216a713ee8b364e000ceef8d65 SHA512 6d848faf0c554bd0a1818108b58f15dac2ea8378f5dae46bc1943e48319f9dbc87e2ba2efcfbd45b5c74e3f70ee8702c28b521e3fb2442b52c949bbabdf85d84
 DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod 36 BLAKE2B 5eebb18ea03bc58198d1b18c741aef83b26e69166ad294d9fd109990b528bf96e38ac47e03ad7dc2bf74f763ac292bee5745f8e12e087330225363be9c528bfe SHA512 15a75be7ae2d3696bc36a1bc1f4f26628d9b0af57fe5845df5ac329690be5d0f60ee88ddc43cde47bdbec74afe8d0e3b9a6ed531be640ef8bced3b3cea85f4fc
@@ -557,6 +607,8 @@ DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d73941
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
+DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip 24023 BLAKE2B 4e847da3c0de521f65e74beb03b24f9f3707abf1ccc6740b18e9109a28dd0300effc7ec181546b5cae7a8fdd5e5358b753d69e0a17ce5f18151e6e2c6c930ff9 SHA512 d8bb8553e96f2c7e4feb404db453a35c1ad42590f36a6e294f238282c8c02bbae2e8f524767341ac20ca6d864b58c46572c3e2236c24cb8d10c710528f18161e
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -577,6 +629,8 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAK
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -592,6 +646,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
@@ -609,6 +664,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -636,6 +693,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030 BLAKE2B 7c223aa748649c75cfd8e921bcb10cdae7b52fd8d9096c7a5a0b0a167a307a4813e7b0976647e2d70c658f1a75e9821f78f0969c9ef73da3d498d6755d504f2f SHA512 43ed7210474ffec7b4f9a0dc29e9f4ae5f2ab6ecc5b9f02ed28d9751d8f11e3cc27700e5b0838a76f450d9bfe074d56176d5140daa3f3d40b287695ebd3dec18
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -661,7 +719,11 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip 2908944 BLAKE2B ed5521ac56f8fb0bdd6404dcbdf90bb0281367b3afe1075784e09681a9a2e24bfdca192b77ac0870f50df900b3fb3e3116cce6ad109f75f4fe0286c820c46cf3 SHA512 8cb13d39ad71c10de694ae288d5c2374426e8b674d6968b02da1fec13d2c7637bc105d2ab509acdd856c747ab8c804fb5fd2a1ccdbc73def16dfc568ef1732e5
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip 10163656 BLAKE2B 5bc64691f0fea7b5457b2f1e27257fc52e6393169e3965beb422e15ab293d50bc1d49ff40a8552249182f00af6cc91851729e388ca30d1ac1367cbbd64874ab7 SHA512 3b6c2b3e08efdaba51ec595726141a0dffc3a07df10930aab028cd16055b71a3a89dbd070c55e09d87c32eb46b0b4e405c560571f514e1bb743d116164b2a546
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
@@ -682,6 +744,8 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.zip 5368804 BLAKE2B e90b748f207fbfe06043e6fd048295453416c364f6b1de925ccc06652738f050c64e357a0fc25374ddf21151cdc43430200f71c5228dc9fd35f5e63df62366a2 SHA512 f1b58eaa7b6ffe7a4c9fff15546b4409b5b66649078a8f64e659b37c5088f09bcd2c2c4315fce80876be4a5c069261478214cae28e0afa803f8afbf745e4d321
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
@@ -690,6 +754,8 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd00291
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip 1053293 BLAKE2B e4e5c8bae0f39f767f6540659b58a82def27b93eb1bcc9eddd77e9a009af2a40b412e38200633410860ef5e6d02e9f180be190ca0f7d2d44fb687a8027babfe1 SHA512 aa3b29dcb253ff9b89819d888b176378cf62a386e99800395a5ca54b03d152ffb3e591f78954bf241037c6a55497317d089c50c971a342d4c821e93495b9ac50
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip 1000340 BLAKE2B dfc5083cf762cd6df1ab2d43d6d45225db97754ec1c165970563052be25e3655c365dc5011aa7d7b0b2b72700aa1759361155f2dcd34bd1941357fa5ac6cba49 SHA512 a13a30ca3ced87795e4e31dd43eea70f6ff42bad5795464170377a1a0e9fcd9029f5d2ffbae18dff2360f6f290bb6ea320b075626ca13a50899365f3d38dc3eb
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
@@ -715,6 +781,8 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -748,4 +816,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 EBUILD consul-1.7.4.ebuild 25708 BLAKE2B eb083e6c49e6c4d062bb15a475dc88fdbeaafd394d396d17c245bd14eeaa62c31dcd598b9baf7e2508dd78e0c1f0ba8b05415509b38caedb9e3ca759ed74822a SHA512 7791c5ec933ab4cae9f108c04506d0e57a0abffa4b3a0956cbf4cabef13af69decf000ae1ff2e273585b80ceb61849bb4ef8c31fa8c4dd35b0423fb794f87937
 EBUILD consul-1.8.0.ebuild 36543 BLAKE2B 334022150f621a6c27db79789164c8b618a9cc0f0863357c8b37ff5cb9e242b4c0e146cb56255476dde9e607067d97b6b89f9682466a154f2f5d28747d9e01b4 SHA512 470377dc362892d28e412efb6ee7caedb15f02096a668b395550bae90909ea18763157979ec0ac9f637188bdf67a0ecde006561aeb1b250e52bb1b79a4601be5
+EBUILD consul-1.8.1.ebuild 38943 BLAKE2B 5942f501455a6ae5560049a8db5f59641d3d713026b209fd2b0f54ca03eabea94b15e1eb6c91628105b5a18bc5a1cc49bbed42905a750329ee434be9243d8040 SHA512 d33bf362152b7882c8f3e3a96b366aac394440c62d89e78a8daa1b19ee3c275e84d5b692af53c0f515a034501c66168769c5e1a8fb6ed57b30a0ca75455575dc
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.8.1.ebuild b/app-admin/consul/consul-1.8.1.ebuild
new file mode 100644
index 000000000000..164d786e8cd5
--- /dev/null
+++ b/app-admin/consul/consul-1.8.1.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=12f574c9d
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.3"
+	"github.com/Microsoft/go-winio v0.4.3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/NYTimes/gziphandler v1.0.1"
+	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.3"
+	"github.com/armon/go-metrics v0.3.3/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.25.41"
+	"github.com/aws/aws-sdk-go v1.25.41/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+	"github.com/cockroachdb/apd v1.1.0/go.mod"
+	"github.com/coredns/coredns v1.1.2"
+	"github.com/coredns/coredns v1.1.2/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/digitalocean/godo v1.1.1/go.mod"
+	"github.com/digitalocean/godo v1.10.0"
+	"github.com/digitalocean/godo v1.10.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/go-test/deep v1.0.2"
+	"github.com/go-test/deep v1.0.2/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.2.0"
+	"github.com/googleapis/gnostic v0.2.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-bexpr v0.1.2"
+	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-connlimit v0.2.0"
+	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+	"github.com/hashicorp/go-memdb v1.0.3"
+	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-raftchunking v0.6.1"
+	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+	"github.com/hashicorp/raft v1.1.1/go.mod"
+	"github.com/hashicorp/raft v1.1.2"
+	"github.com/hashicorp/raft v1.1.2/go.mod"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/linode/linodego v0.7.1"
+	"github.com/linode/linodego v0.7.1/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.3/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.26"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.14.0"
+	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/pointerstructure v1.0.0"
+	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rboyer/safeio v0.2.1"
+	"github.com/rboyer/safeio v0.2.1/go.mod"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rs/zerolog v1.4.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.1/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/vmware/govmomi v0.18.0"
+	"github.com/vmware/govmomi v0.18.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.0"
+	"google.golang.org/appengine v1.6.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"google.golang.org/grpc v1.23.0"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.1"
+	"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.5/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.16.9"
+	"k8s.io/api v0.16.9/go.mod"
+	"k8s.io/apimachinery v0.16.9"
+	"k8s.io/apimachinery v0.16.9/go.mod"
+	"k8s.io/client-go v0.16.9"
+	"k8s.io/client-go v0.16.9/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 23b37e18a0e9..d11a5ce261bd 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,7 +6,9 @@ AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
 DIST logrotate-3.16.0.tar.gz 221904 BLAKE2B 38bfde57e9e055b86d6f25f0dd7c49b5d35865671926b1f8a2bd703ac8b8b2252d40cc29b0e1440309ecf224c747a99a2eab0ea99c86782559bef797f61fadb8 SHA512 2f2e8ebf9349424f529e4cf35e75036dadb00df84feac6b421b5a558ce015c9b1a22586463cba95a0265c104a559dd236764f7e37707975e626e69cc87e963e2
+DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
 EBUILD logrotate-3.14.0.ebuild 2503 BLAKE2B fdda708bc77a6bbd41bcbda73e1b6cf1c92ae89c70b0f6682bc78c1c3c8a509745b02660634e2d99115dfe64933320e5480470bee4fc4b9a5c5f88737bac59bd SHA512 135a60056c1518b006666d44cdb5852380f83e73844cdc7d99ca8225edd89d66d7a645e256bc7a698d5805b39d0c5860d7881d8d801d12fd0b8fdf6c063e0c79
 EBUILD logrotate-3.15.1.ebuild 2527 BLAKE2B 8bb89e3b8bfa250ac9d394d1291fee1e86540e34bf439fb020a5a98f849deb0658bcf56b6ed89222f2743d9b0bf333e202d0442387dd99b89823a3b25516e158 SHA512 7150d851233a645b918b333676113503f58a60451016a22b8c8500ec4630f5ad6c55b86cc4b64f2fe440947cc52040b43b4c924f3510725fb4c00912118146c7
 EBUILD logrotate-3.16.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
+EBUILD logrotate-3.17.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
 MISC metadata.xml 1197 BLAKE2B 57d74b7b0ec5dc17bc040c8f0db207b05a7c86722606f629b247747cf5f45a5db6e5acae25221d6b43450f1c1cc57e2308d9f045b606f6284dc7c9459a3b3ce1 SHA512 6a354d60895ced8d020a3c8df5cd0a7f294fe5d4d5dbb11c2698cfd3e666e3f8f4778262e5ce210c7e9ec31e6e6f50d0a98f6e3fa7fff8ef77078be8b4025e16
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
new file mode 100644
index 000000000000..b63b513c2ef8
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.17.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="acl +cron selinux"
+
+COMMON_DEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf \
+	$(use_with acl) \
+	$(use_with selinux) \
+	--with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index f4dd11c1de2c..e511ed383d83 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -2,6 +2,8 @@ AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a63
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
+DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
+EBUILD sshguard-2.4.1.ebuild 748 BLAKE2B ca2ca57e1e8701e864e85ac94eac7f1379376df940719c2248a6eb0ddb96512f0ff26f4c6ca962a9c68534ac15262f0f83c3dc436707ea733516ab4a1e08fbf6 SHA512 5c72d111c83de5dba984cd1bd9d45cc38c069f50382d4429b92f2bcb6cfd324dfd5ae2f335e3563ab24a227d54a9661dda4859b9ee63add76340874d727b7e3e
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild
new file mode 100644
index 000000000000..99d5bbe8f103
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="https://www.sshguard.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 1ba4dac9c5d1..5b371bba8c1f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,5 +5,11 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
 DIST vault-1.4.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310a13a592c57768ac6a0c8e12ef6e7ac8b6dbc975e5e9131888478a7fb18ad9ef1ee9b1da43c2899fcf636e99d049078 SHA512 ab462bebfa38102e354938e9b8c6990b6bb19b29dd0da96d65f290394a987d89063800247c1d751a8f7ba7c3fa6645aab9383a5455444244adb5f40528408b17
 DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
+DIST vault-1.4.3-webui.tar.xz 1212168 BLAKE2B d068d3218462b2e2eda9eec623a0438a3c7f6a894713ccfa3260a4b1ed53bf0791760f2ad9ac6071ae5227e7c44e5c9b675d7a1cc8ecb7052b322d8415f79955 SHA512 5542a170d853a52bbe05b4bfab7014305c6fa68e7fc2ea24df5f508905c7db8cf8a0f65b8f91c209563779a22044959d615f05d26a12df2b8ef1f749b8af450e
+DIST vault-1.4.3.tar.gz 33169383 BLAKE2B 78adde5dfe68fbb51b43abc7f12fe96df7df6b7f5a7fc0af35439184a3f1ce03a71e445fe735e692953a68e039093f9eb65265ee9aae786e4ef9b8f0ca81c030 SHA512 638bdeaaee122263d8f8c44b6db48b0f10869dd6f2cd6d35bcefb96e8b25dde4596a4a41f287d065f0cece01c5e75f9a4ae220864dddc381365fe57faeb2efe2
+DIST vault-1.5.0-webui.tar.xz 1237556 BLAKE2B 2647d9733a6a20b61f5884b15dd46d048705c3fe5dcfb9f4c8c2fa71303d17c9b69d2f08a42ec171e863affd45632c0407d4db4cb6bb229ba780860dfbf05449 SHA512 b5164f7525c94752f3f6a17ba6c738eb42e05f33682b790b49c322882964dfdb68abf28d0f30836759383ff6777cc5d5061699fc2a5d2a7a3706b5423ccca378
+DIST vault-1.5.0.tar.gz 34940170 BLAKE2B cbc4b25bbb6881415c63be41970429e4413e3f70fc9aa3dfb3c54136719c7166896475d77a11d33d3e388344d863a19d63836f2ed3e20cc42db98ee2b57ba9a4 SHA512 245d5ea837f561d6c3832a0cb28d851dabe908fac2be7e53d3fd466689778d67b2cd5d9ea8c297f8daceb003c571a9768254a7e27d1fbeb1a376ac75e3c6edfb
 EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
+EBUILD vault-1.4.3.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
+EBUILD vault-1.5.0.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.3.ebuild b/app-admin/vault/vault-1.4.3.ebuild
new file mode 100644
index 000000000000..d7f0e36a12fb
--- /dev/null
+++ b/app-admin/vault/vault-1.4.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=vendor" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/app-admin/vault/vault-1.5.0.ebuild b/app-admin/vault/vault-1.5.0.ebuild
new file mode 100644
index 000000000000..d7f0e36a12fb
--- /dev/null
+++ b/app-admin/vault/vault-1.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i Makefile || die
+	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
+		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
+			die "mv failed"
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOFLAGS="-mod=vendor" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 061152495adf..df4204d4b65d 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 424c4eaa07e4..cf2b009284bd 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,5 +2,5 @@ AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a01
 DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 EBUILD libarchive-3.4.2.ebuild 3682 BLAKE2B e933888d38791470063f370bc550105f96a9305d26ae2188f546f57605943658314c6bcfab52f4cde877f9e1eefd0c64c92e19a47502455533e13000b9100017 SHA512 fcca418f5d06b6b0460a69ea26eab3d3792ba7bca0f25d0c700e434664eaed29de81dc9b570e4694cea6570e6c7abda41258a300dd07d3dccac38a287af17c73
-EBUILD libarchive-3.4.3.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
+EBUILD libarchive-3.4.3.ebuild 3768 BLAKE2B 696413ea145a8bbb0e8352cdcf470b5488c3b4502260aca83ca84b97248da6c765950fc84740a88c62e99d270d7798b0270405f04967678ae92f3eba5d7c37f9 SHA512 c3c5aa57e225be160f3eb1f22fa7f5ad12c4fd5f9c8f20c9b8eb091c1066bde492d4e3847cb30292912ce8677a3535777097792ef6bac2ada61737efe6075ce8
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
index dde837017a82..d25232eddc91 100644
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index d804fa1364e5..40f6c86a2b90 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
-EBUILD lxqt-archiver-0.2.0.ebuild 1175 BLAKE2B c33ba638b93d35bdb74f5a4c6b0a7bb9b62991520576415d070c885a7649c82241a8e83e8d1755b556477ae3817e396666b00480db654a93d548e43cfebfbf0e SHA512 aabd95530d60416584382ceaa728989cec84af6751c7ce50312b93f5d379d0b23e3c5616828f00742511c9ffd6ba554cb07aefefd7f9305c705b222474f82898
+EBUILD lxqt-archiver-0.2.0.ebuild 1173 BLAKE2B 6bdf4813f23abb209d0f53b4c612444827c55853e806072d0621b52d50cc073ceaa86dd93ad48b36bd45b877bc73f35805f5cffceb101492e2795642512c3b6e SHA512 74e054b528428fac654be8a64410fa16edc559d0da9f79ef0e029c7273eb2f296ca060032a68d4f89ba08d394c2ba53946ff52ea8cada203e547a2a60d21886f
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
index dd4a15a89c32..39548d1e7e9b 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 69a82c5388b2..ed80886adad8 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,5 +1,5 @@
 DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
 DIST xarchiver-0.5.4.15.tar.gz 1072943 BLAKE2B 6f80c8dba510bf5c05dfe5c8f12aafbd4f563861878c73b7da78562836ef4b85f9bc8e4ed7cda5d98c5e33a211a2677d163c2912f1bb605e0085627ca4ee5cbb SHA512 e5174241dd45dd6186d91b15a15b207a8b356480d9ce1a7b9ac2da167878cdb14316a3e7abf3f2aac8d41a02777df2131e205c7d5971a376ff7dd0ca70fbc82f
 EBUILD xarchiver-0.5.4.14.ebuild 1438 BLAKE2B 4a065c6d80da446dbcae9ffc46d6d4aebedeee9d18a089e304dc237dcbf0196165ca52044966bd99a453d09b3a80d23080a673066fc929c47a3401b82df98583 SHA512 7d2f73efd16745e0ad5670aac5f3c5ed81ba9184d0aa47ef9410ec5d8ec0d12c27698605491db8687f4f4936c72ecdb1f6b37ed84742df0e40227f3e722e96a9
-EBUILD xarchiver-0.5.4.15.ebuild 1440 BLAKE2B 7f739370dfb24d5dcb37fcc2decadb1145d4e8c7b50303cc75650ce6c78a257669aa0679106e5c78a572cdce4771b5d7733b93a7ca55d114e4d88030ff4ac812 SHA512 1206ef834af47ca298e6bf28fcffebf59e925f89027b4dc9861c4b60ca4ff9a5d586fc0ff09b4ec4cef3048b91987f019d2eb47fcc3ade3a1704e638713dcc30
+EBUILD xarchiver-0.5.4.15.ebuild 1438 BLAKE2B 0c82489ce6a3be957a89ecbed0aff434fccee0743285c640efe6d8476c430bae5b80151ed662b1e45c102efdf7910704afd0173d597e8e316bdf1c3db17d981a SHA512 c955ce030ce34b81e7f6161545df5c5ee549ea9645a80982a559647f468f654ad40d7379b3558f15678af05ed2dcce3e36485dd07d5dd8872df82453079baeca
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
index e83f8d245d44..bfc1e90c0645 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 504d7bdd4639..2262a792062a 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e86b92969a1d..8ac7cc730cfb 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -13,10 +13,10 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22
 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916
 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
-DIST bareos-17.2.9.tar.gz 4190637 BLAKE2B 266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118 SHA512 ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
-DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2 SHA512 61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
-EBUILD bareos-17.2.9.ebuild 10551 BLAKE2B df36eaf96f8dbec36101d7dbc736502eaaeca8faf36b0c1dbf7624d031ae0835b5eaad7968ffc94402299ed4d72ebb921e7e16c862b7dd2e67b998a537063308 SHA512 e9052e3e59405361b129e99b163820559e71987b6452fb7936620679f805ba37494bca8bd55bffe45cd7e44958b2559fce3fb50f11cd8f95ce144680ede9a486
-EBUILD bareos-18.2.8.ebuild 11438 BLAKE2B 719291b1a95fe1aa6d602f88c8d71c0a94c7d77bdd0e3313632cb7701d2cb876f072830bcb515a2ef9c39be33b7e843a867510b48b976e51599a889e118b8aea SHA512 1abe95715a635c349c92eda1b695a9e15a5965aeb6eb471591497808c9e51cfd25158b65c98f9677261a7e1c137cf86fe89203296ce6ba7132ec395f36debf7c
-EBUILD bareos-19.2.7.ebuild 10787 BLAKE2B a1672ef75bba19ef60ca8b3392a4213574d8513ce6ceadf6bf8cd0e83e775bea9250e0c2f5aef3045018c66806818ed6b545ed1fc5c8dde445db23fe0982fc4a SHA512 ea2bd88ea61a71e18283f132928445aee016812021633a94233b04a99e6e64cdc0253d3490ba2fe95b41f929f250b293d7c4479159eefee107116a04ff5bf217
+DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
+DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1 SHA512 f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5
+EBUILD bareos-18.2.9.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
+EBUILD bareos-19.2.8.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
 MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-17.2.9.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild
similarity index 96%
rename from app-backup/bareos/bareos-17.2.9.ebuild
rename to app-backup/bareos/bareos-17.2.10.ebuild
index aa5473acd458..f4a2b487a99f 100644
--- a/app-backup/bareos/bareos-17.2.9.ebuild
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -3,10 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 systemd
+inherit desktop systemd
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -17,7 +14,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -70,7 +67,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -81,8 +77,7 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
@@ -90,7 +85,6 @@ pkg_setup() {
 	use mysql && export mydbtypes+="mysql"
 	use postgres && export mydbtypes+=" postgresql"
 	use sqlite && export mydbtypes+=" sqlite"
-	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -147,7 +141,6 @@ src_configure() {
 		$(use_with fastlz) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
-		$(use_with python) \
 		$(use_with readline) \
 		$(use_with sqlite sqlite3) \
 		$(use sqlite || echo "--without-sqlite3") \
@@ -162,6 +155,7 @@ src_configure() {
 		"
 
 	econf \
+		--without-python \
 		--with-pid-dir=/run/bareos \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
diff --git a/app-backup/bareos/bareos-18.2.8.ebuild b/app-backup/bareos/bareos-18.2.9.ebuild
similarity index 95%
rename from app-backup/bareos/bareos-18.2.8.ebuild
rename to app-backup/bareos/bareos-18.2.9.ebuild
index 4bf0b6c7c3b7..cf1622b6e1ad 100644
--- a/app-backup/bareos/bareos-18.2.8.ebuild
+++ b/app-backup/bareos/bareos-18.2.9.ebuild
@@ -3,12 +3,10 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-single-r1 systemd cmake-utils
+inherit desktop systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="http://www.bareos.org/"
@@ -19,7 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
-	logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
+	logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
 	sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
 
@@ -72,7 +70,6 @@ DEPEND="
 		sys-libs/ncurses:=
 		sys-libs/zlib
 	)
-	python? ( ${PYTHON_DEPS} )
 	"
 RDEPEND="${DEPEND}
 	!clientonly? (
@@ -83,15 +80,10 @@ RDEPEND="${DEPEND}
 	)
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="static? ( clientonly )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="static? ( clientonly )"
 
 S=${WORKDIR}/${PN}-Release-${PV}
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	use mysql    && export mydbtypes+=( mysql )
 	use postgres && export mydbtypes+=( postgresql )
@@ -111,10 +103,18 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory filed
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	eapply_user
 
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -135,7 +135,7 @@ src_configure() {
 	fi
 
 	for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
-		systemd fastlz mysql python lmdb glusterfs rados \
+		systemd fastlz mysql lmdb glusterfs rados \
 		rados-striper cephfs jansson; do
 
 		mycmakeargs+=( -D$useflag=$(usex $useflag) )
@@ -178,7 +178,7 @@ src_configure() {
 		-Dbatch-insert=yes
 		-Dhost=${CHOST}
 		-Dcoverage=yes
-		-Dpython=yes
+		-Dpython=no
 		-Dsmartalloc=yes
 		-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
 		-Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`"
@@ -190,12 +190,12 @@ src_configure() {
 		-Dhostname="`hostname -s`"
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
 	#emake DESTDIR="${D}" install
-	cmake-utils_src_install
+	cmake_src_install
 	newicon core/src/images/bareos_logo_shadow.png bareos.png
 
 	# remove some scripts we don't need at all
diff --git a/app-backup/bareos/bareos-19.2.7.ebuild b/app-backup/bareos/bareos-19.2.8.ebuild
similarity index 96%
rename from app-backup/bareos/bareos-19.2.7.ebuild
rename to app-backup/bareos/bareos-19.2.8.ebuild
index cb87707808ea..beb2d8324673 100644
--- a/app-backup/bareos/bareos-19.2.7.ebuild
+++ b/app-backup/bareos/bareos-19.2.8.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-any-r1 systemd cmake-utils
+inherit python-any-r1 systemd cmake
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/"
@@ -97,8 +97,15 @@ src_prepare() {
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
 
+	# disable dird and stored plugins, because of
+	# py2 dependency
+	cd "${S}/core/src/plugins"
+	cmake_comment_add_subdirectory dird
+	cmake_comment_add_subdirectory stored
+	cd -
+
 	CMAKE_USE_DIR="$S/core"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -124,6 +131,7 @@ src_configure() {
 	done
 
 	mycmakeargs+=(
+		-DHAVE_PYTHON=0
 		-DDEFAULT_DB_TYPE=${mydbtypes[0]}
 		-Darchivedir=/var/lib/bareos/storage
 		-Dbackenddir=/usr/$(get_libdir)/${PN}/backend
@@ -169,11 +177,11 @@ src_configure() {
 		-Dx=$(usex X)
 		)
 
-		cmake-utils_src_configure
+		cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# remove some scripts we don't need at all
 	rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
@@ -324,6 +332,9 @@ src_install() {
 	diropts -m0755
 	keepdir /var/log/bareos
 
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
 	# make sure bareos group can execute bareos libexec scripts
 	fowners -R root:bareos /usr/libexec/bareos
 }
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 20b253b154aa..e04b23ffaeff 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index f70cb0b534bb..89c0e55ada19 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,5 +1,3 @@
-DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
-EBUILD pius-2.2.4.ebuild 491 BLAKE2B 8be85b57f3f5c6f15d5202cec3171208b1b2c14c8fa70695a340806a714aa689cca203f935f7b54a737db2217ada4e73c61555f5f40de207fb399db0891040e4 SHA512 20a051fd9360c4b4f97bf945ec48a1dfb6096178b73e0ea01472647e9eec27d0a8a09db139196498dec872c67bbf545847853a1f4c0ac7da21f064c9558355b2
 EBUILD pius-3.0.0.ebuild 655 BLAKE2B 5b122560970340facc2c025cd8fc591d3c3def90aacec82d3eaa392e2af4e0891be3eb17389f00d9368e0e8ac5f9f0f2d1cddf0c3df19c056230dbdb7f9afcac SHA512 b709be3e97e9cf34062199d6d741e6d78b9831f4957f30687acfadd6a0ee1513883a9d943b40ca193051123da797809984c368eb7540ab50196fa231ea323ad7
 MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc
diff --git a/app-crypt/pius/pius-2.2.4.ebuild b/app-crypt/pius/pius-2.2.4.ebuild
deleted file mode 100644
index ff4114878a2b..000000000000
--- a/app-crypt/pius/pius-2.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/"
-SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-crypt/gnupg-2.0.0"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index ad15acee7423..4e0379e9fdce 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/sword-GerAlbrecht/Manifest b/app-dicts/sword-GerAlbrecht/Manifest
new file mode 100644
index 000000000000..6a480c90ffae
--- /dev/null
+++ b/app-dicts/sword-GerAlbrecht/Manifest
@@ -0,0 +1,3 @@
+DIST GerAlbrecht-1.5.zip 1020277 BLAKE2B 0a94e8a169b61ab977b03d4f58e64fd135735fdb32375e5de4cfab3260d302be11585f8f5273ef914a2b3577317c549857ff3abbfd0ee33c94d10a2cae451920 SHA512 8ec94b998dcd5e16064958e388c3cdb7e19f747f924827bd8a03275c2ab17078038cc7ffb2d172a1c4eff2cb76c66e2cfd84136dbb90afaf1fcf4fd23e421d25
+EBUILD sword-GerAlbrecht-1.5.ebuild 355 BLAKE2B cd423fb2e91ec0006f22872ff725aae0f43cba8b42bc2c989f711ac2ccc8a438c2bb5e8e863d98738f4a7108b994726559358c878b8789b347e1d2f2fd537e52 SHA512 0e652d6c512fb9a66d106a819e0e06b5b1b76ad1eecab6b919b6aa960d55cbf64ee01f86e700c4d2d0af78c0a492eb409c93f22dd25a3ab9925e5e1114e28875
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerAlbrecht/metadata.xml b/app-dicts/sword-GerAlbrecht/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerAlbrecht/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild b/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild
new file mode 100644
index 000000000000..c542bc436869
--- /dev/null
+++ b/app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="German Albrecht Neues Testament und Psalmen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAlbrecht"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerAugustinus/Manifest b/app-dicts/sword-GerAugustinus/Manifest
new file mode 100644
index 000000000000..c4cba6d0b576
--- /dev/null
+++ b/app-dicts/sword-GerAugustinus/Manifest
@@ -0,0 +1,3 @@
+DIST GerAugustinus-1.5.zip 254435 BLAKE2B 2ac9c0236d2cb5c55b09e4f4b8f81c38f307e18af487bed2010995f3eef206282235b4c38142be4a4ec317eb8d9100da934879c44f605538d3277c87ae08711f SHA512 1c68cf5df559533801a2516f6b4eb740e54c370e403f5a11c00a3b5cdc79e742e3e65a9b9ae696a526547e17a4a85362d351996b4bd45df4205bd22149007674
+EBUILD sword-GerAugustinus-1.5.ebuild 344 BLAKE2B 486c8fdbdbf12bf29be9e980aaaab1fb6e0a81956213b8ce79947b23e64a29508d1266f80d5fc3f86434753e2dff1f87f1e0ff36c20650ec796c875f4bb4f847 SHA512 41930b5f83262295e8d027c1cadb26181874a8d4c47bdbd4bc591d0e94d55cdbe1963c972d75348c4728be61a4226f78ee57eb7f06314655e6b24b5d29603fec
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerAugustinus/metadata.xml b/app-dicts/sword-GerAugustinus/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerAugustinus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild b/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild
new file mode 100644
index 000000000000..b6aedd43f339
--- /dev/null
+++ b/app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.3"
+
+inherit sword-module
+
+DESCRIPTION="Augustines Confessions (German)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAugustinus"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerGruenewald/Manifest b/app-dicts/sword-GerGruenewald/Manifest
new file mode 100644
index 000000000000..97b95637e70b
--- /dev/null
+++ b/app-dicts/sword-GerGruenewald/Manifest
@@ -0,0 +1,3 @@
+DIST GerGruenewald-1.5.zip 1596123 BLAKE2B d5c6d4b7cf83002b98d83c3ac7f2baa9dd983ff0c23c1d505548f481c2302fc184329ac9186d3016710fdd9d05d3038fa58c133d522813249b84f8b8a6472ab3 SHA512 c1172a5737a5aabefd341d1305c11bc7e029457903ba3719ac4d05c0d927b9392e4c9fff3770847834ce123dd29f9aedf4357eaa8bb13d978a2f8f25ab56f67e
+EBUILD sword-GerGruenewald-1.5.ebuild 334 BLAKE2B 39f0063002825af29499cd584fca0fde083e10955846e5e52913a079477ad661cb87c69c02b81934dcb4f1619e518c95cf7bd7c0c9520f29582482a3a75c66ad SHA512 4daad16e3d5bdebc81164d9830545d3c0c702f8528fb592b5b760679ad7f50ac6d7281df67909e0723c89f10d74cd8987c21f7d420db10ffc26f2be90a33655f
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerGruenewald/metadata.xml b/app-dicts/sword-GerGruenewald/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerGruenewald/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild b/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild
new file mode 100644
index 000000000000..c7008f8ba55d
--- /dev/null
+++ b/app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1924 Grünewaldbibel"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerGruenewald"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerHfa2002/Manifest b/app-dicts/sword-GerHfa2002/Manifest
new file mode 100644
index 000000000000..b2fac6dda092
--- /dev/null
+++ b/app-dicts/sword-GerHfa2002/Manifest
@@ -0,0 +1,3 @@
+DIST GerHfa2002-1.1.zip 2215852 BLAKE2B dd159ccd4019dfb3aaf3d6c67cfb953795aaeb95cd6f324f87cd5d5b78caa0cb76fd8eb191e4aabc94c1b0ca394bd6049de74949272daa95a709277cf1c3fbfe SHA512 2fe2f0f05401ee27ed81bad978e641997a89a32ff4393c51476d106cafe9697751ea3bd885d41d8d7739801ac16be391632a20fc70bc739da1a5ebd1d869d408
+EBUILD sword-GerHfa2002-1.1.ebuild 336 BLAKE2B d5fbabee9035ed20e11bf0d4adfd95b78fcb5bbbbe30ed037a455ad14cc0e8165abf78eed9c1ca4b17b2fbb51ef2611804ff24b1d1688c4a08d36c4cb0e56883 SHA512 cc92aff1b06347aa324127cb69ed55175929d8730e092ccab8fab4c16109af90e2c229e5aa0772d3e737f43e9dbe1885f81edf3e7404e15e79547ced9757deb4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerHfa2002/metadata.xml b/app-dicts/sword-GerHfa2002/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerHfa2002/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild b/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
new file mode 100644
index 000000000000..c0564d5d3e0d
--- /dev/null
+++ b/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.6"
+
+inherit sword-module
+
+DESCRIPTION="Hoffnung fuer alle - Die Bibel"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerHfaLex2002/Manifest b/app-dicts/sword-GerHfaLex2002/Manifest
new file mode 100644
index 000000000000..18350f077961
--- /dev/null
+++ b/app-dicts/sword-GerHfaLex2002/Manifest
@@ -0,0 +1,3 @@
+DIST GerHfaLex2002-1.0.1.zip 45837 BLAKE2B e4f16c3284a0a58fc503d1b8fb3b6dc23a25a9b50f33eedd38d8eaabff258defc3365cfc5944fb1a4b6a88088726108a3f570da78d6ff55d801cdc279472d09a SHA512 5793c54f66cb6ca13393aefbb87d687fc2c34a5eabf17d38a8d426e441c7e8b72cccdd32d579a670ad23d742c922135c6cce58039e28a3ffb3fcfee4ab0c9c8b
+EBUILD sword-GerHfaLex2002-1.0.1.ebuild 346 BLAKE2B 195c76a4090d958d195b21d6238361cbd443f3521b91f6800fc0b6a3e4585a404a1e492e6fc1c37f5d7be3d12f7a86364461b1de60d23ca01280b1dff0df09d8 SHA512 5f7a4e4d9d148d5ce294b731a2a80f60734bc8023145e18b45f351544cd6d978a347567dd6e5861de334f7de92e89481524c4ca41437c1608e96f150d8e1e60e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerHfaLex2002/metadata.xml b/app-dicts/sword-GerHfaLex2002/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerHfaLex2002/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild b/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
new file mode 100644
index 000000000000..68d2493be47e
--- /dev/null
+++ b/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.6"
+
+inherit sword-module
+
+DESCRIPTION="Hoffnung fuer alle - Worterklaerungen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerLeoNA28/Manifest b/app-dicts/sword-GerLeoNA28/Manifest
new file mode 100644
index 000000000000..4a2d1a7a23b2
--- /dev/null
+++ b/app-dicts/sword-GerLeoNA28/Manifest
@@ -0,0 +1,3 @@
+DIST GerLeoNA28-1.2.1.zip 1583052 BLAKE2B 6b79fc1aeacb051abba80c15313b42acaa83c4838a760355baac0cd6ec1203c6b47cf0384353233048b0557068768db17a851455b11e281279ed75aa4d46d7ad SHA512 1b825626ebb259e796dbb637c52305b35fb04de26ab58a32747d6984196226ba7e84577cc4138875bcf74eaf7f52cfd7c723df197b086803d3f0548b7edb6b81
+EBUILD sword-GerLeoNA28-1.2.1.ebuild 340 BLAKE2B 85a95eac2e742b8f75feaf41926541fddd4bcfac38fea1750cbb638f8bfdbaaffdb075f5331172f07560cd0d5a88dba79b357feb3dbe10f452d26daedeb187a2 SHA512 4c5989e95c995ca825b9e170d4ef248097b5a28cbbec7e6fa19de43c4e848afd40126f264018a56552f88eb5f4d2e9020d7e190c1b16f13d2389a0dd35274bab
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerLeoNA28/metadata.xml b/app-dicts/sword-GerLeoNA28/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerLeoNA28/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild b/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild
new file mode 100644
index 000000000000..024e44696701
--- /dev/null
+++ b/app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Leonberger Bibel, NT (NA28)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoNA28"
+LICENSE="CC-BY-NC-ND-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerLeoRP18/Manifest b/app-dicts/sword-GerLeoRP18/Manifest
new file mode 100644
index 000000000000..5e0d64f272f9
--- /dev/null
+++ b/app-dicts/sword-GerLeoRP18/Manifest
@@ -0,0 +1,3 @@
+DIST GerLeoRP18-1.2.zip 1599772 BLAKE2B eeefc753e9ae1877281e912018fb5897d63c74f6bbcd41b3db1e67e66b8cba7f3fad5f98138c968f450df6a6d25ed89741f77a61b07790128cbdab99982b4247 SHA512 4676a1836d6cb5285a5bd23d3afafb60a7bfaa741db046567f25de98a73c66b2dcedb0b46c44cefb0a3c45f4e6e86108d098187b108f9fbee83dffced15fe616
+EBUILD sword-GerLeoRP18-1.2.ebuild 340 BLAKE2B 0d62aa3f7f3ca10cbc97894be297075ea5f2600225637de0a0d080c0265af41834288213601c5184a5b42be01967189b169bdfa3011c8141e26d8f6a29b89c5a SHA512 63466f12f070791c42b9a89f8f5bdcb7c07f44c590e9cadabe813a07db6d17f78a0fcc808968ee12da003abacf71e08ec085e6702a9cb767bd55ba3d8d72046c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerLeoRP18/metadata.xml b/app-dicts/sword-GerLeoRP18/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerLeoRP18/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild b/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild
new file mode 100644
index 000000000000..20044c7f2ee9
--- /dev/null
+++ b/app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Leonberger Bibel, NT (RP19)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoRP18"
+LICENSE="CC-BY-NC-ND-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerLutherpredigten/Manifest b/app-dicts/sword-GerLutherpredigten/Manifest
new file mode 100644
index 000000000000..3673dfd53b9f
--- /dev/null
+++ b/app-dicts/sword-GerLutherpredigten/Manifest
@@ -0,0 +1,3 @@
+DIST GerLutherpredigten-1.7.zip 480439 BLAKE2B 0fa071afc540616bdcc6f773095b18df17bbce83d55bffc1f9183be23793f07b3df3126752b21bde4c03c12a6d9ca52cad2bdb49cc223772f4e438f092734fa9 SHA512 3404a4da3bcf612df852cf3fcd8eb70ed76f6bddd91b8d03b5807c4c127253e5a8ecae205d9079f5e99f2c097eaf7e44859c63f4fb4eb67cba1e973fed406143
+EBUILD sword-GerLutherpredigten-1.7.ebuild 348 BLAKE2B f8a765c83e5c1dbc8805524b38e876ba095d65d7e41924610c5b5557b993a7876f95f2bb587db312db8d521a6f9863fde320243e3024abd5fb0d5268cf747dc1 SHA512 116674a43b6dba3666fba90d4db645b723a774d549ef845466543999f05a2c483b94cbb5300f73fb6ee6ea16ac14c4624c29c7b0fa3a8957797e17c71ced6d9c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerLutherpredigten/metadata.xml b/app-dicts/sword-GerLutherpredigten/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerLutherpredigten/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild b/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild
new file mode 100644
index 000000000000..d0ab71c4fcfd
--- /dev/null
+++ b/app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.4"
+
+inherit sword-module
+
+DESCRIPTION="Eine Sammlung von Lutherpredigten"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLutherpredigten"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerNeUe/Manifest b/app-dicts/sword-GerNeUe/Manifest
new file mode 100644
index 000000000000..757b8460645f
--- /dev/null
+++ b/app-dicts/sword-GerNeUe/Manifest
@@ -0,0 +1,3 @@
+DIST GerNeUe-2.7.zip 1975175 BLAKE2B b89646077a9cee4de9b411922a7b8fd625b9fc422e6b26267d4b921c339b9666040f8d51e7246f08826ee1e38ee1e96789020fd93753d54f903202a44b1dea4b SHA512 0e48b6f34d939e3f653368f27e4f3d11e2b3a68a8ea4e6f33073e2c122dd9ad2dec1a4d4be9cb20719af14ba3b2babe9ceaf8ff2428eec3c48bf148eeb0fe508
+EBUILD sword-GerNeUe-2.7.ebuild 347 BLAKE2B 4082a3dd97cf5946b95cfcfe3a9f30e9b8036679b373dc39615b193970439ec8a8c5b2900a85c63a5c00b29ee87c57d062e7855ee6128a11335f5825eca7ded7 SHA512 27db7fb6bac48ad8486a0d6f68999e6ac452558eab85ea711981a104fd4387548fb7383f5905b0f53cb8da1345e89e924e6b74a8ff921f0d564f6b7277421735
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerNeUe/metadata.xml b/app-dicts/sword-GerNeUe/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerNeUe/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild b/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild
new file mode 100644
index 000000000000..e675c3fd7ecb
--- /dev/null
+++ b/app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.2"
+
+inherit sword-module
+
+DESCRIPTION="Neue evangelistische Übersetzung der Bibel"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerNeUe"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerReinhardt/Manifest b/app-dicts/sword-GerReinhardt/Manifest
new file mode 100644
index 000000000000..e7454a0dc3c0
--- /dev/null
+++ b/app-dicts/sword-GerReinhardt/Manifest
@@ -0,0 +1,3 @@
+DIST GerReinhardt-1.6.zip 200320 BLAKE2B da4bf07cfc381bfbedbd2274445abb2e78f236842961d1283ea4aecf85cbf1777e0b85d9ae278b812483566fe4e64c67ac10f38c913d02b5c91fcb38701cb40e SHA512 84db10246e4b57dad224e3b214317e7504e96a15798872a56328b864db4c99857346869fec0788dae04685dde5db93a212ed644d21e84c53b1274b0c56cbc34a
+EBUILD sword-GerReinhardt-1.6.ebuild 340 BLAKE2B 9b0b3c04d1e352fcf7780e35e11e2a99a6c7ede2c4ef21e353047815fb7e247dfbcd806a1d40785f7b347ac9048b567b6d69a98d0b70fcaa40e42e58fd60be1e SHA512 e2c3554115a6a8ce358096b99d42f28d5047409fee73adeb286df5eb1d2f04e9f6e84a4a602cc443e4ee5b894c5ad560abfd231c522157b2187c77ab14f728fc
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerReinhardt/metadata.xml b/app-dicts/sword-GerReinhardt/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerReinhardt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild b/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild
new file mode 100644
index 000000000000..ec4c552be257
--- /dev/null
+++ b/app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="German Reinhardt Evangelien"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerReinhardt"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerTafel/Manifest b/app-dicts/sword-GerTafel/Manifest
new file mode 100644
index 000000000000..a2dcee2aca66
--- /dev/null
+++ b/app-dicts/sword-GerTafel/Manifest
@@ -0,0 +1,3 @@
+DIST GerTafel-1.1.zip 1372851 BLAKE2B acab53f2a8cc0fbc8692c46810f82337095ffab951c553c7e17c9eef713d6c1d590e3ee50615e2a31ab9a16d1662b6926b219f6e14ba46c9f75dbc994722b077 SHA512 da493e12e0c880498e68cda54cbf27869d76f915aeb6f4fd8e6be9938fa6f55e76e4e198c1869ebcf60d752e188d7d38bad1ae5e7284d7b501c87b5fb3389d86
+EBUILD sword-GerTafel-1.1.ebuild 333 BLAKE2B 823767a5f1d1455932b8da05bc07db3b003fc3707dca6940b030585fdd6554d580ecb5b9e3ade9c7a3f1cd7e3e0f458c6ef189e603dd698a16500b8564ddac4c SHA512 dd8a85306b69ec6dfb3f92b6cb340c67a991c7fca17027920cd33dc91505b56d36bd5132ac15ff9a5a2aca15bdc2fa62cf96ba17836facb67098b4c39ab91131
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerTafel/metadata.xml b/app-dicts/sword-GerTafel/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerTafel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild b/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild
new file mode 100644
index 000000000000..3135eb75a514
--- /dev/null
+++ b/app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="German Tafelbibel (1911)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTafel"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GerTextbibel/Manifest b/app-dicts/sword-GerTextbibel/Manifest
new file mode 100644
index 000000000000..0d277a85b5df
--- /dev/null
+++ b/app-dicts/sword-GerTextbibel/Manifest
@@ -0,0 +1,3 @@
+DIST GerTextbibel-1.1.zip 1264086 BLAKE2B 1b8fb76c48c49ffe6d7ebd71f97f973cc08ca3d32691afd77720f72a0d14bb92db3da62d578542ba60130ecab1d6d6ea63f240372f71954f576cc5b21ead8d72 SHA512 a468edd02c43ea9f5643074c08ef31c1b4e605d17751f64488ea56441066da7a1879a9738e4a61cc62d6a839ed557b4c1b9645a1d3d2e16b317cc08e1a753e9a
+EBUILD sword-GerTextbibel-1.1.ebuild 339 BLAKE2B 15b90e13730849d0eecb195bc4f8d8c49c363071ff79937bd03fe6471d9d1ac5e2d127274ed56990aebecc25a0dd6712bd092731a686ffa258fe0594fe17a3e9 SHA512 3dba586b87e8cc1786d92f7fcb9f69aa0fb24f261782fcda62e6e80f080bed0ef770c86fe3de992b3001d0c62428c3ad051a1a8847780b60524fa7dc2c7ae478
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GerTextbibel/metadata.xml b/app-dicts/sword-GerTextbibel/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GerTextbibel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild b/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild
new file mode 100644
index 000000000000..65b4318dbe87
--- /dev/null
+++ b/app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="German Textbibel AT (1906)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTextbibel"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Godbey/Manifest b/app-dicts/sword-Godbey/Manifest
new file mode 100644
index 000000000000..e2a9a56f545c
--- /dev/null
+++ b/app-dicts/sword-Godbey/Manifest
@@ -0,0 +1,3 @@
+DIST Godbey-1.0.zip 359620 BLAKE2B e5e6d5d941da0f3548196ce2543f432fa86c8f7e8ceba41259c67a16e25ea56328fef31340c1321dc185f28ba225c94e75ab0357197d6afaf673a36e11d08b61 SHA512 720e35a3fbf28f300bb51de81d50695ea53f8de3dc8c5032b0aa81d972a8a359dab6e148ecb7ff376126dc1024154ce3223f731e9b31d03958bbb4d9f6b69545
+EBUILD sword-Godbey-1.0.ebuild 336 BLAKE2B bb3848c245406c26813a7d7073163c2d9b99a9a84683e356808b7b00ec7f401ae97b8e4ec6ad86f0128a0fb31279a4a064e437e1275c62d3c6a2fcdb26be5b78 SHA512 e9f76978bb78f03350198f80132f652439a85df6b616f9a65f650ba829561ffe34f102dd38119fdb1427e6e4ec09d3de137beda95c380c5e7453218fa811111c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Godbey/metadata.xml b/app-dicts/sword-Godbey/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Godbey/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild b/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild
new file mode 100644
index 000000000000..e06ccdf43f8a
--- /dev/null
+++ b/app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1902 William Baxter Godbey NT"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Godbey"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GodsWord/Manifest b/app-dicts/sword-GodsWord/Manifest
new file mode 100644
index 000000000000..eb44999a4547
--- /dev/null
+++ b/app-dicts/sword-GodsWord/Manifest
@@ -0,0 +1,3 @@
+DIST GodsWord-1.3.1.zip 1450003 BLAKE2B 236f87504b6d4a9a180f2b01f320121bf5fe7c27b6d2ff99c0328e4e178a856d225f6c4436b6707a6eefc9d63eaefcaa1c3c473a6cbc1a2328083fc0a4629f37 SHA512 68d170eb61156f923af36ee0338824938e1ec52fe28cc516ef99c71f8f7e6b6a35a4463116f190c73ef6f3c0eeaaa77f158da73625b46d5095ecd096eaa31b4f
+EBUILD sword-GodsWord-1.3.1.ebuild 330 BLAKE2B ebdc2fe11e080e9779d033ecdc839005a8703a99205c0208803af6a2fae37e86b6ce0f8bf731a88783c461f3c7d7f4b42bf8dfca133cc296bee208db5783219c SHA512 a7abf9a64e7ac349bd13c3e74fcefed20b7b7e2e7945b98d7f33d32dc88b973157ca8859b95d5cad63ad4873dbe70a1f98ec6e86144e2d260b2f2a108632d9ac
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GodsWord/metadata.xml b/app-dicts/sword-GodsWord/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GodsWord/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild b/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild
new file mode 100644
index 000000000000..e125cb5cecea
--- /dev/null
+++ b/app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="God'S Word to the Nations"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GodsWord"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-GreVamvas/Manifest b/app-dicts/sword-GreVamvas/Manifest
new file mode 100644
index 000000000000..5939db1047f2
--- /dev/null
+++ b/app-dicts/sword-GreVamvas/Manifest
@@ -0,0 +1,3 @@
+DIST GreVamvas-1.0.2.zip 1874658 BLAKE2B e02894eb822cdf494e5e5d436581e255901e21ff3ee31820c0d0f990a4ed5e1cf781a3b31f5811700bcbbd0bd12018c725a81ef7a7595490d988c2a220a5e43c SHA512 a69875125a6f228d62239c67a84d2f4d027fd1ec5983d5520fa771cf14c24a29fca1564e9b3d76e42d2ca42493eb7fec3c55ec2e46d467933c5fa097207f8060
+EBUILD sword-GreVamvas-1.0.2.ebuild 384 BLAKE2B 54eab5a0aba660ae2ec2ea8fab044690311076ae9cbc8e8d05f8f4a32db1090a758701986865df48c5780a39c07a3972b98ad951014847783049407181bb3462 SHA512 caf31de3863cf11ca0dcb3cf950b136d97915d70f79c566a32158024dd5a162cf93534e9e47246696f895876a58c0b8e0e10d72f7076cdfe048533b4d4abd38f
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-GreVamvas/metadata.xml b/app-dicts/sword-GreVamvas/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-GreVamvas/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild b/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild
new file mode 100644
index 000000000000..aec0300a2823
--- /dev/null
+++ b/app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Neophytos Vamvas's translation of the Holy Bible into modern Greek (1850)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreVamvas"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Haitian/Manifest b/app-dicts/sword-Haitian/Manifest
new file mode 100644
index 000000000000..2e0c46077f42
--- /dev/null
+++ b/app-dicts/sword-Haitian/Manifest
@@ -0,0 +1,3 @@
+DIST Haitian-1.5.zip 1501318 BLAKE2B 6db81c276484ce1a855f746707aa9ad148b7f30f30284c457b423671714a0abc000d9dae0039c52e3750bdb38f73854b0eb3fd1bfd1a1548ceba9e61a7f04f29 SHA512 e85a8dc1f071d9ca1d198ee8a10a4ac69107420129280a69cb7affd0e35d2a919abbb1a3ec3a07c1556e961dd106ec5c435c730b58ff2b8bd403ad41f81a3a8c
+EBUILD sword-Haitian-1.5.ebuild 329 BLAKE2B a84d340a4a08700d5bd00b955050449d764710ac2a5be9fb37a830a01fd11ad377f5a344e627ea270a380a460ce02892d1c5b262bbdb4ea8e02282bb2a649323 SHA512 0bb77d2a8eecc0061d44037e478ac02b3f86b6410d9beb158ec4e0cfcd8c3a52eb6cdd4d218dfd247c1dff341d9f609029cfade6904d463a76290af0cb7c7554
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Haitian/metadata.xml b/app-dicts/sword-Haitian/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Haitian/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild b/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild
new file mode 100644
index 000000000000..b8a5a781b1c3
--- /dev/null
+++ b/app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Haitian Creole Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Haitian"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-HebDelitzsch/Manifest b/app-dicts/sword-HebDelitzsch/Manifest
new file mode 100644
index 000000000000..a9de600f776d
--- /dev/null
+++ b/app-dicts/sword-HebDelitzsch/Manifest
@@ -0,0 +1,3 @@
+DIST HebDelitzsch-1.2.zip 450760 BLAKE2B 983e8139fb7bde0fc8f67f75d2e821bbd0963e1294bc6163a345b82cc1a12d08fccd579975f7267eb81ad60b38927c0112864a6842d2b15445d9480a8188c454 SHA512 4b6f4ea88094aa519d8a6c1ed7f5e373fa61c56c602d6f79a63de73d820509cd14c68ecb73d3bc7f293ce28ee9dbafcc7b45cfdd7e7416c1cc475029406446dd
+EBUILD sword-HebDelitzsch-1.2.ebuild 375 BLAKE2B 663ab5822054a79f35f90bc41f96c6a195353a2799d7b1acdc0d61b7f4cfac4a1b23a94589e326dabbb062105919f425c808114becf3bd5883157497a1f96e40 SHA512 bc635cbfa46a62ad11a3ae065292fbf0efc768805766e291bfc1cba69599f95cc11f8b547f2752b0e66e6ab4f8222af558a6b91148fda6ecc9c430756e9221a9
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-HebDelitzsch/metadata.xml b/app-dicts/sword-HebDelitzsch/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-HebDelitzsch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild b/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild
new file mode 100644
index 000000000000..526e6365a09a
--- /dev/null
+++ b/app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Hebrew New Testament with Niqqud, based on Delitzsch's translation"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebDelitzsch"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-HebModern/Manifest b/app-dicts/sword-HebModern/Manifest
new file mode 100644
index 000000000000..59b8923f6209
--- /dev/null
+++ b/app-dicts/sword-HebModern/Manifest
@@ -0,0 +1,3 @@
+DIST HebModern-1.2.zip 1171549 BLAKE2B a1642a763604083eb27689a84c1d59f499e5638480cf8525c3bd00ada83d801a99d13e76e2dd5930c48a37316bef0d6a51585dc389de1f0d8fa56375f776c6d1 SHA512 d7970e39db8a37b3eb80b90a629b209fd005ed4575bece6e2299800596b175830504596bc92941f564b1b43cee6833a617496fdd0518a3eaf8818c4e9654d3b4
+EBUILD sword-HebModern-1.2.ebuild 329 BLAKE2B a9650fec48166b5451b71c8a6a80dff27f55cfe0ab3bf6932656e23f7adeb872aa6dbe07bdd9136072491cc8363ab3b89073c567edc8abdf21cf8ce361e94a55 SHA512 f417f4fff3a06380e7fffadda407ef3cdffd41e8498ecce54485a23d4e6aeae29b63229a2e9af2a432d08dbfbf9a508f8486ab2d3ac7c0186546c9a120bf8a64
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-HebModern/metadata.xml b/app-dicts/sword-HebModern/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-HebModern/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild b/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild
new file mode 100644
index 000000000000..02534d421571
--- /dev/null
+++ b/app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Modern Hebrew Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-HinERV/Manifest b/app-dicts/sword-HinERV/Manifest
new file mode 100644
index 000000000000..c4754dda4f29
--- /dev/null
+++ b/app-dicts/sword-HinERV/Manifest
@@ -0,0 +1,3 @@
+DIST HinERV-1.1.zip 2790168 BLAKE2B 120991657643bc0bef2e24289e92d11b573b21de3c42f76ca6d936a3e59118483cf2fb52203dc850159d48284fb71445796c7430c66e4f5ae543aada93b1d041 SHA512 7e14cf63ebcb2aa2ef018414a996080e9a13dc599dd9c01fee96d0b81cb4df02f262afe054fb916ef0bbabf5b252a98e306cda5baf859207f8058bb567580731
+EBUILD sword-HinERV-1.1.ebuild 347 BLAKE2B b59ec28cfb21d09b451b434901f7209b411f0e4ee86b82889b7fd031d4560885cf545c6b8971bc62017f89e71cfb765420af73e055d2255b06f1644aef0d48fd SHA512 c3718e48c1b20e75ba9d28b912bf157c87e7232d2f553223619a4bad70b83c9080d45966c732ca7261cbab02aa3ed0e81fa22c51822b4782d71b08d7ea62f16d
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-HinERV/metadata.xml b/app-dicts/sword-HinERV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-HinERV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-HinERV/sword-HinERV-1.1.ebuild b/app-dicts/sword-HinERV/sword-HinERV-1.1.ebuild
new file mode 100644
index 000000000000..163a2722fbab
--- /dev/null
+++ b/app-dicts/sword-HinERV/sword-HinERV-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Holy Bible: Easy-to-Read Version (Hindi ERV)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HinERV"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-HunUj/Manifest b/app-dicts/sword-HunUj/Manifest
new file mode 100644
index 000000000000..8847e6570e36
--- /dev/null
+++ b/app-dicts/sword-HunUj/Manifest
@@ -0,0 +1,3 @@
+DIST HunUj-1.7.3.zip 1992889 BLAKE2B 81f0eab4ef9946b3df67a4f4c453370bc3e10dc618cd3eca9c2e097192a5b7749150ac28f409bdb0dc2fd88f6778e990c7943f09a5d344e3e30f901554cf8076 SHA512 327564170a70ca9140638bfe021c4563dfa91922e9ba25fdddc9ca5218440f749039b6fd82a4838dc85490f73020bc2f8839e658943ec7eceb0f7023658c0c70
+EBUILD sword-HunUj-1.7.3.ebuild 358 BLAKE2B d0ac0036117b8b355eb6c8c50c1b9d66da724ec2feb8a76ba4b52f6960bad4ff8498adb4e7ae0929b113771bb26698a5a17a76b505910012c30ed55100547de7 SHA512 92b558474b151c3825276141b580206aac08e5f8da7f4f25f7e98c2373a76ca75839ce78d37e66c6e40b9fb86e4beff427a3b3095c4f59026673f6908c91276f
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-HunUj/metadata.xml b/app-dicts/sword-HunUj/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-HunUj/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-HunUj/sword-HunUj-1.7.3.ebuild b/app-dicts/sword-HunUj/sword-HunUj-1.7.3.ebuild
new file mode 100644
index 000000000000..32705df61d74
--- /dev/null
+++ b/app-dicts/sword-HunUj/sword-HunUj-1.7.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="The New Translation Bible of the Hungarian Bible Society"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Imitation/Manifest b/app-dicts/sword-Imitation/Manifest
new file mode 100644
index 000000000000..74aa0a1fbfea
--- /dev/null
+++ b/app-dicts/sword-Imitation/Manifest
@@ -0,0 +1,3 @@
+DIST Imitation-1.7.1.zip 126981 BLAKE2B 49a0cea9a24e17688d100fe89d19f435f9cc147646be7da6c734590b3f23d28dd316662e5bab87176be41f63ee64fab81cc1302cc456d082e218043d6e892a8c SHA512 0f2b5d0182076ee92b12454aac13bdb7009dc7fff5e582985c3e06774d0eef278fea5a03e3734cc382424b7b7ba6ecb0061509fab234bb656d6b65dbf955d792
+EBUILD sword-Imitation-1.7.1.ebuild 348 BLAKE2B 713f9503b82acb602db1656ba40b44eea421f598385fea87f1f4b81e6c1a5d16d8493d67ca7e8e6f2b75297d6a1f386e801fcf8d01fb7f7b337df124aac59aac SHA512 72add9013362df4c49bcbfa60cb83bfcd7b1d7689c33ce833aa336070a6b85dbc3805497da802906b15a8a70f14f65207809b221b8f0bea5ce44b73640617f7e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Imitation/metadata.xml b/app-dicts/sword-Imitation/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Imitation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild b/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild
new file mode 100644
index 000000000000..6cd50daaa63c
--- /dev/null
+++ b/app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Imitation of Christ by Thomas a Kempis"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Imitation"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-IriODomhnuill/Manifest b/app-dicts/sword-IriODomhnuill/Manifest
new file mode 100644
index 000000000000..82d9a2bb757b
--- /dev/null
+++ b/app-dicts/sword-IriODomhnuill/Manifest
@@ -0,0 +1,3 @@
+DIST IriODomhnuill-1.0.zip 63376 BLAKE2B 6edbbcb12ed687a0d6f626abf34c057bd2cee2d3a12cf5b9bae16e96a16411718996b816f2e6fcf12a05bcb383e146ae197a84e1708df4cece4ea89e8ad63ef4 SHA512 5fc3024fc0ad1dd88e544e3270f23c8af446a9d4a8324838da7624144d2c6090db65f28d4776dc2df22cd6d1520464859c7de8405e1d45efcff904f7f360c5bb
+EBUILD sword-IriODomhnuill-1.0.ebuild 358 BLAKE2B 0d82f535735e139fa5d76d78c717fc89cedbd3fa0e2cbd135f021a40c6cc9a656ac907e9e5c00548ba313c9b479a21d6f2e469948881167c3e0c1f5c0c3f25bc SHA512 af67fa36a96a5629e1fa4af3784034b899a54ce05e53db6e75402a9190499c2e0a1e1734960790e98801723f389a9cd9946d2a95cf064dd4e3d998bf3e2eef39
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-IriODomhnuill/metadata.xml b/app-dicts/sword-IriODomhnuill/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-IriODomhnuill/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild b/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild
new file mode 100644
index 000000000000..1a275243cc73
--- /dev/null
+++ b/app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="A modern Irish New Testament (Luke preview)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=IriODomhnuill"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ItDizGreco/Manifest b/app-dicts/sword-ItDizGreco/Manifest
new file mode 100644
index 000000000000..0f3c4767653c
--- /dev/null
+++ b/app-dicts/sword-ItDizGreco/Manifest
@@ -0,0 +1,3 @@
+DIST ItDizGreco-1.2.zip 1540580 BLAKE2B 7688d565e91c53fd54371ab3b5fedd83abefafca8852190747f07caa480f41453f80dc6b6576c62f2ee1dd28da084898b68bf457fe7b01394cfb045addea3109 SHA512 926e124a34ed4ddba5f58073350883ec5a4367cbdd4681e23449d14163268f451807881e1a1b21f789a9f5bfe4a924fdaf256f530bd6d6931906da6a698f4143
+EBUILD sword-ItDizGreco-1.2.ebuild 351 BLAKE2B 3209ec097aa26367078dbcd946e66285f8417e145a8c87ea1bb41538817896004d537a5451ba453649ba192c8934334a92d41090f928dd3662f463590e83afbd SHA512 c5bcaf12f2bf3beef806bd0e90284cd1f3092062c64d1b0e90235e9a6caa890dae8da66ef6071b883f50665a8e86436a8b13449d263679a3f925c9b7c6309b03
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ItDizGreco/metadata.xml b/app-dicts/sword-ItDizGreco/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ItDizGreco/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild b/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild
new file mode 100644
index 000000000000..bb95f8d049c5
--- /dev/null
+++ b/app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="Greek-Italian Dictionary of the New Testament"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItDizGreco"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ItNomiBibbia/Manifest b/app-dicts/sword-ItNomiBibbia/Manifest
new file mode 100644
index 000000000000..e252b5d77136
--- /dev/null
+++ b/app-dicts/sword-ItNomiBibbia/Manifest
@@ -0,0 +1,3 @@
+DIST ItNomiBibbia-1.0.zip 573300 BLAKE2B 1183a6ba2ad8d4be94068e891819023c24521b973c9af38d72e244e50c0a2f103aec93a5a73f1271ab79ccf09c0c07d5e7e85f8910314269a207123be983dc6e SHA512 49e1f3cc6674cb6ee2410ad5512b753a99ee074777ae0c646d63e7fbb4db73e44d60cb1f37491ba349809b154dcf0b37465822cb149ba9f27e37c4f7f115d8fd
+EBUILD sword-ItNomiBibbia-1.0.ebuild 340 BLAKE2B ec3deef6ee542b8e9c99e316febbd23d770f31fcb6f924993327266dd74f7d1905d4e61e4a207e702b89a7acfa2d2fd368bab8a50ea14c25210078a5165da6ee SHA512 ebcf40d13f0a760ac197711b6179c81b9ec22afbb03aa90d8bffb7e19c65de2073a64e9e8bbf8c6d977996ec8accc0e43529c08ea4694682ebdd39fca5526e0a
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ItNomiBibbia/metadata.xml b/app-dicts/sword-ItNomiBibbia/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ItNomiBibbia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild b/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild
new file mode 100644
index 000000000000..038fbef66da5
--- /dev/null
+++ b/app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.1"
+
+inherit sword-module
+
+DESCRIPTION="Dizionario dei nomi della Bibbia"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItNomiBibbia"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JCRHoliness/Manifest b/app-dicts/sword-JCRHoliness/Manifest
new file mode 100644
index 000000000000..e29f0f79e5ae
--- /dev/null
+++ b/app-dicts/sword-JCRHoliness/Manifest
@@ -0,0 +1,3 @@
+DIST JCRHoliness-1.0.zip 364726 BLAKE2B ae8e3fc039c92079a983fbaf6e08aea07e1ae7ad8c35b5e7adabce3202b29c30b7e8f750970fbfd2089b60532bc0855e514307385916f9695cbf49e5fe7d4dda SHA512 6ae9d21c2371edf081ab979ce1ab8e3ad84bbf0855f594c1f168490d55ebd11e113d48ba91e52e0e5c6d13b12ffd13e9ad1fb40932a3029a6438eb09a387bd5b
+EBUILD sword-JCRHoliness-1.0.ebuild 335 BLAKE2B e9685d41495548f942c5971762b6ab541aafa72f92c6ee186611691710fc40e57684db0cdb37a9e9daecc10df4b5cb00571dc2852ad7b1ec98aebb8b8b6372ea SHA512 d99bbda7974ec1643615c4eacfacc1b0d3ebdc815785c3c52f5fb3f4fb3c714b85fb38fee80f75cbd0bb7b24ee48ff293051a6f4b2f891bf4ec68fca13b5d932
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-JCRHoliness/metadata.xml b/app-dicts/sword-JCRHoliness/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-JCRHoliness/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild b/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild
new file mode 100644
index 000000000000..8219fe204cad
--- /dev/null
+++ b/app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Holiness by J. C. Ryle"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JCRHoliness"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JEAffections/Manifest b/app-dicts/sword-JEAffections/Manifest
new file mode 100644
index 000000000000..f944204097de
--- /dev/null
+++ b/app-dicts/sword-JEAffections/Manifest
@@ -0,0 +1,3 @@
+DIST JEAffections-1.0.zip 334808 BLAKE2B 640835bf426e904f74406616a639acc2b7f92e4f07a2b386dabcde6dbeca69427cc06e9a740daaf00431b066bb654db3ed3ba23c3310bba78325a628f6db6c2c SHA512 a0f7e4f9836d5065be283c15d2f520d3eb20e8de7c94e1c86f7958e45e50fe5b39612ba3c790b06c8f11b984a893d72948e9181746779abe46b3f61b67dc8293
+EBUILD sword-JEAffections-1.0.ebuild 354 BLAKE2B d43b7dac5f36964d51eb949e29f8a71e4fedb68209cb6a840bf89e63921be5b2073cf0ddd1c57a5739df00629a25bc317a52b1e1d0540377fb141a9c5e28831c SHA512 714b0d6afaccf80c6cd768c9413d2fbe135642b477cc7ba277027a250187f7f529425778cf512779146137d93d22b2d93bda6bfab8dc6371b40a199d831e8e21
+MISC metadata.xml 574 BLAKE2B be2e6321072aa2cc1544fc9843d4b088e0161ebc47a1045bba1a32539c7625674815f0a64df23a78e3209392f01c976a142cad024f4993867c04a70de6157e4d SHA512 c440eaaa1e15397b9560d06060079db4e00c74c98567188218e5d25a31f2395dfa8acdf38ca1af50af44e2a72920ac2d009e5208eecbcaf5eb5a6e33993abc6c
diff --git a/app-dicts/sword-JEAffections/metadata.xml b/app-dicts/sword-JEAffections/metadata.xml
new file mode 100644
index 000000000000..16833f3cc365
--- /dev/null
+++ b/app-dicts/sword-JEAffections/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		A Treatise Concerning Religious Affections is a famous publication written in 1746 by Jonathan Edwards describing his philosophy about the process of Christian conversion in Northampton, Massachusetts during the Great Awakening, which emanated from Edwards congregation starting in 1734.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild b/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild
new file mode 100644
index 000000000000..f6834d710ca8
--- /dev/null
+++ b/app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Religious Affections by Jonathan Edwards"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JEAffections"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JESermons/Manifest b/app-dicts/sword-JESermons/Manifest
new file mode 100644
index 000000000000..607fc1a48e8e
--- /dev/null
+++ b/app-dicts/sword-JESermons/Manifest
@@ -0,0 +1,3 @@
+DIST JESermons-1.0.zip 373636 BLAKE2B 016c4a8233145ae820de8fbc0634fdd33c01717828b64ba7f4093791c7dcd8aa02cb14850bb2f6f6ded415acd0df1d202a5fe367999f7420cd70ca679529f576 SHA512 07ab1be31b5661c15be92d7c31e3a20543d29d062ebb6ee1ddf8e11e299f509df20d11f312e95db792d48a7015a3d4f0e0aa92f11f52f535ff3f4f3c97ab7c46
+EBUILD sword-JESermons-1.0.ebuild 344 BLAKE2B 5342bec1e71c1773712d93e7d2a6a972cd948943db317e832da9047e4027c952aeedbb4675e0d6d9c1dee5253db83a748118616e1c43526787b07289b952fca6 SHA512 ebcb09795d8cff92fd4d37a645f4537ded715ef2cb3b3f75d507539fb64cd8c007f046172450b5e2f41a4044875f9368ed9d0c87ed3e3774f17fbf4e640943ba
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-JESermons/metadata.xml b/app-dicts/sword-JESermons/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-JESermons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild b/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild
new file mode 100644
index 000000000000..d5e142b43214
--- /dev/null
+++ b/app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Select Sermons of Jonathan Edwards"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JESermons"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JOChrist/Manifest b/app-dicts/sword-JOChrist/Manifest
new file mode 100644
index 000000000000..3b20326094c3
--- /dev/null
+++ b/app-dicts/sword-JOChrist/Manifest
@@ -0,0 +1,3 @@
+DIST JOChrist-0.5.zip 291983 BLAKE2B a8191001152244ee0b7da93440771da431360050ea165f8cdd8131759a5822286e0368fba66a977b698cb2b06c7bb2085d193a0f635b4edb56112d563f25a260 SHA512 f5567dcefba877680ade70d4b84c09ea26d046584e14d51dba65b2ae3e62e26e2a01339286b6417668518d39cf2c981516fee9a750cf17c123e7f8fb4226f10d
+EBUILD sword-JOChrist-0.5.ebuild 335 BLAKE2B a34c93ba39d466b0b7e94df095ff87532aeef13dbc4d314a65fe3835d45ba783cf6242c6ca5140567e9b325554fc01188e8bba26220872635a947e738ae64a2c SHA512 125018ba4a348dd04b99d44c45588b875ab7ed06108ca68aafbe79d0fdea60418eb26d525109d250f41236656e24ea272a9b4af930ee348e9233b4e26ebcca5c
+MISC metadata.xml 837 BLAKE2B fda4bf69cd729cb5df618bf541004eec2536f8b07933182883085c58fa086618e46792f4fe79fdb7b7fa82787fa3054c6ec40f2b27d25d879fa3708d572f26b7 SHA512 7245ea04ac1ee699126dc20ee3e7d71c4083c16a27739f6787b7379812bf5312899a98f513c3e1d37f09619c8009301c04564599e7a02fc39b308db0ee289e80
diff --git a/app-dicts/sword-JOChrist/metadata.xml b/app-dicts/sword-JOChrist/metadata.xml
new file mode 100644
index 000000000000..df03e5a8b493
--- /dev/null
+++ b/app-dicts/sword-JOChrist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		A Declaration of the Glorious Mystery of the Person of Christ -- God and Man: with the Infinite Wisdom, Love, and Power of God in the Contrivance and Constitution of that; as also, of the Grounds and Reasons of His Incarnation; the Nature of His Ministry in Heaven; the Present State of the Church above upon that; and the Use of His Person in Religion: with an Account and Vindication of the Honour, Worship, Faith, Love, and Obedience due to Him, in and from the Church.  By John Owen.  Archaic words in the text have been automatically modernized.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild b/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild
new file mode 100644
index 000000000000..1b5040b2d954
--- /dev/null
+++ b/app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Christologia by John Owen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOChrist"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JOCommGod/Manifest b/app-dicts/sword-JOCommGod/Manifest
new file mode 100644
index 000000000000..290a5e8d0133
--- /dev/null
+++ b/app-dicts/sword-JOCommGod/Manifest
@@ -0,0 +1,3 @@
+DIST JOCommGod-0.1.zip 412234 BLAKE2B e9e7d27f3e331d194f27bc53553ac0796c9a50ddcf44f4cd45a42a3cc4619d24b7b480db8bc361831e3fb1f6eda90ff788e23518eebd5ec51e6710de282aa2a6 SHA512 621c618a4f1ae92a0e92eb611ced362661c2a29722de2668394d4717678e644aedd062c2250525a9eced932598cfda50bd9d794771f06ab3e43948bdbd0d8629
+EBUILD sword-JOCommGod-0.1.ebuild 373 BLAKE2B 3b4537df67457d40f28610f2f1a446b8418361496961fe7e8ac7db4fb90bcd735505e1b9f3ae7ffb1f701e169e14407f9a4e039be0acbb9b29f873f0de5df3e9 SHA512 ac08c845ff34f726825185e31cd570d1e17d82b8f294823143744c1ab6f5b4052c6108eb88239e575aef3f9dc2882bbf3c1fa365efa1420b86ba80ec9aca5006
+MISC metadata.xml 523 BLAKE2B a2b26cfe933ec1d0aca4b62ae8d18f17cdcf4b9354c7c7a98d7686985bf121419d9e80adc69f94d6acf2eac5060b3c3b10eaeb735c88ac455424e5eaea684bed SHA512 aaa192794f201c37ff921d06e7323546a47fa06f2c50b5ecb32be6ad1f09f78b094191e71e31089a785a8caf38023921e1e32efc3215dc5cba0e65cb0587a595
diff --git a/app-dicts/sword-JOCommGod/metadata.xml b/app-dicts/sword-JOCommGod/metadata.xml
new file mode 100644
index 000000000000..73a226f096ef
--- /dev/null
+++ b/app-dicts/sword-JOCommGod/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		One of John Owen's finest devotional treatises in which he examines the Christian's communion with God as it relates to all three members of the Holy Trinity.  By John Owen.  Archaic words in the text have been automatically modernized.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild b/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild
new file mode 100644
index 000000000000..33e572eddfd2
--- /dev/null
+++ b/app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Communion with God the Father, Son and Holy Ghost by John Owen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOCommGod"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JOGlory/Manifest b/app-dicts/sword-JOGlory/Manifest
new file mode 100644
index 000000000000..f6743b54a9fb
--- /dev/null
+++ b/app-dicts/sword-JOGlory/Manifest
@@ -0,0 +1,3 @@
+DIST JOGlory-0.5.zip 209907 BLAKE2B 7a42b1c2ca0fcaaa421ffd9e2763cb9ed695a021da6ff961b9749c874cc3fe00b785557011f0096319a079e4c8e5e0ffcc55a128babc638eca9677e0106b470d SHA512 20e94b768ab4bdbd27fd2e5c4469402ae0ad3a6bd2c70f26d817d21ac005222aec74eb8e732fb863f62139cdf7983d4bfefeacb8e08aa84935a43b5deafdeb85
+EBUILD sword-JOGlory-0.5.ebuild 341 BLAKE2B 0506fa88fe624b986ac4e3d85f6065a1b371b93454a7dfabb0094b001d64b38d6391670aabdafbfc2d24f472dad67ff7db1f6db7e2f45fb468008e279ce98ea7 SHA512 b5917c382df4d2eb7909ea6d3d883f17b9ed0bf0e8b17958a04e0c6b72ea87b887c2e638d4b5b480ac747f2189e6e8410d89485947f40343d786b4443d2005a5
+MISC metadata.xml 524 BLAKE2B 09307de6d664ab589ec9752a691b299c47510f8def151597cbc52c8d5b733a2ebc32365ea05e77c391ee99c460208fad1223e39d7c2acae7f7dfcf0ffb465272 SHA512 af7b5e93c1c3a5528c0f546e4720d0906eeca2a691b992abe47ad6814c7035693433cc8bab655cfe76a1aeb7707eea2f55b30b2abfa349d76e854775e065fe1f
diff --git a/app-dicts/sword-JOGlory/metadata.xml b/app-dicts/sword-JOGlory/metadata.xml
new file mode 100644
index 000000000000..cc7d612e5b65
--- /dev/null
+++ b/app-dicts/sword-JOGlory/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Meditations and Discourses on the Glory of Christ is a collection of discourses in which John Owen (1616-1683) proclaims the glory of the Lord as it is revealed in Scripture.  Archaic words in the text have been automatically modernized.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild b/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild
new file mode 100644
index 000000000000..391eca8fe422
--- /dev/null
+++ b/app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The Glory of Christ by John Owen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOGlory"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JOMortSin/Manifest b/app-dicts/sword-JOMortSin/Manifest
new file mode 100644
index 000000000000..8b290a3e8ac0
--- /dev/null
+++ b/app-dicts/sword-JOMortSin/Manifest
@@ -0,0 +1,3 @@
+DIST JOMortSin-1.0.zip 95888 BLAKE2B 19020a4a93a0ad73ef575a3c781ce4c9b3f73df00ebc607818af38c7a31cd20391d6b73b82c6bbea1a5b5b195dedd659554af8898aa5de9a8f1505f0f40deb02 SHA512 443d2c0b2754475ee306f7d15f366b0ab894c05c685a3cf58c121de4ba14b61b4bab460146815cc3ba2c7f9db95877f5463f5136c139d5dd867d32b80f2dedfe
+EBUILD sword-JOMortSin-1.0.ebuild 348 BLAKE2B be2f154faf669c40aa797a06d1b4000ffb519b2bdcccb885c19d203872645581fd7878c8f646dd85e10ec566bf2c7c41791de47e51081b608dd38bed5fb6afa9 SHA512 b0d118f9ba776cd9f2048b653bb122af12d36ed7e17a8b9ddf94d500bed1a68b35b7de5a94ce03192a568a45e2481976d171c08728631b936f293274e2e65ecf
+MISC metadata.xml 473 BLAKE2B 594f3e9cddb664f18d9e88e4b7f0e0c0ba03dc567cd232cdda5ee97162df9de03c787fb407407c341e6491b7a507d79d65fbc6e4962a820157d400e0689ae2a1 SHA512 61bb686ce9bf3f8024670850825692d91ffaf22978451925c2556cdea8044f0541c1ab02ec96dfcc98014cb7fd7449d0620b088b802c747072f2f8dbacc03e78
diff --git a/app-dicts/sword-JOMortSin/metadata.xml b/app-dicts/sword-JOMortSin/metadata.xml
new file mode 100644
index 000000000000..1060a22274af
--- /dev/null
+++ b/app-dicts/sword-JOMortSin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		In this classic work Owen addresses many of the questions that occur to every believer battling against sin.  By John Owen.  Archaic words in the text have been automatically modernized.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild b/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild
new file mode 100644
index 000000000000..8493b0c39a3f
--- /dev/null
+++ b/app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The Mortification of Sin by John Owen"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOMortSin"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JapBungo/Manifest b/app-dicts/sword-JapBungo/Manifest
new file mode 100644
index 000000000000..88189352e6c6
--- /dev/null
+++ b/app-dicts/sword-JapBungo/Manifest
@@ -0,0 +1,3 @@
+DIST JapBungo-1.0.zip 560591 BLAKE2B 4904a2f05d5f41de5607689cb776b75d544b84298260512d0ab1ba1d32860c7b8c7876bc376b535ddaadb77e3095f18ff9a324feee9beb20fef9a2d33f84df6f SHA512 253afcd9ae148aa17ac38a25c668868a2027b44ea5196eb944ce52ad4efa180578a27d4a0abec36249d05b02186a92836e026c4af6e38629320bec13dbbd5a92
+EBUILD sword-JapBungo-1.0.ebuild 376 BLAKE2B 7ac822c758d2725778f92f74c8739c5f68c2e4c82218f3cd9b6f327f387eb98d491bd083b24696c2fc9b8a281d96b367a69bfd5b605d011daede757e8c37b772 SHA512 6cbc46503286b7f0f6c5035d08369766f1ff2584534d69a0544ef8b897db040c417f1ef43c87afb50afd1c73a0cd8490a557dc61caa979e978a979876a868342
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-JapBungo/metadata.xml b/app-dicts/sword-JapBungo/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-JapBungo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild b/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild
new file mode 100644
index 000000000000..135765af5b32
--- /dev/null
+++ b/app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.12"
+
+inherit sword-module
+
+DESCRIPTION="Classical Japanese Bible (Bungo-yaku/Taisho-kaiyaku), 1950 edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapBungo"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JapDenmo/Manifest b/app-dicts/sword-JapDenmo/Manifest
new file mode 100644
index 000000000000..2c6745914545
--- /dev/null
+++ b/app-dicts/sword-JapDenmo/Manifest
@@ -0,0 +1,3 @@
+DIST JapDenmo-1.1.1.zip 344068 BLAKE2B 0a7c1ec03a717fecd9b4071563709ce1f0e08d6086530d1e35aef313c48b36ed64e5bf58a65958279382ca35bbd47c2022f0d8ea67b122847bce1db27fe4527a SHA512 4631e31ebd6ed3233b7c742ef4b7c834c8ff36ef092cdff03acc294912a9170d5223f92cc189d5eccf5f6e6de0422702a6639526d90da0d019aed778f1268d0e
+EBUILD sword-JapDenmo-1.1.1.ebuild 350 BLAKE2B d4f892dff1b5f3acf93015eee9d98745113762078d188bf0ad001dd6dc18ac79fc1b2355b0b6abf75af4cce6b7841d115028d6b5d31ec9881634b3d6c85bdf08 SHA512 a45d80846f832c7911472db80f9bce3f3b698c19808de7a78f3f4467880dfd4aa1998d8ea025ca2eade37297b0a8ab3d05d6f7e42e3f35b4ff92a70893f9105d
+MISC metadata.xml 988 BLAKE2B e830c7ae3147135c90d3931706089954201ef276da5724ce569aa94a522b591171334b267eb5595a5d529da43afcc1fab530721455cee517ad0131d7d8433b54 SHA512 6ceee15e91e67af973de62cbdacd314c1b15bc3a081d05d79bb046b97a0ccd914b285597350c1c45bb19f2d686cf9a89c468ef5deb17b9b20ff21cee9d1a253c
diff --git a/app-dicts/sword-JapDenmo/metadata.xml b/app-dicts/sword-JapDenmo/metadata.xml
new file mode 100644
index 000000000000..f5f008a797b9
--- /dev/null
+++ b/app-dicts/sword-JapDenmo/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		"Electronic Network Bible" is a new translation of the Bible by modern Japanese aimed at completely free use. Translation work is underway with "World English Bible" as the base, and referring to several Japanese translations. The latest draft at the present moment is March 3, 2002 version.
+	</longdescription>
+	<longdescription lang="ja">
+		「電網聖書」は，完全に自由な利用を目的とした，現代日本語による聖書の新しい翻訳です。 翻訳作業は，「世界英語聖書」（World English Bible）を底本とし，いくつかの日本語訳を参照しながら進められています。 現時点での最新の草稿は2002年3月3日版です。
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild b/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild
new file mode 100644
index 000000000000..ed38cc103595
--- /dev/null
+++ b/app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Japanese Electronic Network Bible (Denmo)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapDenmo"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JapKougo/Manifest b/app-dicts/sword-JapKougo/Manifest
new file mode 100644
index 000000000000..f9821d5701a1
--- /dev/null
+++ b/app-dicts/sword-JapKougo/Manifest
@@ -0,0 +1,3 @@
+DIST JapKougo-1.1.zip 2113786 BLAKE2B 05d2df789bf27b4f0f9d5069218dd8904870036570d491550f9157fe9c6642672dd81359711e2e63795a9c196ae40336188fc397240b270fdf754a303fe26373 SHA512 aa4d7cf8b4d4f3e782224cc359a524e2f4f99ae211c3b6eca44df18e753a92e91b0a06e727399b11ac0db0995239f41f08d5756cfd2cfcec579984cbb20095e3
+EBUILD sword-JapKougo-1.1.ebuild 369 BLAKE2B b943096b46595ee9a32e534345eae386274b8c46c3942498af6722866d86be9d4a79f754f547b207691012de9e54de0ff3c7428e96d11a9b14180c943fb069d1 SHA512 2f957198781029be0befc8a3d6883b424814efe2cd18f2fa22c2f0d592aa290a856eef4f79914681c84a00f0c4281abd63f7f1c15ed36f71702a4626a2f0627b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-JapKougo/metadata.xml b/app-dicts/sword-JapKougo/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-JapKougo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild b/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild
new file mode 100644
index 000000000000..d80d502cd671
--- /dev/null
+++ b/app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.12"
+
+inherit sword-module
+
+DESCRIPTION="Colloquial Japanese Bible (Kougo-yaku), published 1954/1955"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapKougo"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JapMeiji/Manifest b/app-dicts/sword-JapMeiji/Manifest
new file mode 100644
index 000000000000..511c8104d53d
--- /dev/null
+++ b/app-dicts/sword-JapMeiji/Manifest
@@ -0,0 +1,3 @@
+DIST JapMeiji-1.0.zip 492094 BLAKE2B dc985b7d0ade888eb4957271574f95a9804be962bfc39d34d72ba20eeac2672d0c7304edebf6d16a34ca1b0b371d77062e746aba9ca3fe62e5ecfbfd73973a5d SHA512 7ef97965cdaca67693cb2a2fd5857bb740c90e8aeda17934cad57906a3528145889b2f42c142368d82b35a1e5c859a86b014ddcff68ef138e4acf890efe4f702
+EBUILD sword-JapMeiji-1.0.ebuild 377 BLAKE2B 05dbe53d7002e5b25fac7525252395759c485e71aec5afca488c111373c6a12ba21a4e2600822dcc67a0aaa04a026b43a536492086bf17e669dca265d26e43d5 SHA512 ea403faff01ce00ad32e6b229166e9a3b06ced1b687152fa1a6e4ffa9234e92460c67ee5926313534e0dea37075b0b28523e31d8344a55215689356825a2d55e
+MISC metadata.xml 421 BLAKE2B c479b9a543f0ddb271fad71c446a415d7e798e58ad7f27a2807d6cc8322f1cc8206dc5924ec899962ddbf7983581dda8a33e33c27a1f31a1ce4b389fed02b457 SHA512 6ec1790064de3dd69332f33d44d8b3ffc31eb579ecc6c119b3b955058069ef5374700ef0fa4b9fa9bded99d95e6ec9130102265d8cc0e2f63452cdbb0e4887a6
diff --git a/app-dicts/sword-JapMeiji/metadata.xml b/app-dicts/sword-JapMeiji/metadata.xml
new file mode 100644
index 000000000000..c85996556b04
--- /dev/null
+++ b/app-dicts/sword-JapMeiji/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="ja">
+		文語訳(明治元訳)舊約聖書の初版は1887年ですが、本サイトでは1953年版を底本としています。
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild b/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild
new file mode 100644
index 000000000000..11232a5b77b0
--- /dev/null
+++ b/app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.12"
+
+inherit sword-module
+
+DESCRIPTION="Japanese Bible translation from the Meiji period, version from 1953"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapMeiji"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-JapRaguet/Manifest b/app-dicts/sword-JapRaguet/Manifest
new file mode 100644
index 000000000000..312083c52655
--- /dev/null
+++ b/app-dicts/sword-JapRaguet/Manifest
@@ -0,0 +1,3 @@
+DIST JapRaguet-1.0.zip 645470 BLAKE2B f005c035b57adcda509bf4e687e10aad3005b5a4bc0fecb70c054ae61b960e8e5cabaa597a63607f199533da3b0b171f505cde7dd836c4bdb72b12cd517ed657 SHA512 354d42d23c86306d26af282de07409dcfeda42a2839384d748d2f2c66cb8c153d72959339a7cd4743237a225098c171171ebee4210b5a2e441640843307f2c52
+EBUILD sword-JapRaguet-1.0.ebuild 381 BLAKE2B 96a911b363e51b465a2bf081f2d0907be58cdfaca071712350abb0f08e598bfddb923993a878f10bc04d881b2d8c14ae117e8ecf3c6566b61f00cb6d763c8057 SHA512 e970d15b1ef4c07d91d0b140a651c9874d61995846525a7b84b8ea711c0ad46ba9f34e20d60a36d0199deae79045698e9aaad3ce35739f85efe2d87eecac7f21
+MISC metadata.xml 523 BLAKE2B 9b8a40bed928753458c78afc3c56d78c523913703f74b49ec08547e5480c891c125a1e0829be3fafb0b06c5dc709e5ea36487ba76b4a836152b8bf2334a5c1bc SHA512 7a910fc6b1e5ad28ec5539eabfeb6202884c7e7b6684d3060b2e126835f60eda6fb3a6b2b4535d9a5f4af0b6c19c30a5b818bd783349b24298ce38810cbe7296
diff --git a/app-dicts/sword-JapRaguet/metadata.xml b/app-dicts/sword-JapRaguet/metadata.xml
new file mode 100644
index 000000000000..67f2d56476f7
--- /dev/null
+++ b/app-dicts/sword-JapRaguet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Emile Raguet (1854-1929) was a Belgian missionary. He came to Japan at 1879. He translated a New Tastament based on Vulgate into classical Japanese in 1910. His translation was treated as the semi-official Catholic translation in Japan.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild b/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild
new file mode 100644
index 000000000000..7691c0189403
--- /dev/null
+++ b/app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.12"
+
+inherit sword-module
+
+DESCRIPTION="Raguet-yaku - Japanese translation of the Bible by Emile Raguet (1910)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapRaguet"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KD/Manifest b/app-dicts/sword-KD/Manifest
new file mode 100644
index 000000000000..2c79aa4d670d
--- /dev/null
+++ b/app-dicts/sword-KD/Manifest
@@ -0,0 +1,3 @@
+DIST KD-1.0.zip 11712440 BLAKE2B 1218b0cebf572840f3efa1039c7abcd7fd56e02c906cdb793134f84da596786e0e2928fe76ef76cdd0b0b2d2ee93353e3ac2c00e18cabca6ff2709d653f9e5e9 SHA512 f87c0332cfeb2e894dce0c43a0a99fd19ce67cdac6bf15975990d52c36e9ec5f1d7a9b7a02d8c847d97c4aa10784ea096c29dfd0ff9dac4ca906fe7cbfb57718
+EBUILD sword-KD-1.0.ebuild 363 BLAKE2B abcdd9a29f4dcca92b3915145df4623f5b764c2bb41bbecd97dad97206fd3d8efbd5a0d2b309cb4ee4541e3ed16b00757992e60136513700ab0499e0c564de1a SHA512 d7366d89cf2f540805d591d2ca499dbf991659f84bfedbb46e383f20250beb0cc44325268e7ed348f9bb51d5e65d8c43e38111906db09ed07ae7aca91872dd2e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KD/metadata.xml b/app-dicts/sword-KD/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KD/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KD/sword-KD-1.0.ebuild b/app-dicts/sword-KD/sword-KD-1.0.ebuild
new file mode 100644
index 000000000000..9b9b8ddd74ff
--- /dev/null
+++ b/app-dicts/sword-KD/sword-KD-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Keil and Delitzsch Biblical Commentary on the Old Testament"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KD"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KJVPCE/Manifest b/app-dicts/sword-KJVPCE/Manifest
new file mode 100644
index 000000000000..d1412d2f06b9
--- /dev/null
+++ b/app-dicts/sword-KJVPCE/Manifest
@@ -0,0 +1,3 @@
+DIST KJVPCE-1.0.zip 1561436 BLAKE2B 0baa54c37e2dcf365a8ad8a07c1af25074270fd06b814058cf067e6f139635b9bd48e019c387526a8c3c0573505afb6a12c20a73d4230e8aa7b63c293abbcc5f SHA512 aadbc163f998d59bb3a22fb2eef5f6b1ce4d6cabe01e215716d178de3aff114f65506ff8ea5670ebbb4bf77db4d1cf9338ace2ae34d943e991c32c592b5de68b
+EBUILD sword-KJVPCE-1.0.ebuild 349 BLAKE2B 042f87738ddddfba67f21a21d8c7fcef0542702e84bde140a9a453d65473a4c1dc5bd0e53acb74fdb0cf5c86e361384ba25d18c4a72e21822a0e1e7d5e179e20 SHA512 6d46ea5a9993ef1d1d24fc0cf25839587d1f655d11fc17d32602cf9a8dd5951162c741d8cd5eecd3d946bd29f9d1688ac07dc3895d3d53190fffbfa990a4bca1
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KJVPCE/metadata.xml b/app-dicts/sword-KJVPCE/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KJVPCE/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild b/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild
new file mode 100644
index 000000000000..20119ff621b5
--- /dev/null
+++ b/app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="King James Version: Pure Cambridge Edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVPCE"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Kapingamarangi/Manifest b/app-dicts/sword-Kapingamarangi/Manifest
new file mode 100644
index 000000000000..a0e6b0888e5d
--- /dev/null
+++ b/app-dicts/sword-Kapingamarangi/Manifest
@@ -0,0 +1,3 @@
+DIST Kapingamarangi-1.0.1.zip 3916592 BLAKE2B 94704fe0cda9bb103f42e47590fa3e225c253553011ede7e57520041b3bff7f04db838036f3fb26ee179d4fdce0ad680388350738376a8b2748bd84566c5af65 SHA512 d4af52dc3d55d89a732e4c466d3791a113ee06cee292bbcd5227285a81c582ea0f3415879283071b99517add4f3d54ed30f611f1040923bb39018d938f9ee556
+EBUILD sword-Kapingamarangi-1.0.1.ebuild 360 BLAKE2B 3506bc97bcdcb9d4a5c7aa3d3a7115f65e3b3bd9cc4c40f0900a846de70a1dd977cc5fa27893576fa01a50825fa318eb6f6c93fd6eca63e3504fa3c104607136 SHA512 8f90766b2df33399faa19ec102bb521f72b0dd1c6404ec36c952d728a06604568ca3600bdd6645d63880c7e0cfea84af498addb3960858a00551e88ef67c7444
+MISC metadata.xml 440 BLAKE2B 229cbba4d496551ed1f09b189aeb2fa0b578a0f8d559d9cf255c2782d9405b113763ec68e81e910e912278e7d5eee22e1b28069ed94a80a27245111fceda214c SHA512 0a9b4194d9b802429d9fcf6908aa0b785c6472382c386bab5adda16ce1c044bb50a81f8dc8aaf3091ae3a9554904d17fae7c6fba0860ebd94606b37aac2bbc56
diff --git a/app-dicts/sword-Kapingamarangi/metadata.xml b/app-dicts/sword-Kapingamarangi/metadata.xml
new file mode 100644
index 000000000000..a1a9148f0259
--- /dev/null
+++ b/app-dicts/sword-Kapingamarangi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		The New Testament in the Kapingamarangi language of the Federated States of Micronesia, spoken on the Kapingamarangi and Ponape islands, Caroline Islands
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild b/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild
new file mode 100644
index 000000000000..b0051eb74629
--- /dev/null
+++ b/app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The New Testament in the Kapingamarangi language"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kapingamarangi"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Kaz/Manifest b/app-dicts/sword-Kaz/Manifest
new file mode 100644
index 000000000000..a99b812f5ac0
--- /dev/null
+++ b/app-dicts/sword-Kaz/Manifest
@@ -0,0 +1,3 @@
+DIST Kaz-1.1.1.zip 3614233 BLAKE2B 076128f674e390bb6f089fa689cb0d84eac1aeeba74cafd9b63a313f148352fbf80a32b2d13cd0b3e9bfac3a78e12a5d8bd6167af45a864db05c3a0f9505fa3e SHA512 bf6ca9c8c62c88400a9c22cfcc8034fc3c54af0a4ecbd16f83ad3c9a84b7a4640cbec20853785b3d3b7e479a11e6fd448b0e6502f0d9371412d84deb44ed7898
+EBUILD sword-Kaz-1.1.1.ebuild 329 BLAKE2B 27052ed9b6753aa7f3dda2e081069a88d97fa98605e9c3bdd646b1e3da04a67e2bec15b747287b14ec96a12d4e8987de9f995d3af2133ad07612dcb36473d84b SHA512 3818972ec50ecabcae904148b7aef500331ca46f6884d5f0b401683085478313d06ccdcc2fcbd94ba9287dcec68eb92887ada6b5225556f8a5fbe7fd779ac77e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Kaz/metadata.xml b/app-dicts/sword-Kaz/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Kaz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild b/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild
new file mode 100644
index 000000000000..76f8d43c6daf
--- /dev/null
+++ b/app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Bible translation into Kazakh"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kaz"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Kekchi/Manifest b/app-dicts/sword-Kekchi/Manifest
new file mode 100644
index 000000000000..4e05b91900eb
--- /dev/null
+++ b/app-dicts/sword-Kekchi/Manifest
@@ -0,0 +1,3 @@
+DIST Kekchi-1.5.zip 1676130 BLAKE2B e31a2d8ea4a6b5df1e26f141bb7959e3244eeac42a98794409121f3a7d6bcd9a1e987a8289f51513d93ed1e850ca66194a1c2315cb33e22ded527b2a18abd180 SHA512 c4c3df33e26165780cdd19441f8765293360119fe5d8179b66a7032893d4885ed5724f1674929f909183f96af5f87f4893e8e4bb72e34af5bb3c6f32b02ca877
+EBUILD sword-Kekchi-1.5.ebuild 318 BLAKE2B 5daa669da95c59c4a0d3caec084619ef19f6e1016ea743cb601d8834a7abc097c29e6f79ad503a54bdda8aead84ddec9ad87bc60b20aee8aaa790b18f22217d1 SHA512 626d24b44666a55bc4ee5685d44339977952ca1ac6cdb13a6b478b4decd47eb7ff71a895fdb1fbe2f01c96be92e0e9094a1ab56492cc14218bda4e2fcd75c172
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Kekchi/metadata.xml b/app-dicts/sword-Kekchi/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Kekchi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild b/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild
new file mode 100644
index 000000000000..80d63c32448c
--- /dev/null
+++ b/app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="K'ekchi' Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KhmerNT/Manifest b/app-dicts/sword-KhmerNT/Manifest
new file mode 100644
index 000000000000..dc9221732007
--- /dev/null
+++ b/app-dicts/sword-KhmerNT/Manifest
@@ -0,0 +1,3 @@
+DIST KhmerNT-1.1.zip 550616 BLAKE2B d1d9199e0605290abb441f2440698cb33f9424b1f4d540c676f529afbf3ecaa0d427ad7c40d6d18a1a25b5dc72c6f55363d422a79bdd651deb37550d4b692541 SHA512 7955344af9dc6cb6ebcdf313563d867a8399c351cbd247e32f5f2c5590d5108ff3ad4f0cca3e9a0fb9fb13838bdcf5606d3b6edd213b38f741758c00e4127ca6
+EBUILD sword-KhmerNT-1.1.ebuild 326 BLAKE2B a9087acafc80fc6512088b35304a88dfbcbfd13f826acc54ea61ea53ddb33d51cae26602b1b29e673417b09d31fe1f37566d479b7623c60cb7a241077c18f89c SHA512 6ac23adf101d93e0d4928d83eda3d16a255baf5bf2c3f02fb63db096c4aea679f6f519964f9eefcbd81e6cdea8b571c0e4e0f0f61a716624192e1deba0a08de4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KhmerNT/metadata.xml b/app-dicts/sword-KhmerNT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KhmerNT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild b/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild
new file mode 100644
index 000000000000..611884e87c94
--- /dev/null
+++ b/app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Khmer Christian Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KhmerNT"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KorHKJV/Manifest b/app-dicts/sword-KorHKJV/Manifest
new file mode 100644
index 000000000000..959249e2f316
--- /dev/null
+++ b/app-dicts/sword-KorHKJV/Manifest
@@ -0,0 +1,3 @@
+DIST KorHKJV-1.0.zip 1711946 BLAKE2B 9f268c8ad2033644a7a379a3407a294331b2d7ccc741708f685084ec491816b12378ad1683933a1d3805973963e5845f30e514ed19d3939b5e7a8c13524565bd SHA512 12e17a5d6c4cc5bc1729ee6732bcd27dbea3eae25f6030104b3b31f912a5546e73982fa9de91e1e69e5561bd851c1e0d96df34b096b306b9b3d0686be7a6c94d
+EBUILD sword-KorHKJV-1.0.ebuild 339 BLAKE2B 3ded1f2eed08b13d968a9b792d1ff409ae5b6e6f61c12bc726092f75dacbba87654e5e59038acc4cbc7ebbcf548902ce01a28276f780799a4bd8e9d4565d9263 SHA512 c6beee406296ac66d6993f9a1bebe3ac2258301eb9101f9acc365823de12e064c3c5599daa54860445ad2c5079d458b61e1da90ac208ba79ca8cd9df91a93f9b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KorHKJV/metadata.xml b/app-dicts/sword-KorHKJV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KorHKJV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild b/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild
new file mode 100644
index 000000000000..0b4625dec6e4
--- /dev/null
+++ b/app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Korean Hangul King James Version"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorHKJV"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KorRV/Manifest b/app-dicts/sword-KorRV/Manifest
new file mode 100644
index 000000000000..9f89efba0534
--- /dev/null
+++ b/app-dicts/sword-KorRV/Manifest
@@ -0,0 +1,3 @@
+DIST KorRV-2.0.1.zip 1476689 BLAKE2B 0be11e327b9d277931fa90a9db01dc6d497029cb87281f6553615dc751b902de0c451abbec248a2446238a52f991cf23425999b0b5049f0d31d630cd0bdc5b82 SHA512 a0e5acfb4ee3113c42c3f14fa96523740b6bc17031b004b17172ea229eb1bfc6081cc32fd2efc71518863335b39665e873fc7c17ca78ac26c3e85f6b37c16223
+EBUILD sword-KorRV-2.0.1.ebuild 338 BLAKE2B 2069a5f1bfeb3c029c0ecf32ad00f1afa92cb4a43522f66db5b8a58a5de860737d852065d5f52a8c05b4c3f04b4dadab8c5086c56cbe21db707e92ba01f38dfc SHA512 cbb5ca3c24dc985ef1d7bf8a6a1b9a5c7b59c5a1ca57787fdebab92073757168c756bfc0c76123b7c5e6ccba48af4506f99f94beb822d21fe23ddc79e1d5ee5d
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KorRV/metadata.xml b/app-dicts/sword-KorRV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KorRV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild b/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild
new file mode 100644
index 000000000000..d73590286f0a
--- /dev/null
+++ b/app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Korean Revised Version 1952/1961"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorRV"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-KtuVb/Manifest b/app-dicts/sword-KtuVb/Manifest
new file mode 100644
index 000000000000..202b1dbb1db0
--- /dev/null
+++ b/app-dicts/sword-KtuVb/Manifest
@@ -0,0 +1,3 @@
+DIST KtuVb-3.1.zip 2847068 BLAKE2B f5f491775d14f1c8c5e7572ad7cbcd1fdb0840f3b87c23fd290dd04de9213e703c481dea6cfdae07be3361d46974097730982733a3232d69e403c2c05485dc79 SHA512 358866fc8572657dd0132a73a1ec317b896c256b50cb2328776f6a69ab51da6200a8150e9e9cd59dbfa62443c456f6afa0d08f5cc5fbed0bc1b5e4b32f10fa90
+EBUILD sword-KtuVb-3.1.ebuild 379 BLAKE2B 1abcb9484e1732f639b30b98f1be27e153dabecaa0f2be34ab968c66dcd3b4b869af833f924a27ede5de2079241e90ce65bf429b2996336f98c39a101765be61 SHA512 7009bac4e62ef7599ab2cfeb0dc3d21b5e8dde6492326cd6f738485c20aa7b83bb04514d240c86850e9aba0c469e793d34c8c19deab64f52a8ff290d97716844
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-KtuVb/metadata.xml b/app-dicts/sword-KtuVb/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-KtuVb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-KtuVb/sword-KtuVb-3.1.ebuild b/app-dicts/sword-KtuVb/sword-KtuVb-3.1.ebuild
new file mode 100644
index 000000000000..40a90b9bfde4
--- /dev/null
+++ b/app-dicts/sword-KtuVb/sword-KtuVb-3.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Masonama ya Santu par le Père Widart et l’équipe de Verbum Bible Kinshasa"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KtuVb"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LEB/Manifest b/app-dicts/sword-LEB/Manifest
new file mode 100644
index 000000000000..37d51d782c25
--- /dev/null
+++ b/app-dicts/sword-LEB/Manifest
@@ -0,0 +1,3 @@
+DIST LEB-2.7.zip 2230351 BLAKE2B 529f405e81736fae3863f130c13118c9f324ec8e2f607e4a49b620b89df3acbdfae6b25fcfa315e141b849635e329410f34ce30309c9e0230bea26cbe3014e80 SHA512 616ea9b9da9f588db3398545b08e4edf964237a55db1070832bca4307fc86fc1d6dda39454f24f6eb28cbf4d7f1b0a59bd4aa75bf441c42b07a113c1fb33731b
+EBUILD sword-LEB-2.7.ebuild 327 BLAKE2B 2b7bc17057acb341fdcd21dff01142a127110c45e79589699d3b0a3c7290e488da23d7ec7b1a96021f8ac8fba4306ef6e2037870abe71d856141686cbf85502c SHA512 74ebe83295d4f481d24fdc7408f25d2f10ce1f4c974e8f1fc0f8a12db6608a44945a21e1869151fa3e4817c1655c5baa6f641eba3b17f3cc5d1b9d6ef68fddfa
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-LEB/metadata.xml b/app-dicts/sword-LEB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-LEB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-LEB/sword-LEB-2.7.ebuild b/app-dicts/sword-LEB/sword-LEB-2.7.ebuild
new file mode 100644
index 000000000000..540766b887e0
--- /dev/null
+++ b/app-dicts/sword-LEB/sword-LEB-2.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="The Lexham English Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LEB"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LO/Manifest b/app-dicts/sword-LO/Manifest
new file mode 100644
index 000000000000..debbfcdfb2ea
--- /dev/null
+++ b/app-dicts/sword-LO/Manifest
@@ -0,0 +1,3 @@
+DIST LO-1.1.zip 366644 BLAKE2B 042d363ec1038fd0c68e3794763249cd777083dbbcfa4ef88263fc1d3fd89ce1fdd58cbe593d96aa69f26a13957ab3fa9fd2563e9165059bb1905b0ebac0ed16 SHA512 0442690740bf9bdaafba5f08497ca3615e65a4b327abb57834c95a0e2a00a32081949460c85fb4505df455e84ce3c3d83b7f391f60baa37f44ac4714463e44fa
+EBUILD sword-LO-1.1.ebuild 325 BLAKE2B 43cc5a367950d147f83a283d9f13258b59a40d8707b89d85c809616762cfdc6d96ec764524ed69b208a184c91574eb9cb5ff5553dc86715518fb403f8b4b8a01 SHA512 eca40d949c5c63a0eddcc2b063bf3d04a03623538da7999ebe73c246e96b5cd64491256ab181c7f5dea162408904f9a5ee7e9bb763f9abc8d0ea1f4531ebc952
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-LO/metadata.xml b/app-dicts/sword-LO/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-LO/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-LO/sword-LO-1.1.ebuild b/app-dicts/sword-LO/sword-LO-1.1.ebuild
new file mode 100644
index 000000000000..e7d66d9d29ab
--- /dev/null
+++ b/app-dicts/sword-LO/sword-LO-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The Living Oracles NT"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LO"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LXX/Manifest b/app-dicts/sword-LXX/Manifest
new file mode 100644
index 000000000000..6fa21f6f74e1
--- /dev/null
+++ b/app-dicts/sword-LXX/Manifest
@@ -0,0 +1,3 @@
+DIST LXX-2.5.zip 3279771 BLAKE2B 40bec0a0f84e463ec770d9deda2fea0653bc8b3e92fd0cbd98f48311c1b07cb22f2ffa89a48d744b14890c5777fe1c449996e1b70788d4b15d3fb27b3900b89c SHA512 816ce66342bf4b7e23723a81dbf4e2f6a5699a657d1cb53276259ea96881b001d89cf3c18a0e9e67c57f059cddceba268d5af4bb020889ff2dfee19a6f6ad73d
+EBUILD sword-LXX-2.5.ebuild 346 BLAKE2B 21f59d966d5844cc5d23235e4f6f74f6f2d40b7fe0a779264d96da8fa7e9e66ab8ca1d210fddae195cb3b6b8228f55474aa7b37a69aae30981f91b45cedcad4b SHA512 7fb0f58e9a96f9f6f74eea44528d70241f67f120edb375c757e1f0543cae68540854bcfea64971f6c3023a9862eedebf4282141234f744ddc01ba186098225a9
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-LXX/metadata.xml b/app-dicts/sword-LXX/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-LXX/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-LXX/sword-LXX-2.5.ebuild b/app-dicts/sword-LXX/sword-LXX-2.5.ebuild
new file mode 100644
index 000000000000..2f9c7e484ce0
--- /dev/null
+++ b/app-dicts/sword-LXX/sword-LXX-2.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Septuagint, Morphologically Tagged Rahlfs'"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LXX"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Latvian/Manifest b/app-dicts/sword-Latvian/Manifest
new file mode 100644
index 000000000000..f22a39a3b93e
--- /dev/null
+++ b/app-dicts/sword-Latvian/Manifest
@@ -0,0 +1,3 @@
+DIST Latvian-1.4.zip 369413 BLAKE2B 63dce51cd751276f82e2279ea679167516abdf3a9ed3428916f9d74fe67759cfd730cd2ab2a177d25085244cbd867b514d298c122d319602dcb39753b5b59c7d SHA512 4c65d9b3a2e7b252af64dc760d470a72792d6385fe6f8f3e1b79c204738c2a7d95269591a659ba1bd31e0251a022c3cdb23b45c84c3b452d94dc70215893f1e0
+EBUILD sword-Latvian-1.4.ebuild 329 BLAKE2B 5c745d4883bbde21e51d826ccfb601db74186e1ba474badca23ca7bccccc027baa08c5d1b0f60c00cbd980a24b4bf8d5e4d99fc13da1b745fa749ccb89f4c045 SHA512 e4b11d4d16fc9ea6da25114094a1f8f1e60935d89200e790b15407c59c3c74c7a60f8d85dabb15242e03956e50c7e4596565f55af10cbb676ea755fc9910fbc2
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Latvian/metadata.xml b/app-dicts/sword-Latvian/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Latvian/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild b/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild
new file mode 100644
index 000000000000..35afeeb90159
--- /dev/null
+++ b/app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Latvian New Testament"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LawGospel/Manifest b/app-dicts/sword-LawGospel/Manifest
new file mode 100644
index 000000000000..27d6e2072aff
--- /dev/null
+++ b/app-dicts/sword-LawGospel/Manifest
@@ -0,0 +1,3 @@
+DIST LawGospel-2.1.zip 579480 BLAKE2B ee2a7a69816f152d60d3c8dc0e641327ed7327df49b7cd0d336f8d9fce3c503922ecf6d238950c4fd07f82208e065451b9c02d4dfa1e3ce0f76dee648b124a96 SHA512 10dc357e43386e30b4ea330906b816c35cd836c51a35b77e31be98568133f0e5db99e706e4208e3836f28bba28a8da68f7cdc7d5fe5dd82c137acaec103b395c
+EBUILD sword-LawGospel-2.1.ebuild 335 BLAKE2B 6688147286f2a6f96b23914f185852e9b2d6253913de7a3ed51aa659b1ab033091f5ed87324485c8f60be23222b025778991ea54ead04ce9ab52c643919a8c6e SHA512 321d4d4e137071bbd815820ebbd10dfaa832c937732814ea2f9467d2fb27906d8001a488816f22ca6eb6ca871f95ca31af93d599b7f2fcfca24cf47e18d70215
+MISC metadata.xml 704 BLAKE2B 460de0633b3808a7155b42cdac321d1ca1c7db314ef7ec71c3490a43eb9de6ea435f52468c2fa1d9df805f3523ed86db62dc0468f30b9a8f046b9827b64a960b SHA512 88b59de68e3cf1d11c43f71af35e33c7e9697a78bbc07c02db1d38afb12c504e84469ad78016125ebb36857205d5c254a6fac8b8910ebe0d671d0dfdc6ba9314
diff --git a/app-dicts/sword-LawGospel/metadata.xml b/app-dicts/sword-LawGospel/metadata.xml
new file mode 100644
index 000000000000..56db50fed0d5
--- /dev/null
+++ b/app-dicts/sword-LawGospel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This work is an electronic reproduction of C.F.W. Walther's Law and Gospel, published by Concordia Publishing House in 1929. As the 1929 edition was not copyrighted, it is in the public domain. In 1989, CPH released a copyrighted edition of Law and Gospel. That work was not consulted in the production of this online edition. Converted to SWORD module format by Brian Dumont (brian dot j dot dumont at gmail dot com)
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild b/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild
new file mode 100644
index 000000000000..67408cd72a3e
--- /dev/null
+++ b/app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.10"
+
+inherit sword-module
+
+DESCRIPTION="Walther's Law and Gospel"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LawGospel"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Leeser/Manifest b/app-dicts/sword-Leeser/Manifest
new file mode 100644
index 000000000000..41276156c160
--- /dev/null
+++ b/app-dicts/sword-Leeser/Manifest
@@ -0,0 +1,3 @@
+DIST Leeser-1.2.zip 1142555 BLAKE2B 76c1a100ff15a22f55f777cbc1b251f8a3a8831e85a1430be145c990e9d11969d459b862a51ac0f8f7f071934ae3af56e52ece149f2771b34c3269bf71a32fb5 SHA512 21d0151221a60bd1359c5ba6edb7ef466d5a25f6f494c1393a5a2557e83388eed4b1cf9fb85216b62f1446794e1380a93662170f46087ae46dfcc14dc1ba27b1
+EBUILD sword-Leeser-1.2.ebuild 332 BLAKE2B 2b9e1ac390b50ecb0b75f2b137c445d1cf2c4b119da4fc26e05e9c929830f8cf9076d8818b2a77e9b1e8e77f4ed4fdba79ae9e643311d888a80e7dd50e252738 SHA512 2303fd0b215db6b84f66aab50b8ef74766c26db6f2cb91f15f66ce0db984d61c6fcfd74434286bc7c4c8390cb8940120dd6211415897f91300bdf567ab62007e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Leeser/metadata.xml b/app-dicts/sword-Leeser/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Leeser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild b/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild
new file mode 100644
index 000000000000..3fea14cc8290
--- /dev/null
+++ b/app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1853 Leeser Old Testament"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Leeser"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LinVB/Manifest b/app-dicts/sword-LinVB/Manifest
new file mode 100644
index 000000000000..e9b587b547f8
--- /dev/null
+++ b/app-dicts/sword-LinVB/Manifest
@@ -0,0 +1,3 @@
+DIST LinVB-1.0.zip 2095504 BLAKE2B ad3d21887eec285fd052e7ce02fd1ff7c851d8286597c57e4396c89ed6b78e39ca2fe3fbd70cb87197d9d2c0052b2ac990e96958fdcec02e6581a1c47cc4de8f SHA512 cc7d51f5bc8d22594cfea9f708f1eaa8e650f1c447035d85678b737bf48e19ca688167005873418440fc293a2892b36f7e364212c8eea953f80ba832a82e9c0b
+EBUILD sword-LinVB-1.0.ebuild 342 BLAKE2B a39dfed8cb4f7dfb8dd8c59ad286e0db54036409b06dc0753196a2ec6906b7b98577676b977d40f1c7d257c0cc927f0bf7f651a60627b14dff4b57530a3850d0 SHA512 1c131338cb3a01300cc3703a178cad89259673f0e06d1afde5d1303348ef9147f1af62cb6b36d7290aabad9ce6c50fcd4392e9332c92e0266241396befab8cc8
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-LinVB/metadata.xml b/app-dicts/sword-LinVB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-LinVB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-LinVB/sword-LinVB-1.0.ebuild b/app-dicts/sword-LinVB/sword-LinVB-1.0.ebuild
new file mode 100644
index 000000000000..95569394e08a
--- /dev/null
+++ b/app-dicts/sword-LinVB/sword-LinVB-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Liloba lya Nzambe, édition Verbum Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LinVB"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LtKBB/Manifest b/app-dicts/sword-LtKBB/Manifest
new file mode 100644
index 000000000000..b9ee9e4a8216
--- /dev/null
+++ b/app-dicts/sword-LtKBB/Manifest
@@ -0,0 +1,3 @@
+DIST LtKBB-1.7.2.zip 1411962 BLAKE2B 44e850c792b08a47d56492def0c5e57f18b95366e1d9726b3d708b086ec3ce37b8e0904f0b2e2e5167ae3597e29866dee47e35e242b0fc4d2a971a14b060b375 SHA512 f874c121094d315c7d2c53677b5ea5620815cd275a242a508be6b131a25ed014e810550a3d02f823dbc7e47cce80c5a08309ee1d9414296f9117f4fd014022ea
+EBUILD sword-LtKBB-1.7.2.ebuild 318 BLAKE2B 8054114ed63350dec062cba780f62df9b655d15b5d5e656333df06b61eedfbbccf5869981987929c39106594213a10b6a9c06e845e31016c9c8a080e11ceca7b SHA512 526b5149c8dbcff9385906f697c6c0a8798b0f5e255f892d6d3d1c892c1925750d981ae8cf6004ba5758000a78cc9e5124d5bc3d17ff02044ea51beb6fa3c042
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-LtKBB/metadata.xml b/app-dicts/sword-LtKBB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-LtKBB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild b/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild
new file mode 100644
index 000000000000..e2d4143c2ccb
--- /dev/null
+++ b/app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Lithuanian Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LtKBB"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-LvGluck8/Manifest b/app-dicts/sword-LvGluck8/Manifest
new file mode 100644
index 000000000000..c89dda09486f
--- /dev/null
+++ b/app-dicts/sword-LvGluck8/Manifest
@@ -0,0 +1,3 @@
+DIST LvGluck8-1.1.zip 1909136 BLAKE2B 53717a113faa07d06209eda3052f2d2a0d2ddfb442080d272c1f27feb4e4edd19309d91b4a5a70917a5c715f33369d6325b06337ae6371656b165cd30e7e7132 SHA512 2f7ca3917059a43089e88bb450756ffda0b4a4c10c95a4ad0f7087183b0514f17627ee2c4f59ef2883234841a7f817a3d9dd65e5dfc1efa47756e308c74209e3
+EBUILD sword-LvGluck8-1.1.ebuild 335 BLAKE2B e8315651763a0368280d9f6cc023f64b389886e5d0728be610df4b427d3c5a5c2fafd7cb1ffda320fa5d48ff1df9c97e5eee572e9969f11eb4cb603894cb517c SHA512 4db3b1076cb55d4974583950d4340c91c8050546172e55dcb1d9f200b059db1643de1f034a06f797699d244ac02cc8372b3a4d1c4c47bb2f6c07b45cbe5d6102
+MISC metadata.xml 650 BLAKE2B 1a4289321e476ddf5517c629ab78b13433f3281ab85b3cb425d3d4eff197a981d96ea53547fc67f09d1799d490515df765bdfd5525cc4ab135ff8f72dbe12dbd SHA512 02e72b08c5b453c6dca6164c56ba220c0802c1ae149b5224a2676382e855f9b3e0e371c2a692df521a3d9909b80b3b6b43983611731e03298dab9614f21961dd
diff --git a/app-dicts/sword-LvGluck8/metadata.xml b/app-dicts/sword-LvGluck8/metadata.xml
new file mode 100644
index 000000000000..18fb8cbc912a
--- /dev/null
+++ b/app-dicts/sword-LvGluck8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This electronic version was first written by German Johann Ernst Glück and over the years has been improved until 7th edition in 1898. This Bible was created from 7th edition. However some words currently not in use in Latvian language are replaced by words in use today. Some old words are explained in parentheses. Statements or structure has not been altered.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild b/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild
new file mode 100644
index 000000000000..1e5363768738
--- /dev/null
+++ b/app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Latvian Glück 8th edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=LvGluck8"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-MLStrong/Manifest b/app-dicts/sword-MLStrong/Manifest
new file mode 100644
index 000000000000..ee00ff88b26d
--- /dev/null
+++ b/app-dicts/sword-MLStrong/Manifest
@@ -0,0 +1,3 @@
+DIST MLStrong-1.0.1.zip 1111512 BLAKE2B dc13ee00d33ff8794f1769d4e1570604bd5e444938637efda1866c16d0e5f251f862a44801c88c0c1dc5f04ae8d67c767d8fc5b0180ac71ad4b1048f0f841220 SHA512 442ece11580b0f7f2b761c7205a094b69ce5aac194842de8c444c728f78453fa587ada552cad6acccb769f2a9346633871b766fd3343a04234f8be85dab0a887
+EBUILD sword-MLStrong-1.0.1.ebuild 371 BLAKE2B d1069fd8a0b05cac2ba29401fbf87816c020ccb53aa51070fd745c42b4d54bcf11b4bf872c02bb7521c87026ad0b4608b8d16f16cd07ca65f7b19dcbc67c6b70 SHA512 bf357e3abfef31fd0a0284f2632c88194b7904284b07189fa7c08f7b25531b6fe4c7e400e6e701c38e6b0118ef42ae9f51dd780817d54d14b8524b18af6f24db
+MISC metadata.xml 817 BLAKE2B 23e8158678892912de3d47d37423c73d71382cb062be3ce7df13896c0146f4f87517be1586666abe4c120d7e507a146563f2c712eefd2c78ea605155677df612 SHA512 39fa2712a6abc54c10704e3ba18908cba2be8b7ca0d6b9864592cc18f6dea56f587546857f5e7142264c34f96107df7fce4a1fc8b8d94d2773dbfe80ebb79d4c
diff --git a/app-dicts/sword-MLStrong/metadata.xml b/app-dicts/sword-MLStrong/metadata.xml
new file mode 100644
index 000000000000..f35f57d20c94
--- /dev/null
+++ b/app-dicts/sword-MLStrong/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This lexicon is an abridgement of the Perseus Digital Library's edition of An Intermediate Greek-English Lexicon by Henry George Liddell and Robert Scott (Middle Liddell). The entries are keyed to Strong's numbers, and only those entries that match headwords found in Strong's Dictionary appear in this edition. Accordingly, many words from Strong's Dictionary do not appear here, either because their headwords differ from those of Liddell &amp; Scott or because they are proper nouns, which do not appear in Liddell &amp; Scott.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild b/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild
new file mode 100644
index 000000000000..87fa408feed0
--- /dev/null
+++ b/app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="An Intermediate Greek-English Lexicon Keyed to Strong's Numbers"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MLStrong"
+LICENSE="CC-BY-SA-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Mal1910/Manifest b/app-dicts/sword-Mal1910/Manifest
new file mode 100644
index 000000000000..c374dd09aee0
--- /dev/null
+++ b/app-dicts/sword-Mal1910/Manifest
@@ -0,0 +1,3 @@
+DIST Mal1910-1.1.1.zip 2063642 BLAKE2B d5c2e53b700cc99ed1148b25137fa5c670792b877cae3e8c31a4229821e6006a85825675633438518ffc080729616c805d8a8c784713b5d3ed3d6cac62eb818b SHA512 1947611c283aa40d52a02dbc8bb8860837b99750d493de3907a3feca8315fb3960691e21cf04374aed510a505ea47750f956338a27c47a3bfc9a4e0dffe5ea73
+EBUILD sword-Mal1910-1.1.1.ebuild 364 BLAKE2B e4e9dcd50b04ed193f3b54016a9ee583aad1fe12e9e0de6bc41dc77f12a57faba2f7939d5a46232c303a802040355658dab6f130532bea89fcb16b54fa0ff913 SHA512 a81861cf166859315f2da82550a937e470c84c4a2c14fc6bc4b43dde912b47c1d1c87a37d6a1daa3ddcab746bbce978b383cfe0bba52c9045f604e95310bc034
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Mal1910/metadata.xml b/app-dicts/sword-Mal1910/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Mal1910/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild b/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild
new file mode 100644
index 000000000000..9098e277307c
--- /dev/null
+++ b/app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Sathyavedapusthakam (Malayalam Bible) published in 1910"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mal1910"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Maori/Manifest b/app-dicts/sword-Maori/Manifest
new file mode 100644
index 000000000000..ac02bbda472f
--- /dev/null
+++ b/app-dicts/sword-Maori/Manifest
@@ -0,0 +1,3 @@
+DIST Maori-1.1.zip 1397374 BLAKE2B f443a1008acccfd9b9c48171e9102da58a85bd97ce9ac8b6035a6d9aee07ebb20b97de5791c821bcfda371acae739d2dcb36bc57c39767e88fccd4479cefc647 SHA512 3a634eb0e785c43b0d6909d079cc9555f2fcb01735f6a8a80a904306567bc35c1490800024d56bbb194f7d0b78e9f984df068aa128f9bcc6c1fb99fed2bfa0a0
+EBUILD sword-Maori-1.1.ebuild 318 BLAKE2B 1c9a067003b9fb638323f5c40918c651bbccf3ff28915bd29474a18ec577d6190ed8871c866b3fd5cdce48334fe596727874e993aa9b5fdb2ac353027ddc7222 SHA512 0cf87e887a41caaa1e9e4c2366c8005ca2283799c4dd58c8c3a9ca6d2beec706f7a689e6b45407f42bd9f7566e5941288848ab54f6d1af835258a86cbb5f48d4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Maori/metadata.xml b/app-dicts/sword-Maori/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Maori/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Maori/sword-Maori-1.1.ebuild b/app-dicts/sword-Maori/sword-Maori-1.1.ebuild
new file mode 100644
index 000000000000..cbaa2eb0dae2
--- /dev/null
+++ b/app-dicts/sword-Maori/sword-Maori-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Maori Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-MapM/Manifest b/app-dicts/sword-MapM/Manifest
new file mode 100644
index 000000000000..d8363598abfb
--- /dev/null
+++ b/app-dicts/sword-MapM/Manifest
@@ -0,0 +1,3 @@
+DIST MapM-1.0.zip 1731033 BLAKE2B c5cfed8330f00acae5d38486e70efa258732959427fc3b5f01f9b1cb36c4b880199e9db5e971d7eaa5e546ce628c827d275d4bcde9567b9719b2920ca8ef05bd SHA512 c960def4b825bc491dc294ba968126a08f5b3ee3e30bfa1cd00d7bcc88c00fd7e97475d14cf2c8d3d93306a855a11edc5de3972973bfefc8557d3dd5302f2d80
+EBUILD sword-MapM-1.0.ebuild 334 BLAKE2B 58b35c72a9d393383da61df4029404db8fb7b7d3247233664e09b4e50b2d16dea6862c9309aeec3029f98ace3f92139721345af48c2cb6f2e6b5b4e7522bc2c8 SHA512 ccbb6b2b6834d72bac7eb477955742c61fffd187a8ec38df7c1422fa57d77602ebf017ba80a9f84ec6558b60a78911ede61dfb1fd93ce0a212e9d8465dbb1481
+MISC metadata.xml 558 BLAKE2B 0f3949a9a530b7ad21f8def76874beef5c6954d8e22c70be1c88d800fd94936c921ece29f87d4a62b1d1d8b052ee863b37b2969d8b640f00010df4bd9d5b9b2f SHA512 b9e822cb4a66ec53b39969b1e1a48e36592a0ce64c26a072406708dc9d11b4485c436c5a23233b1cf0debe1aa00c939a28b00323e34e680b246dd08533f80d4b
diff --git a/app-dicts/sword-MapM/metadata.xml b/app-dicts/sword-MapM/metadata.xml
new file mode 100644
index 000000000000..976a5c7ea24b
--- /dev/null
+++ b/app-dicts/sword-MapM/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Miqra `al pi ha-Mesorah is a new experimental edition of the Tanakh in digital online format, now available as a carefully corrected draft of the entire Tanakh. It is based on the Aleppo Codex and related manuscripts, and consults the full range of masoretic scholarship.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-MapM/sword-MapM-1.0.ebuild b/app-dicts/sword-MapM/sword-MapM-1.0.ebuild
new file mode 100644
index 000000000000..67ca5acba163
--- /dev/null
+++ b/app-dicts/sword-MapM/sword-MapM-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.2"
+
+inherit sword-module
+
+DESCRIPTION="Miqra according to the Mesorah"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MapM"
+LICENSE="CC-BY-SA-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Mg1865/Manifest b/app-dicts/sword-Mg1865/Manifest
new file mode 100644
index 000000000000..8111c54ec6e0
--- /dev/null
+++ b/app-dicts/sword-Mg1865/Manifest
@@ -0,0 +1,3 @@
+DIST Mg1865-1.1.1.zip 1525628 BLAKE2B 8e88b11368eba767dda2520db3b019222281a42a480660a570946611e36ff2fc930f7ae9b9b715f28c0e20c7207ee72cb730491de437b3bd318949dd71b44427 SHA512 16e254a82b300f3424cdbc9644075a38520bc270aec9ac695ee803bceae445b76baec1ed7822d752ef77522b128b73f8f6abde30e8cc0d13ce502d11e20fae6e
+EBUILD sword-Mg1865-1.1.1.ebuild 329 BLAKE2B 2b587ea3797bc744cc112e9d7ffb508cc57f9ddd61814e7dd286d65e92c328e2c1838a39fcf8491dfe0b227bb2ed09aab48101c02c839909ffcd3363dfce8e69 SHA512 f33b49f11a3c19388b8a4909e6564cfd854ba3bcb06948ed14b657a2c2c7e99a5e566a58041354a96100419c61366b0d85ec62ac31b06561370c26d324d74389
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Mg1865/metadata.xml b/app-dicts/sword-Mg1865/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Mg1865/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Mg1865/sword-Mg1865-1.1.1.ebuild b/app-dicts/sword-Mg1865/sword-Mg1865-1.1.1.ebuild
new file mode 100644
index 000000000000..f3b7b6a3cbc4
--- /dev/null
+++ b/app-dicts/sword-Mg1865/sword-Mg1865-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Malagasy Bible (1865)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mg1865"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-MollColossians/Manifest b/app-dicts/sword-MollColossians/Manifest
new file mode 100644
index 000000000000..a7340a45bdfb
--- /dev/null
+++ b/app-dicts/sword-MollColossians/Manifest
@@ -0,0 +1,3 @@
+DIST MollColossians-1.0.zip 34449 BLAKE2B 22cb5d0cd3f45b364f5b00025b8699921e6bfdba4e2d4538cc6ed931c28fe0fa0d66d8280f6db183946920a525d70cad4c9f584e2205a13aadf59ed0481b8b57 SHA512 c4a365892cc14191e34fdfd4f41e486277445fb95e3b5c7bc3f6a267203c265e38888342fadae014940fe17f004738a0cb2136ac471082db1765cd5a6f503b36
+EBUILD sword-MollColossians-1.0.ebuild 397 BLAKE2B 8e5395884350a7526a15ba3c574146d74bb6619422a3525dbef7766f587b6a3cc26b8470a9e5055f44ca48dff2314ff1709ff7a96e68d98715a920da602cb85a SHA512 6a05daed3c156bbeed8d5a2cdafad9db4698b664a915ca745bbfb79765e8fde37e60d50c3a009c85b4bab994996192fe403275dcd8b0581e5f83d5d15280810b
+MISC metadata.xml 441 BLAKE2B 25307a1f6711a7a8024cbe4ed3112a39085405a421bd39f7eb88b53686503f4888ff719d96ce61d8c8d7e187927652c3c10f83eab33e61f971e16bd7992a6652 SHA512 48a19af534153ffaea9f59aa034b0b4eeabdde819da643b00c0c127644bd75cb91336e11e622840c629aa91e75c4125e2bf1cf7225996495bb2ca93f013f39e1
diff --git a/app-dicts/sword-MollColossians/metadata.xml b/app-dicts/sword-MollColossians/metadata.xml
new file mode 100644
index 000000000000..9ce01078724d
--- /dev/null
+++ b/app-dicts/sword-MollColossians/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Paul's Letter to the Believers at Colosse - A Series of Devotions by Pastor Randy Moll. Scripture quotations are from the King James Version of the Bible.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild b/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild
new file mode 100644
index 000000000000..75b596ba3b94
--- /dev/null
+++ b/app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Paul's Letter to the Believers at Colosse - A Series of Devotions by Pastor Randy Moll"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MollColossians"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-MonKJV/Manifest b/app-dicts/sword-MonKJV/Manifest
new file mode 100644
index 000000000000..4acbb48aae53
--- /dev/null
+++ b/app-dicts/sword-MonKJV/Manifest
@@ -0,0 +1,3 @@
+DIST MonKJV-1.4.zip 684932 BLAKE2B 2bd51fc94363201857b963d05b4d4871481ed0c7383a087e220e34bbaf2199426ae4352fec974b5d60abad7eca5e5290d9e82d907a5a4880e190022f518be291 SHA512 777dd0916ed2cbe211d561f237afcfb036e6f7a792fac9f43738ba97de87c248064b234cd77023ae478b3b59180cb41948443143c7a1a26fda83a6a76aa2449a
+EBUILD sword-MonKJV-1.4.ebuild 331 BLAKE2B 404f7c71760b9eb7e2a2955aa892aa7146f661fdcbfad8a76d217c6e1c070f559532386d42f0b4a55849d22902290c7f17eaa4ec7f7ebb642078130757387529 SHA512 f22e7c9f4c52df18419e13a2f84d618193d66bc3d0a4b6a3aa2b7065541341ce0abab73a8b8327e0884e98615f66f299fcf1d36ee95930847bfd00efb55146ef
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-MonKJV/metadata.xml b/app-dicts/sword-MonKJV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-MonKJV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild b/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild
new file mode 100644
index 000000000000..bff862b744b7
--- /dev/null
+++ b/app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Mongolian King James Version"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MonKJV"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-MorphGNT/Manifest b/app-dicts/sword-MorphGNT/Manifest
new file mode 100644
index 000000000000..753f3ebd853c
--- /dev/null
+++ b/app-dicts/sword-MorphGNT/Manifest
@@ -0,0 +1,3 @@
+DIST MorphGNT-2.0.zip 1327923 BLAKE2B 9833022838334ffbca6e9dcae52262d1539d5d19ab55d471afa55a3df30f6da673a02e38d36b8ea247ee002ef805cc7650bced3ca35fa36abd26a5cb6cbe9ec8 SHA512 02cbb90efa3c4fc45bcda9745511fc426922ada5287a0f5742903d528f3a9c037f6d3be5fc8c719c5f945ee31ab99a14043751dc32a638769491cd9d1cb4524f
+EBUILD sword-MorphGNT-2.0.ebuild 368 BLAKE2B c74401acd41db9fc51c3fee413d4b02f611d3876eac885f92b58333387e0dc9312f42f7deae91545a5f6902f270ce05654b1e32f45b50fb1a9a19a92dae48f25 SHA512 d19646ac05540ed72f4762f1397604ff92a73c28f3bbc9cda7ddc87f858cf93c71b4ea42c10a0cbcf0e8aa3ac84ab195d40b49c50434c2aea79aeff0eaafbedc
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-MorphGNT/metadata.xml b/app-dicts/sword-MorphGNT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-MorphGNT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild b/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild
new file mode 100644
index 000000000000..a88fbb921ddf
--- /dev/null
+++ b/app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Morphologically Parsed Greek New Testament based on the SBLGNT"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=MorphGNT"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NETfree/Manifest b/app-dicts/sword-NETfree/Manifest
new file mode 100644
index 000000000000..cb531ec664c9
--- /dev/null
+++ b/app-dicts/sword-NETfree/Manifest
@@ -0,0 +1,3 @@
+DIST NETfree-1.0.1.zip 3408528 BLAKE2B e5456499d99567750e1891688e59cb651bdc0a8a88bd455031ed51d3682952cd41b27749c533e46badb683002b48f430a83cc6131c25ab6ce464dbc84a284209 SHA512 bd444870d72d169573218594897709d4bde602bc8ad2b07cd2952ce35077de01c643fd4ae8ed6d757afc237b9c2e542e1b6ec795007343610d48d25cfd98d645
+EBUILD sword-NETfree-1.0.1.ebuild 362 BLAKE2B 614b6c99a9e4e1a216909f4d8d7ba280e3230ece442f342198a2592285255ef66183dc07e592dc3efdb91b5725dc6158559a643907288a850fa7d1f4095ad778 SHA512 e6cf798441dcb9dbf83ad2821bf01182a88ec54283b15e2e964c9726eb22bbda2626e74f27e2dfa9abea7d694e4d63b218d1d8f3aa5f255020378af80632b4b6
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NETfree/metadata.xml b/app-dicts/sword-NETfree/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NETfree/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild b/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild
new file mode 100644
index 000000000000..695877e9ee88
--- /dev/null
+++ b/app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Free version of New English Translation with limited notes"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETfree"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NETnotesfree/Manifest b/app-dicts/sword-NETnotesfree/Manifest
new file mode 100644
index 000000000000..ce7ef99aac2c
--- /dev/null
+++ b/app-dicts/sword-NETnotesfree/Manifest
@@ -0,0 +1,3 @@
+DIST NETnotesfree-1.0.1.zip 2384042 BLAKE2B 68f66d747eb5b86bb076552304873c0bb5ced3f78e5430f613e9ad8945ca24cd5be3782aa3764ae474924968f6b00b33168b26fc2e488892aec79267b095b0e0 SHA512 426367f0e7a2afe831d03c30952f6189aae24c51d83d611b8ff4cbad06840ba2bca687dde5c7793aa1ecab5c224ed4afd1d8170518e3713d4abe2596dcf6dd37
+EBUILD sword-NETnotesfree-1.0.1.ebuild 363 BLAKE2B f3c0e3af960209f305c666426483bd798a3a492efe9e9c55c45a364ca72d87557b91b4afec462f4c16688c19c32b025e8ca1ed1bacfcd5d614961ee1c50e7fc2 SHA512 254965082cbc11fa6d99dbc6e60e348e2c17cd87c86a78acb8ad3d3c5722113ed1b4a7ddd0f8c59dd13dfcef4ea55305b9d12fc2318c457c65e8d580a37dfd2f
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NETnotesfree/metadata.xml b/app-dicts/sword-NETnotesfree/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NETnotesfree/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild b/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild
new file mode 100644
index 000000000000..e9d1b90a3025
--- /dev/null
+++ b/app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Free version of NET Bible Footnotes with limited notes"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETnotesfree"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NETtext/Manifest b/app-dicts/sword-NETtext/Manifest
new file mode 100644
index 000000000000..94c0d683394a
--- /dev/null
+++ b/app-dicts/sword-NETtext/Manifest
@@ -0,0 +1,3 @@
+DIST NETtext-1.0.0.zip 2019471 BLAKE2B 53a2af043990c92dc5261afa0c6c7a5fb7e537a30cab2fecbbe992f2403b1a970b2430d8bc3b6c1ab065cbeb660ec8a100bc5cc070c3e0c5b80820c5ef69e121 SHA512 6b6a178bc7b50ed7ea907d4ca85e4e6b51c8e59a8875943f0fd94129fe7084af52c8085f26042a7ddf473376fa3ff0fb61ad07af1f87a4875b4c5f9adf75d7e8
+EBUILD sword-NETtext-1.0.0.ebuild 359 BLAKE2B 57a8214b93628ae38f05a0af4e029a5902ed8bc1b323fec0524dd1f6e26190f1019495225505cf2134bdd88b1beae9d6fa6f97b8525958ebf3877c43dc3052d1 SHA512 147948118974941500671b6114b6b909d4d17012bf88b9d94272d9f99549249fe5f7d1783f277259a98f6eee9cc11da53d5b3a32a86b653f71c07173ccb38f02
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NETtext/metadata.xml b/app-dicts/sword-NETtext/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NETtext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild b/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild
new file mode 100644
index 000000000000..21fab530f075
--- /dev/null
+++ b/app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="New English Translation text only with footnote markers"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETtext"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NHEB/Manifest b/app-dicts/sword-NHEB/Manifest
new file mode 100644
index 000000000000..f9c0d1ebbe98
--- /dev/null
+++ b/app-dicts/sword-NHEB/Manifest
@@ -0,0 +1,3 @@
+DIST NHEB-2.1.zip 1707586 BLAKE2B 0de8ccff1afb296a3537ab5b190840db51004dca81bb3d03dbb927cbe7e1254f54742187350f92a4c5bab5a65331e5f88eed571fd016a341fe11abf8b77c8542 SHA512 159e8b4ff4a40aadcb377c8a0711dac6a63262579579cbea2858282a31815fd21d1f8767ffbdbcffadfb8016be1e0971faa487672f338efdba7164fcb4475cab
+EBUILD sword-NHEB-2.1.ebuild 329 BLAKE2B 399e967d76fb286af43cc38f09a06476578a33f0e4f480714feb0039a370c93d92263184d292aef7e25c2165aecc832dd5c980f00e54b93380507ea2d84d9b25 SHA512 bd0cdff04b9511d9d4851d2f7c8f87c1164083036de6fd770fc415c378261221e551da06ad15551ff0a5fad76c912ccc6b5a63dd53fc98815a3618f8e9946fea
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NHEB/metadata.xml b/app-dicts/sword-NHEB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NHEB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild b/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild
new file mode 100644
index 000000000000..c4bee17e05e1
--- /dev/null
+++ b/app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="New Heart English Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEB"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NHEBJE/Manifest b/app-dicts/sword-NHEBJE/Manifest
new file mode 100644
index 000000000000..cf9ff4d485c4
--- /dev/null
+++ b/app-dicts/sword-NHEBJE/Manifest
@@ -0,0 +1,3 @@
+DIST NHEBJE-2.1.zip 1707083 BLAKE2B a5ab00760653a6529e9406b8bdc118d205e22f3619c7bba5aeae652c65c5e6ff7ddac2e65b86306f4574524597c04738462983d56bddbfe27ff192eabed864cb SHA512 69e3944974120837a1361b29326a4fd0093ca20cc52fa8c7d27a3107a994947c67f0e367433b81da4afaa0c1c307920634542a4350222e904ffd71a57e4ecf58
+EBUILD sword-NHEBJE-2.1.ebuild 348 BLAKE2B 3120afcaf501c8fe049a1ecade01ee9890becb0883112894dbfffb7d11314cf5cd19892a980cd6a0dfe21486bbef447e19188da52acfbe7eaababc73a793b292 SHA512 d44ca438ef363b7cb96d5a316b18f5129b7ad47ee2c32789204313dfc16c1cc2fba5ceba7ba41c3fded0206dab1a8bdc9728333dc251ecd95086b94478d3781c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NHEBJE/metadata.xml b/app-dicts/sword-NHEBJE/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NHEBJE/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild b/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild
new file mode 100644
index 000000000000..c0b2fb624b08
--- /dev/null
+++ b/app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="New Heart English Bible: Jehovah Edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBJE"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NHEBME/Manifest b/app-dicts/sword-NHEBME/Manifest
new file mode 100644
index 000000000000..e827ce3fc37c
--- /dev/null
+++ b/app-dicts/sword-NHEBME/Manifest
@@ -0,0 +1,3 @@
+DIST NHEBME-2.1.zip 1707965 BLAKE2B 39c487f6ae62efd2da25d043da7930016375a0f9f52fbc96db70d05149f1850d41b5aa86cb01544f75353c3e921cbc55e618f2d5dac5da2f0ae959d3867d52a9 SHA512 3c8b6a8a79d75f3f5f65773e6e76342a31a4310eb7f25533e65f3252167a05b64dc2c230b0f0bfb729a611b12bd2c1fc4390d008689ad6bfaa0fb13dc6fface8
+EBUILD sword-NHEBME-2.1.ebuild 350 BLAKE2B cea6d454d45041d1a0a47d60f99edb2d8e50aa9505ce52f3a80410f0978b7e73565e02f0e420c402accbb43f2f71e4cd4d40bfefee0b7c0e0f81f1e4e2c5a8b6 SHA512 0a4a0d54489a1c067f813c84b38e4cb66d7ced4c51e59715da3295ae3b69ec4e667c1f13a809a070ac8e6d39b34c10cb41789ebf095805361d7595d0912e729d
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NHEBME/metadata.xml b/app-dicts/sword-NHEBME/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NHEBME/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild b/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild
new file mode 100644
index 000000000000..0f4ee522517a
--- /dev/null
+++ b/app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="New Heart English Bible: Messianic Edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBME"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Ndebele/Manifest b/app-dicts/sword-Ndebele/Manifest
new file mode 100644
index 000000000000..e4b9ae38b96c
--- /dev/null
+++ b/app-dicts/sword-Ndebele/Manifest
@@ -0,0 +1,3 @@
+DIST Ndebele-1.2.zip 2670226 BLAKE2B efe7ed577c72b75b6233983587c58ac0e0d91209f640a6eb43855e2901b62d7ea39c9f28fb2828d791a801b10c26fc200ce8b8e7c50ab9b99dc4ab58eb6dabf7 SHA512 851819012bc89887ec9f7b0434ac3444e35f079ed368e6288e7263b6720c022c482db62347c889661e3ed9eee508237780b8b6caddf7c5f108de03761e3da6cb
+EBUILD sword-Ndebele-1.2.ebuild 316 BLAKE2B 2fa5d71c8312091e88994df3947236d29290442c34af64107a08220d64fd0b67fae07584612c5ca3ceff9a310713daa4bb46b765af13c4025af20e2d2125743f SHA512 da4cf1210a7645dea19444f731f97d34dac322ae828623e9d791215a20a29f27d6b6614403fe0096942501cec65a3ab814361f8d63feee49eb26676bee7e4c62
+MISC metadata.xml 412 BLAKE2B d813b920478ebeff2ff78379bf5af77500f8f366113bca0f827a5defeec125ee37c57197608ff1a792a2435913344890751219a3c4549d7ce0061f1ec88d6e1b SHA512 34a9e6d57f0307cd78b42392e395cd8f6ffb78a3ba6d9c44c4260eca3bc4fab168885fe9556bf9c3d7bcc554fa1c31a3afa07530adf3236fd63a9e26bcbfdba3
diff --git a/app-dicts/sword-Ndebele/metadata.xml b/app-dicts/sword-Ndebele/metadata.xml
new file mode 100644
index 000000000000..ccb725907a60
--- /dev/null
+++ b/app-dicts/sword-Ndebele/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		The Ndebele Bible that is offered here to you is partly completed and partly a work in progress at the time of writing, 2018.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild b/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild
new file mode 100644
index 000000000000..585364c96a0f
--- /dev/null
+++ b/app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Ndebele Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ndebele"
+LICENSE="FDL-1.3+"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Nestle1904/Manifest b/app-dicts/sword-Nestle1904/Manifest
new file mode 100644
index 000000000000..c43ede5e8bed
--- /dev/null
+++ b/app-dicts/sword-Nestle1904/Manifest
@@ -0,0 +1,3 @@
+DIST Nestle1904-1.3.zip 596868 BLAKE2B 4679dddc07e65fa2208964ef5259683604c71f8298b170fb0e6a08a9c98abdd9d1e7dc4156bf977dcd84543cd9c985a5145588b36e0d4b15668baa2de2c0a6be SHA512 0b147de7f040dde759dcc34579b0b26a5856a894f483365cd5f16f1cceda84b5ec92b0bcf55e270964361bc0c094883e526e11d7fbbdb26fd6c864671a02ed84
+EBUILD sword-Nestle1904-1.3.ebuild 326 BLAKE2B a89bbe3819fe41502f6b000e7750932e1d70a130f93cb769dcbf4178363790c34282f7d824635d21edb48a64d1b4246e919bec26fc93bcda6bd31eb5a0e22fb1 SHA512 646b418bf57923adebe51bf0140c83ceb6140fe25168cff09e822fa369ff2b141124d63d72b7793c0c4158c427ec09e6fc64cd21114ad40a56aa04325ef148f9
+MISC metadata.xml 592 BLAKE2B fa3abd47f6cbb90309cfdd1d18756ce042140e43af49565932a65b58ff7a9037b82a870849fab964d4e4949a126721a6c8db4f282e70b538ced67dae514d285b SHA512 929bc08b6c648cf609f9cf422a12d1d0d9f3870a91d595b2b3f922fca485d757d38b5cd40c98a247a73e1623b7f88b0d1b800f0caf0f09daaf58475f5226d114
diff --git a/app-dicts/sword-Nestle1904/metadata.xml b/app-dicts/sword-Nestle1904/metadata.xml
new file mode 100644
index 000000000000..193c7a899bb5
--- /dev/null
+++ b/app-dicts/sword-Nestle1904/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Eberhard Nestle's edition of the Greek New Testament, published in 1904 by the British and Foreign Bible Society. Based on the 1904 (http://www.archive.org/details/biblentgreektext00nestuoft) and 1913 (www.archive.org/details/hkainediathekete00lond) editions of the Eberhard Nestle\'s Greek New Testament.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild b/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild
new file mode 100644
index 000000000000..a18ab177cc5c
--- /dev/null
+++ b/app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Nestle GNT 1904"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nestle1904"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NlCanisius1939/Manifest b/app-dicts/sword-NlCanisius1939/Manifest
new file mode 100644
index 000000000000..b96a6f4056c2
--- /dev/null
+++ b/app-dicts/sword-NlCanisius1939/Manifest
@@ -0,0 +1,3 @@
+DIST NlCanisius1939-1.0.zip 1790561 BLAKE2B 7fa3bdbb20e6423691710adb2fc033a8343eb89953f19de46ebbe3459614477d04fb906b6682f15845bb5d00ef0ff3e29eaea64d26a737bce270b9f042c2450c SHA512 047f587a17df5d64e46cfb915ab7def8f8800c3dd912c5ab34b03fdd7409aa2107189642e677f0fbe9322b302a7ac1770cd179e069854059cf28cd13d555422e
+EBUILD sword-NlCanisius1939-1.0.ebuild 342 BLAKE2B 44f848e797254f576fa2f4668f3d5b15be1762551e4863c190e775c350cb5760b65992514ea6d67f7c4e5da961f4fd1b19c1cc3b6fa74dca892409ce780511fd SHA512 6f13519b19b37f15656eeac9bf8f13f92438e2209cbe37096db674685697e0ef1139afc300d44c67b5d580ab0424484d1e274dda4d1b07bd709a9038f7e8e185
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NlCanisius1939/metadata.xml b/app-dicts/sword-NlCanisius1939/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NlCanisius1939/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild b/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild
new file mode 100644
index 000000000000..71beb21ec110
--- /dev/null
+++ b/app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Petrus Canisius Translation"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NlCanisius1939"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NorBroed/Manifest b/app-dicts/sword-NorBroed/Manifest
new file mode 100644
index 000000000000..147768be4f84
--- /dev/null
+++ b/app-dicts/sword-NorBroed/Manifest
@@ -0,0 +1,3 @@
+DIST NorBroed-1.0.1.zip 372307 BLAKE2B 6bb696b466a100eb9dce5d9338aedcbdd0a797163ed606a18d5a3118e4a3a77116cd3561957a3d89ca487b766f56fe1472fa98de3965221d96e47f9006b706db SHA512 d22077c943b9cfe90cce35253787f6b5508f34c9c4c1675333744a6c90ae04cbda79dc7ade96c7ba12861ff878abf9c65285df393b59bff9b8e240cd7cab94dd
+EBUILD sword-NorBroed-1.0.1.ebuild 323 BLAKE2B 06b0c2b9d5c098f89554c1b13a7a85763a38798c2774e3e8fa1c092b32c84b4e9bc8e6b1b549722ac15a2376fc4b6e9677a960d0d25e5d097b74b5447d5cc8dd SHA512 0609a9d037054e571b065ab378c0eb90030ba9cb7c3e3874980db8dabb0b4c734cf7dba73c2ecd2b8354314bf9f8681c1b65927ba6d88a233c5cab14abff767c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NorBroed/metadata.xml b/app-dicts/sword-NorBroed/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NorBroed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild b/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild
new file mode 100644
index 000000000000..47e5715131a0
--- /dev/null
+++ b/app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Bread Norwegian NT"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorBroed"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NorSMB/Manifest b/app-dicts/sword-NorSMB/Manifest
new file mode 100644
index 000000000000..6a7766ad4e3c
--- /dev/null
+++ b/app-dicts/sword-NorSMB/Manifest
@@ -0,0 +1,3 @@
+DIST NorSMB-1.0.zip 1477046 BLAKE2B 1df96807c1e8359898adbed199c1c23aa2fd74deea78794bd8bffbdaab8580eb9c7ec785a231de3eedd1b10c250a16fa9f0a5d07b545821e4773915203c925be SHA512 fd5af2b1c31a61a27a9b57dac2a732a8056d89ec525c8fd9c9cdc033a8bce5e212ad88aec33dde1a442cb8047656c3a615de7a2808768c2c0894ef0ee2470438
+EBUILD sword-NorSMB-1.0.ebuild 379 BLAKE2B 90ac319c6981c85a2e1fc5aa100470122660575350c155f380b5b6f31d7acc78364f9e8de2e76a2f7caf630f9f1c5b0fa67349c375898ebe8a708d7c83eeb72d SHA512 71ba7a3d7aa6c70c591de22384e25dab01d853aa7507e9c18329a808e21dabbabd3b5139d2d468ad3dc1b363108d7e2f390ce60bcf31bfcdd313426bff03e5b4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NorSMB/metadata.xml b/app-dicts/sword-NorSMB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NorSMB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild b/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild
new file mode 100644
index 000000000000..705ef9e6ac93
--- /dev/null
+++ b/app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Studentmållagsbibelen, first complete Nynorsk Bible translation (1921)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorSMB"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-NorthernAzeri/Manifest b/app-dicts/sword-NorthernAzeri/Manifest
new file mode 100644
index 000000000000..1e1ffdd2aba5
--- /dev/null
+++ b/app-dicts/sword-NorthernAzeri/Manifest
@@ -0,0 +1,3 @@
+DIST NorthernAzeri-1.0.1.zip 2057321 BLAKE2B e9bff39550a74d874f4d4e2ea6cfd74b9fdd22d71374785a9681e7240cdda47e1ee7b0c232600656c5531179fee920ff23049ed5d05ff59ef9ca1c61cd43850e SHA512 67664d07e5fa861613078a8a64bfe5d1faedeb322fb54aa9b61956d4ce10142e2415ef5a19be39d671944d44115d249a73771b7f9727240952425cf4e5fe7440
+EBUILD sword-NorthernAzeri-1.0.1.ebuild 337 BLAKE2B def64a77873caf979e3d1140d361b32799f39cf9b51220bd58ba5983d6eb3d404cfcd519b0394f88e43a7723aba5338c5f7a38e116a710f6b12a1a4f5e2dc47f SHA512 c61d51240ceadcdff87086f9ec665aaecc12c2e7525260ba6d5e95a580d2f67d12d2fa763f395b9fdd69d1c0b94335699fb450de4dfffb683d4e3c75995b95a5
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-NorthernAzeri/metadata.xml b/app-dicts/sword-NorthernAzeri/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-NorthernAzeri/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild b/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild
new file mode 100644
index 000000000000..ed57d07b9dbc
--- /dev/null
+++ b/app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.10"
+
+inherit sword-module
+
+DESCRIPTION="Northern Azeri Translation"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorthernAzeri"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Noyes/Manifest b/app-dicts/sword-Noyes/Manifest
new file mode 100644
index 000000000000..c8477105bb22
--- /dev/null
+++ b/app-dicts/sword-Noyes/Manifest
@@ -0,0 +1,3 @@
+DIST Noyes-1.2.zip 827202 BLAKE2B ec7c4dbd78fd004dff6d9f2390e32b00f240abb59df2dd8b8aab88577b0948261aafa4e638d337bf0ee3527d9ee15fd8cf6da2657faa0f61a023477518875b4b SHA512 17ab608ca2e8951f5654ff667100f9b13cbdd530155f39c0e82fc52e9c7a9ac81914f3497c05130794e6a8323b6bed444e72332db674a7c9edfad6b5c1d085f4
+EBUILD sword-Noyes-1.2.ebuild 328 BLAKE2B 2bd293f966d590abb82fc4d37c71e82723d41fadb5aa2029d2209a73ba11991d766a6a0f108b210058b434f179f53791e9b0166c081b5419dc5862446b1279e1 SHA512 ff9c5b6433d98c788f53c215c1a9c44fd63342a5b3a7426557df9f334955413ffd4a4868a912a5d49812ef42e47481d4f760547ad2e60602a8e50dfae412e4f8
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Noyes/metadata.xml b/app-dicts/sword-Noyes/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Noyes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild b/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild
new file mode 100644
index 000000000000..3dea2141277c
--- /dev/null
+++ b/app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1869 Noyes Translation"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Noyes"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OEB/Manifest b/app-dicts/sword-OEB/Manifest
new file mode 100644
index 000000000000..413667e246c8
--- /dev/null
+++ b/app-dicts/sword-OEB/Manifest
@@ -0,0 +1,3 @@
+DIST OEB-1.1.zip 613627 BLAKE2B e44f56c20eb195af7238e9c0aa5cbf3c5c27c09a450c693181971d65d9ecff32813b600313da4222e8c09c703e5c17b14cbafc9dff8bb460b0f3058685d9a03a SHA512 c0782ba1429c91097f0a632e77f696cfb0ec8c0a1dbe4a38f9b2585413a6d17d78eaad2da4bb5a9f97ae68856691215e4ebe50c79ff41374ddd41f015e237277
+EBUILD sword-OEB-1.1.ebuild 331 BLAKE2B c5828d7024f176653e41cd4e89bb2b387a1c7b966cd4c3957f15a61b5f81d642292432b3c7d4f9eafed2fdc264425c42ef26f41a987a772184cfe5c7d6a8aa8a SHA512 1ee4cb8b432254ce6c6c637a3d3cd8e298057da60e4fc8aaf1b85019367e762049808e228377dcae7fce93b027392f25f56ad10630e99bd293056d2ed351ec58
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-OEB/metadata.xml b/app-dicts/sword-OEB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-OEB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-OEB/sword-OEB-1.1.ebuild b/app-dicts/sword-OEB/sword-OEB-1.1.ebuild
new file mode 100644
index 000000000000..6388e9907bbf
--- /dev/null
+++ b/app-dicts/sword-OEB/sword-OEB-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Open English Bible (US Spelling)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEB"
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OEBcth/Manifest b/app-dicts/sword-OEBcth/Manifest
new file mode 100644
index 000000000000..e57cf6353266
--- /dev/null
+++ b/app-dicts/sword-OEBcth/Manifest
@@ -0,0 +1,3 @@
+DIST OEBcth-1.1.zip 613615 BLAKE2B d077e9dc435fd4c626032d3f1cd82427596ed7569f66b5080b6ce16e923912f055bdab8798243bd42eb57cd983d6927703a772cb33879a959cc7e7fb72db2560 SHA512 b52dace0949ff9f9cf154bba6e549209fbc002d0f810be0ec06d3e0f1f3afed9ad0ab544e3a1102f225bf034b391b8410f64537f8b92d423344a8d8735305b9c
+EBUILD sword-OEBcth-1.1.ebuild 344 BLAKE2B 174affb2446d94cae0590a029e759bfa565b9691972799f689d6a1db716b5a4a5fb9768f2cbea730692cfd813f441e3aaaa5af171ac5bfd1e12d03d57d381c5b SHA512 6900ce4b92eb59dde8afb6f5a6161e21027174c0ea51d7ea1fea671292ca3f549b2b07b42c2b27a666edac2ac68c31dc0d9f5da0fe80bcda8ad099134e5f2d86
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-OEBcth/metadata.xml b/app-dicts/sword-OEBcth/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-OEBcth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild b/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild
new file mode 100644
index 000000000000..a5423e2408b7
--- /dev/null
+++ b/app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Open English Bible (Commonwealth Spelling)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEBcth"
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OSHB/Manifest b/app-dicts/sword-OSHB/Manifest
new file mode 100644
index 000000000000..61e90b9d1485
--- /dev/null
+++ b/app-dicts/sword-OSHB/Manifest
@@ -0,0 +1,3 @@
+DIST OSHB-1.4.zip 3765030 BLAKE2B a8f49f3a4adf74c22f221aab9931487ac00684d1b7fbda4ae8de8eea205e7776d946b13d7658dbd989e7ac3c06900024212a5d82a18dad28e260d3ba5f1100f4 SHA512 f1b663bb41b8907e8cd097bc6dd6011e4b5da3c6990f64501c2e312e8101635120e2652e7412fd5be97279418f23fc9acf4e4dc4873227c94d8e3bcc643e2f2d
+EBUILD sword-OSHB-1.4.ebuild 333 BLAKE2B 0eca6ff1694c0ec90ed778c364599fef875d2c5b957bdb8fe4c503883828a2658e76c34bccbbc8b964b035fe4c70789e912e20a7722532b99ea646c1429f1e07 SHA512 cdf3b909a6e40bd4fa445eee6d198684d9a0aee062c0668260cad8b632db1c033012734f0ac695374d6cdbf59bcb70af2ff93a779cb5b404af7205fa5a720a8d
+MISC metadata.xml 580 BLAKE2B 350f5712ac739a9b580a5143270b4a36d4eb9cad5bbfd676cccecf391d07a2f069d84a38c79d78575ef46d736b846423d66e2239cefee391fe63707e296e190b SHA512 d329fbc3300e04d8e8288c17a49018e4e584bcc4d94d3f7876a7d7690723c708e68c5905a65a503dfa84dd57cf10f2e77db7e374ff172401d0a5c136a4bf2b20
diff --git a/app-dicts/sword-OSHB/metadata.xml b/app-dicts/sword-OSHB/metadata.xml
new file mode 100644
index 000000000000..dfed05c1bd91
--- /dev/null
+++ b/app-dicts/sword-OSHB/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This text is based on the Westminster Leningrad Codex, tagged with Strong's numbers, and maintained by OpenScriptures.org. OpenScriptures is currently adding morphology tagging. To contribute to this effort or follow its progress, see https://groups.google.com/forum/#!forum/openscriptures-hb.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-OSHB/sword-OSHB-1.4.ebuild b/app-dicts/sword-OSHB/sword-OSHB-1.4.ebuild
new file mode 100644
index 000000000000..7ac964caee9c
--- /dev/null
+++ b/app-dicts/sword-OSHB/sword-OSHB-1.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Open Scriptures Hebrew Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHB"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OSHM/Manifest b/app-dicts/sword-OSHM/Manifest
new file mode 100644
index 000000000000..8a300a91d096
--- /dev/null
+++ b/app-dicts/sword-OSHM/Manifest
@@ -0,0 +1,3 @@
+DIST OSHM-1.4.zip 73316 BLAKE2B da652ccc8b592258b8b1a84d10517a44676a47e03de60800f843e4ee35d7ea45bbaba9091342401e8f7a45a2f679de1b347706740012d4dc1e857ebca8ea2517 SHA512 4b1e9ce13335823555dc11a0cbb0b3b7fea5e543c0d8f47287c8f35ca358cb2f71482c8febe10a4afbc055d65cdf28181467dac5bd8ba38137c2e4a4653d72c3
+EBUILD sword-OSHM-1.4.ebuild 338 BLAKE2B 2e79258b4922a67e201b7efade3e641c3aeb3036e4fed14645fd5fb9c7eb771f6de037ba0127c101798e1a79d2b1da570368e0f5556cbd9a07bb165d130fae58 SHA512 710a8b23fa92712c3e46b26de85a4e7277b76177dcb4852192b707ca9fd04ec0638b79c7642efe6b70b2a3205c3ce7f414b7e74cdb5c3a4116e03e7cf88b58f4
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-OSHM/metadata.xml b/app-dicts/sword-OSHM/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-OSHM/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-OSHM/sword-OSHM-1.4.ebuild b/app-dicts/sword-OSHM/sword-OSHM-1.4.ebuild
new file mode 100644
index 000000000000..e5c711826e39
--- /dev/null
+++ b/app-dicts/sword-OSHM/sword-OSHM-1.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.4"
+
+inherit sword-module
+
+DESCRIPTION="Open Scriptures Hebrew Morphology Key"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHM"
+LICENSE="CC-BY-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OrthJBC/Manifest b/app-dicts/sword-OrthJBC/Manifest
new file mode 100644
index 000000000000..2c69352d36c9
--- /dev/null
+++ b/app-dicts/sword-OrthJBC/Manifest
@@ -0,0 +1,3 @@
+DIST OrthJBC-1.1.zip 562457 BLAKE2B 7bc6839b146b21f9b6194a437a08575cf5d15a490f4430ed4538a1a932ea9b33880de86cdf4fb97da7b861e253622343ee06a056f2f5f6101a03cfa1ac45247b SHA512 5744b13c98d51c92567d794203d2db6ef01297d0b094abe507853a0d6226635cdc2c6a7ee2ec5f4fb0e96ae8d591cc40731bad9f9081ce1a33142943828c98b8
+EBUILD sword-OrthJBC-1.1.ebuild 338 BLAKE2B 2b3440431bf072a5df0ac3d1faab0225007df0a25adcb81f701dbf310e7bfc8d297397f5796cb8030ed6f065a52cffde82cd6992feca42664c9388297ddf6ae5 SHA512 9a7f23628c26868a3736f9164403c6aacac31fc2dbee6c7f2cfb65e200b3dfbeb3b68ca29f234391b418396c3dc342de539bc09a087af9d1232b222ed752be90
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-OrthJBC/metadata.xml b/app-dicts/sword-OrthJBC/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-OrthJBC/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild b/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild
new file mode 100644
index 000000000000..ca609a5f357e
--- /dev/null
+++ b/app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The Orthodox Jewish Brit Chadasha"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OrthJBC"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-OxfordTR/Manifest b/app-dicts/sword-OxfordTR/Manifest
new file mode 100644
index 000000000000..e89fc90f2e6c
--- /dev/null
+++ b/app-dicts/sword-OxfordTR/Manifest
@@ -0,0 +1,3 @@
+DIST OxfordTR-1.0.zip 39844 BLAKE2B ce58ddd0bc23b13105c8bdaadb986f8a30b81d0c614d6087b33a182fd6e42f184d3ac87820ea60d4ea6df4632bce94e9c7869f26f4bb254ade33ea172d4a302b SHA512 6cc3155e7424253320f163b253e8c5c0d7b6b854306f360b6348006dddbee6a32f3e49393bed58516f86117a4d44bccc148f0c437281b4c48fb4a8a8762852a6
+EBUILD sword-OxfordTR-1.0.ebuild 351 BLAKE2B dbc7c85a6d08aa51553c3e3886d768408abe029fbdb93df8a956691e16701a18c56323fd021a402e67cae2f5ce1bd1fe568563fbea0ae73090ddc4dd6a19b444 SHA512 47ca9caf5f985e7a04cae9e2aea8114ecb2636fcb5108047968c51daf3b295a6873be6b431aae9aa6496cc18483105358be773cb54f9c6332fa116a5424bf4f2
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-OxfordTR/metadata.xml b/app-dicts/sword-OxfordTR/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-OxfordTR/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild b/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild
new file mode 100644
index 000000000000..1f4132315f04
--- /dev/null
+++ b/app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1873 Oxford Textus Receptus Gospel of John"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=OxfordTR"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Passion/Manifest b/app-dicts/sword-Passion/Manifest
new file mode 100644
index 000000000000..634bcf2b2c86
--- /dev/null
+++ b/app-dicts/sword-Passion/Manifest
@@ -0,0 +1,3 @@
+DIST Passion-1.0.zip 264741 BLAKE2B d40ee0fc79b098d0539ca2c3da4b75bd6722c28d254262d68408561afdb87849ec426961b67b574c8f552a606069e3959cba681bebd652a8caf76ca134760a96 SHA512 15f01f6639eb97bacda7f272f3eb47ce507e7c2845608a11959ce037f8758dd8080f62eac92bb38a176e9da9b8ee2da63e515e01eaec7e3295bc4ef57d7615fa
+EBUILD sword-Passion-1.0.ebuild 349 BLAKE2B 32f55095a7a35eab356004e9996ee057a51b209b3b557a6106a4f2c5059548177659a7e1e3ffd7ad773abda2bc1c97c8217c47a18665e7f972bef976d1475579 SHA512 347484a817588c9bb4475eccc80c18e4882587cd4b0b166857350772dd3c321794e870d2c10191ab23422003f0fa9d03e3607cb3c6b4d42460ac875c5e948ebc
+MISC metadata.xml 408 BLAKE2B 6cb6fa492569892fd0a9bc02bd5bb3446f64933b048846a725787d67d9fbaedd0a0cbe7e8841133cdc3c6a726f4b2f0e83f8b9384a19c36f0ec4e6c1c027c84e SHA512 b3070261fa97d14e84f333c5a142ff712bdf4d50be1750015ecff242d1a7ba7036487317559f079ec9c10aa5efc715ed7bfa62ac4c31321fdf115d001458b406
diff --git a/app-dicts/sword-Passion/metadata.xml b/app-dicts/sword-Passion/metadata.xml
new file mode 100644
index 000000000000..49ab998cef5a
--- /dev/null
+++ b/app-dicts/sword-Passion/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Taken from the meditations of St. Anne Katharina Emmerick. Parts of the text served as inspiration for Mel Gibson's film.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Passion/sword-Passion-1.0.ebuild b/app-dicts/sword-Passion/sword-Passion-1.0.ebuild
new file mode 100644
index 000000000000..b486df207e45
--- /dev/null
+++ b/app-dicts/sword-Passion/sword-Passion-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Dolorous Passion of Our Lord Jesus Christ"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Passion"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Phaistos/Manifest b/app-dicts/sword-Phaistos/Manifest
new file mode 100644
index 000000000000..42850b5dc84e
--- /dev/null
+++ b/app-dicts/sword-Phaistos/Manifest
@@ -0,0 +1,3 @@
+DIST Phaistos-1.0.zip 1492 BLAKE2B 6e6da400b6f2f3512137dc1b83d095ba39803285ad8e8c59abb52e8d9158464c88a122ab777ceb80e672023cf4f0edd1578b77e70676fe9119e4dba7f50e7534 SHA512 dfb19c009d5dda2dce4276e0b72e675b64b9cde9bd53278c29e53eb5bcf7bdbdb4575fc8c5ce3997b19df50e5593bb62be43a49b8b135051efd121e3e694f67c
+EBUILD sword-Phaistos-1.0.ebuild 322 BLAKE2B 072985488b8c30354b676bbccb21fd64daaadcee2848a9fae0a2a4b0ae9c94b282e582362f2b9920f71d1edf2677a478671576e6ebbc7e18b6ae6de24fe554e9 SHA512 cb29b95b1ba210ffc76ec9ce6358de5e85907352abbafc9495f6f8fdddb409e4c25e00108e566b5c5bd566b64ee9d72d9bf1e2e7f9b4e6b9bcff76bd2e8e8b35
+MISC metadata.xml 476 BLAKE2B acfdf18433dd7952c5e41ad422ebd835a57cb4654e80d00f7655ec39813f480ffdb193dd719c1f6c2e636938770f390052eb16472644d002393eceb44ab79764 SHA512 47e9d696ff1529e5b6e74a84212fe04152d44d0eb09ea20e11fc6df0930db4bb70aac9831242c708a58142439976d3dfbbe240e0e4bcabe44591556f9ec064d7
diff --git a/app-dicts/sword-Phaistos/metadata.xml b/app-dicts/sword-Phaistos/metadata.xml
new file mode 100644
index 000000000000..068a2c551d9e
--- /dev/null
+++ b/app-dicts/sword-Phaistos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		A transcriptions of the Phaistos Disk, a clay disk from the 2nd millennium BC in an undeciphered language. The meaning of the text is unknown. Treat this module as a tech demo or font demo.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild b/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild
new file mode 100644
index 000000000000..0360f2230591
--- /dev/null
+++ b/app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Phaistos Disk"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Phaistos"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PohnOld/Manifest b/app-dicts/sword-PohnOld/Manifest
new file mode 100644
index 000000000000..73e7ad6bb756
--- /dev/null
+++ b/app-dicts/sword-PohnOld/Manifest
@@ -0,0 +1,3 @@
+DIST PohnOld-1.01.zip 424926 BLAKE2B b44d9bb8b9a869473ca7523d18d506810c357c9a0b837690867633736e8b957f82c49333010cf7a4c22f5b78ca9745bf72c45c632d2eba86904b9b0f8b85f0de SHA512 ae10c486b76473ddec22a1809d58f97f1cc54b6509cecf494ff3202e7646989fcfbcb07ac82167f122881450a4ce295ae464319e57505304ed942804625d87d8
+EBUILD sword-PohnOld-1.01.ebuild 342 BLAKE2B 90ff7561e3069501eaf1d48b8aa8e154422b508eb87c0c60f4ebeba20a45ff282a36da205ceb76f0a2ed8b9e2b869f8d773004f05d2ac754dcaa4fe0d5659a14 SHA512 d7645e2f35db53d140fa4a704b56ac9062e084c330aa221ee834ac495ad68b3243b0eb4bf4ae88b2cc1e5b21b65925d01cf08148a21236c701a269720f0af390
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PohnOld/metadata.xml b/app-dicts/sword-PohnOld/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PohnOld/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild b/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild
new file mode 100644
index 000000000000..63da26c23130
--- /dev/null
+++ b/app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Old Public Domain Pohnpeian Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PohnOld"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Pohnpeian/Manifest b/app-dicts/sword-Pohnpeian/Manifest
new file mode 100644
index 000000000000..b9d027695c6f
--- /dev/null
+++ b/app-dicts/sword-Pohnpeian/Manifest
@@ -0,0 +1,3 @@
+DIST Pohnpeian-1.1.1.zip 1986578 BLAKE2B c9fcbcd7b44403b4606cc64891557566bc4e97992c6ec60ed3a0cc6046c1086244f73b147d77a7281ecba56aceeba358629a61d1253193f1e5939b37a93d7760 SHA512 25cac36e86e5f1a92064fe62c4ab908ec066c524474bc8cca151611c5b3dc4176e0dbf95e6cc2a9acf6c9f19121f31446262b45d61f3a0c3a689ce45814ae6e7
+EBUILD sword-Pohnpeian-1.1.1.ebuild 333 BLAKE2B b5e5f08762409dc36c68af153361ea930537fb95c4c04ca20201279f668d46ef0d769c71756320e4dee196787fe915ea2f53d498f09c688dc6c37702ccc1b7f4 SHA512 ac153456e0aa75f0714d80f0f451715335eb09a53ac92bdf319476df679b8a73e6343e013251b5a91c2efbf62339c869ba7f086a31d67d3f2ae52cb177f83787
+MISC metadata.xml 592 BLAKE2B 8132ad5c25c5efc59df3aea2ca72e3cd98561775fd8ceca044d0ef1d68e31e5fd71b77213062099cea1c00a504deb7631764ce6242149bc3971513c373176b4e SHA512 2b30756981d6ffb40308bee666fe80efdd5a6acd565a4a064ebdb4093ac3331f5f0b46c27625bee69a2ffc95541bad5c8008340cb3a31b2cf05e718572702b35
diff --git a/app-dicts/sword-Pohnpeian/metadata.xml b/app-dicts/sword-Pohnpeian/metadata.xml
new file mode 100644
index 000000000000..dcd0f923f831
--- /dev/null
+++ b/app-dicts/sword-Pohnpeian/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Bible in Pohnpeian language. Copyright 2006 United Bible Societies. We are grateful to UBS via its Australian office to permit us to distribute this Bible text. May it be a blessing to Pohnpeians in Pohnpei and around the world. Dakuma Lucios (dakluc@gmail.com) and Peter von Kaehne (refdoc@crosswire.org)
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild b/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild
new file mode 100644
index 000000000000..44789675ae4f
--- /dev/null
+++ b/app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Bible in Pohnpeian language"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pohnpeian"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PolGdanska/Manifest b/app-dicts/sword-PolGdanska/Manifest
new file mode 100644
index 000000000000..fe63b5732ad8
--- /dev/null
+++ b/app-dicts/sword-PolGdanska/Manifest
@@ -0,0 +1,3 @@
+DIST PolGdanska-1.0.zip 1527305 BLAKE2B 68a368f1ba39fa858c8b318281726eee2aaa39c66af0683db9e055a990d9197c4e8917708e8cbbb26ffb5d5d7c127b676a47419ab6b054df3ff3472214a87d9e SHA512 41cf14babc30f5e94d7891d0ad727f116069617b4f82b81394ac7e8156dd9187f65d92ac2d487259242115540d774c6df876e5d2587dcc608315ca7e12d938cc
+EBUILD sword-PolGdanska-1.0.ebuild 339 BLAKE2B 6ee951797b414ddabea6a26b2eee1358f7815588a593cb6520e814976ccd79fce46d9465e7f62f476abffb8b6ac4d7a7b0486db6f96d32b352840174a4fc2cd9 SHA512 46de1610ac8e10b044963c3b8661594b41cafa591dc4d697225c8dd8bbc7a49437239fa6caac3645ffb4bf72552b310a9db59722e662a67ddbba33b0c4532e46
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PolGdanska/metadata.xml b/app-dicts/sword-PolGdanska/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PolGdanska/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild b/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild
new file mode 100644
index 000000000000..1e5fac9e7299
--- /dev/null
+++ b/app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Polish Biblia Gdanska (1881)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolGdanska"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PolUGdanska/Manifest b/app-dicts/sword-PolUGdanska/Manifest
new file mode 100644
index 000000000000..a5ba425bdcc0
--- /dev/null
+++ b/app-dicts/sword-PolUGdanska/Manifest
@@ -0,0 +1,3 @@
+DIST PolUGdanska-2.1.1.zip 2250429 BLAKE2B 2ef74cc8f22f6cd3c647fe3e0786c5a0055f6628578e97043e64de3f5353bb535592e2883adf2fb52cbfba2d3b73038006fb29a51de551b5ec39c250a83c63aa SHA512 d5f915f8589cfdd9892e455a171cf7436a8f868c684c5533d6e3882cec319dfb490f3f4f5ee3daf5423648402c0189c532df98a93c6f4ad8dbdfc0a04498b965
+EBUILD sword-PolUGdanska-2.1.1.ebuild 338 BLAKE2B c481e714aecb84c53442ad84476cbb5193b35faf4e06a6e324e9e8858ecda8b11a43b0588b2b540616159b73acd71e362f3d1829575304fe781478b6c786b84e SHA512 02b4168b92bc850f71e7808258df8ccbf1417876ad36c3b27be54617964d696b94af4cceb4ebe77b61150fddf3a6a02a160756777bfaeddd77e3dc4d44a785c6
+MISC metadata.xml 1268 BLAKE2B 8d18bc93a387d18b6679f359f89d9eaa7691360ce1b426f294c836b8fa1d34d922395023fef7539e6f5c03dbff30b13765ac0381082e9aff2de6bf5478fd0d43 SHA512 3c8432d0e4075f0d8d8a2719e93c01163ee8036b6e07cfdee083306d54b4af3270928a92f478d75b3bdc45988eac1c6fcd634d4b80aa707522b19b45954aa2a1
diff --git a/app-dicts/sword-PolUGdanska/metadata.xml b/app-dicts/sword-PolUGdanska/metadata.xml
new file mode 100644
index 000000000000..e37ffce23270
--- /dev/null
+++ b/app-dicts/sword-PolUGdanska/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		This project is being undertaken by the Gate of Hope Foundation. Its founders are Brent Riggs and Joe West. Brent and Joe have both been pastors and gospel preachers for more than 30 years. They have worked closely with Polish nationals to update the old grammar and vocabulary of the 1632 Polish Gdansk Bible. The entire Bible is now finished and available in both printed and electronic formats. For more information, visit the website at www.wrotanadziei.org
+	</longdescription>
+	<longdescription lang="pl">
+		Ten projekt jest realizowany przez Fundację Wrota Nadziei. Fundatorami są Brent Riggs i Joe West. Brent and Joe są pastorami i kaznodziejami ewangelii od ponad 30-stu lat. Pracowali ściśle z Polakami, żeby uwspółcześnić archaiczną gramatykę i słownictwo Biblii Gdańskiej z roku 1632. Cała Biblia jest już gotowa i dostępna zarówno w formie drukowanej, jak i elektronicznej. Więcej informacji można uzyskać na stronie www.wrotanadziei.org
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild b/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild
new file mode 100644
index 000000000000..a696305bca54
--- /dev/null
+++ b/app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Updated Polish Gdansk Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolUGdanska"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorAR/Manifest b/app-dicts/sword-PorAR/Manifest
new file mode 100644
index 000000000000..3c8dbc1f0d0d
--- /dev/null
+++ b/app-dicts/sword-PorAR/Manifest
@@ -0,0 +1,3 @@
+DIST PorAR-1.3.zip 1487651 BLAKE2B 9bdcb4929cf8ae2a2ff2382b2a93ffb7752f56237806616626cc08da90d0dc5a6011e7f7a446acbe80dcaf4a618c80d650700dfdadd7dfa39d673ee8c9bb0e7e SHA512 6dc9db89f9ea7d0137f37b3d89e1acf7ed969696b1623948aa633367a468c33b2988c274b7d05785bb1967d65a305fb62d3eab0ef8ba6926773840c0902a6bd8
+EBUILD sword-PorAR-1.3.ebuild 334 BLAKE2B 0588b3de16c99ab490561dbe5ebc05c0d35b92d33a844a635caf4c0030ba202e89a3b833685bdc493636922473bca3b08d1a7e3058632799254c3b600e843fed SHA512 24ca56449b0049bee736afec45f1e907894e28c1f42192bf77e6f017c44cc61d5612734f7fb18c9973868040ab004dcb5d669661fce9c77608e8cda293cdc29a
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PorAR/metadata.xml b/app-dicts/sword-PorAR/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PorAR/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild b/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild
new file mode 100644
index 000000000000..e0a394ba5a9c
--- /dev/null
+++ b/app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Bíblia Almeida Recebida (AR)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAR"
+LICENSE="CC-BY-ND-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorAlmeida1911/Manifest b/app-dicts/sword-PorAlmeida1911/Manifest
new file mode 100644
index 000000000000..3638dfb2f5ed
--- /dev/null
+++ b/app-dicts/sword-PorAlmeida1911/Manifest
@@ -0,0 +1,3 @@
+DIST PorAlmeida1911-0.2.zip 1485727 BLAKE2B 44e6fc9ee16013220cf1ed9946d85e3167d6b08b9496024e07aa32aaff9238e9fadd46c77a9acfd15f49bf0f3343621ee2e5717e5dbaa793aa1299ed3986671b SHA512 729bbdd5fb1411ea2ddefcdf407c9532aee83f885b89c9e875aaff9bdb375e67c604b6bb3bbef4599e045bc82044bc7981d8b4ef196e55c3b3e8c8b8e180da1a
+EBUILD sword-PorAlmeida1911-0.2.ebuild 385 BLAKE2B 177470eda156c300c5e68731e18bc72bcf08f97807e2771720611241a6b5c95a6a8078adab37c6f5276b2ed897b4e0ca29b315a10752adf89e87a2b279a4079f SHA512 8a6f3d2a051e57ec8790005df2c13ffd4d337ad0329a77300d4c9b48ded6e7ca2fbbdf2447ceda91b5168d4efd4e08231e5c9b77dc2db31ec3ddae140844f9f8
+MISC metadata.xml 436 BLAKE2B cb8117c4a28afbb815873501b9373918f762204732c51352d0d8439473eb76b598b1f08d45edcc453c6bfe605729871bd188a96d2f387800f2d0e2011eafe23d SHA512 25be02a6b017f378adc7236c4bcc21af40a9bf13cd762eea46340d94a71ceafac4154b2e95c820d99c0d521829709d79cbfdf186404743295fae0751f8ffc7a9
diff --git a/app-dicts/sword-PorAlmeida1911/metadata.xml b/app-dicts/sword-PorAlmeida1911/metadata.xml
new file mode 100644
index 000000000000..38e71a727d74
--- /dev/null
+++ b/app-dicts/sword-PorAlmeida1911/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="pt">
+		Da reimpressão de 1911 de uma edição de 1900 da tradução da Bíblia parao português feita por João Ferreira de Almeida no século 17
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild b/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild
new file mode 100644
index 000000000000..5852f245a0a1
--- /dev/null
+++ b/app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="De 1911 Biblia Sagrada Traduzida em Portuguez Por João Ferreeira D'Almeida"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAlmeida1911"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorBLivre/Manifest b/app-dicts/sword-PorBLivre/Manifest
new file mode 100644
index 000000000000..8b73562c5daa
--- /dev/null
+++ b/app-dicts/sword-PorBLivre/Manifest
@@ -0,0 +1,3 @@
+DIST PorBLivre-1.0.1.zip 1591833 BLAKE2B d189fe440555bf24f8cb6bb8c09cef3078c3d6ab440d6294d925a5393dfe2cbd8295d68d069d9d148dc94e8499a028e34d714d63694bf50588307a15487fd007 SHA512 5bf02a9a29b9af2067de3aa545d2106a35417fbd59928bb68e081376c8a960e85be32986801f509e4d6391e1128050b53bf37bcfd1676b16d9dbe04a4276e2ed
+EBUILD sword-PorBLivre-1.0.1.ebuild 320 BLAKE2B cda6d34ef8a210e63988839c8585643a996d888c44d3db09ac916399d36efaecdc8646b467fc96adaaf9910f50292b5a51f109a45837bdba0bad8d923b2e737a SHA512 c2836beda1ec5c9d3563be57400417aeca06731a5d34039ecc589e97c22599d4e18b22af823d2d892d389335b6a17a22068ce499853821b3bf66a6c456dccfc8
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PorBLivre/metadata.xml b/app-dicts/sword-PorBLivre/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PorBLivre/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild b/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild
new file mode 100644
index 000000000000..37ca27366012
--- /dev/null
+++ b/app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Bíblia Livre"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivre"
+LICENSE="CC-BY-3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorBLivreTR/Manifest b/app-dicts/sword-PorBLivreTR/Manifest
new file mode 100644
index 000000000000..c7d3419dbcbd
--- /dev/null
+++ b/app-dicts/sword-PorBLivreTR/Manifest
@@ -0,0 +1,3 @@
+DIST PorBLivreTR-1.0.1.zip 1585746 BLAKE2B 0e4fbdc0104ec37fb458c39f32b6e317e4d5afb4a5b5ed80c4371814455deac6cf135525fecabf2a7af81a2b07c50be7f5377db73046f01df7a186ff134f8363 SHA512 a196825146e91a287af4c4907988d67936f7f1e20687f7c91a73165a27b2ef2d0e320d1f63490f38fbe1490fac592ad57a53c42e093ab7634d339d60200784d4
+EBUILD sword-PorBLivreTR-1.0.1.ebuild 340 BLAKE2B e3a8d29ca2068dbe269b7baca6d7a0e384b523638bc0f2fd0c021ba4a071c818056d0ca9d9137d6def80857b64915293bf1062e1385874cc38f54a80cc32a0c1 SHA512 562106f0282fddc54414be86c463da7528485dc407e8075d293e8fa696fd5d710e245e9207d7d5f489edcfe827347e6e0feba8e6285f8149f884293d3baa5dc9
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PorBLivreTR/metadata.xml b/app-dicts/sword-PorBLivreTR/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PorBLivreTR/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild b/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild
new file mode 100644
index 000000000000..a30dbeece2fd
--- /dev/null
+++ b/app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Bíblia Livre - Textus Receptus"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivreTR"
+LICENSE="CC-BY-3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorCap/Manifest b/app-dicts/sword-PorCap/Manifest
new file mode 100644
index 000000000000..ae4bf3da8ea4
--- /dev/null
+++ b/app-dicts/sword-PorCap/Manifest
@@ -0,0 +1,3 @@
+DIST PorCap-2.0.1.zip 2477036 BLAKE2B b42b011833ec8903edeffcdc99a44f6b5c36f8f9a85845ede52d95ee15de3e86b71ebc5a025de77892de0f530d7d61f65c3ba8c40f013622c8f0f5c69d41a67c SHA512 99760ff299c5c5294689527e2bf2879c8618cba5df17d6752ef75485cd9342ef9e9edb3dc8a08025ebf5e5b483049b04d15c91d76d0c5195556957eafa245fda
+EBUILD sword-PorCap-2.0.1.ebuild 345 BLAKE2B 6add42f50ff1dcdab00a05da6ed5e9ce035d00cd8acd19bde839938aa5d6732329796d8ea00db1ec51bb56a3047b978ff78a27948e68e46c26a6128ccb2252d8 SHA512 67ae58ea42f26e5cd7ca28630627eaf7a3b2d9535605ac761b538f7840f88a6bba2dd7aff4e8c4a98ccd2e534d0ee5f4349a008ce9f4462dfd217d33a16c9825
+MISC metadata.xml 601 BLAKE2B 1b3d13484cdd70aa04495995e4448485ca11049f3d83d1a0d08728a2556d564f93adbdbfb1faf186c2d0417a32b958e3879319c928db69591d2191b6687e8846 SHA512 2f05a10bfd8d982455dd029c3a8f772d48ca4df6fef7fb25033fd056284ba6b9a1c06f05f97fed3ec79dc503950aa1da9d10ae2ff6b95b87bc5477e8dce0b629
diff --git a/app-dicts/sword-PorCap/metadata.xml b/app-dicts/sword-PorCap/metadata.xml
new file mode 100644
index 000000000000..eda4d593609a
--- /dev/null
+++ b/app-dicts/sword-PorCap/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bíblia Sagrada, better known as "Bíblia dos Capuchinhos", translation into the Iberian Portuguese by Ordem dos Frades Menores Capuchinhos
+	</longdescription>
+	<longdescription lang="pt">
+		Bíblia Sagrada, 6ª ed., imp. em maio de 2017 para a Difusora Bíblica e a Ordem dos Frades Menores Capuchinhos.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild b/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild
new file mode 100644
index 000000000000..0ba0680e6c70
--- /dev/null
+++ b/app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Bíblia Sagrada (Capuchinhos)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorCap"
+LICENSE="crosswire free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PorIBP/Manifest b/app-dicts/sword-PorIBP/Manifest
new file mode 100644
index 000000000000..e87549e07f95
--- /dev/null
+++ b/app-dicts/sword-PorIBP/Manifest
@@ -0,0 +1,3 @@
+DIST PorIBP-1.0.zip 138896 BLAKE2B 302cbea984e5d4949300b4b5bae8805888ec50eaa9c60d6eda89899fab9f6b25dd797b92afa129b51f5c5bd1fc9ffec3a075d11c2734af0126c42b22d8ad0f26 SHA512 4adb5d18c16f136e247d336de20863593a77cc3f99e40f1d9ece0b762de2d54dc00d20ba15c26da2aa4646dc4c7f422207b970bf11e4b324aa5a82439b5d35fa
+EBUILD sword-PorIBP-1.0.ebuild 355 BLAKE2B 83a5da650580b42d745ec3e36d4a1bfae012ba58675d36012d8df58191abffde550692a0eb1ea02fa947f8860cef34b97fe08c0115eb1dd2b3c61f60ddde08de SHA512 bfb14de6d538d7e464660de72c7ddf3c0113f7c0568f79b1ced630ab548c0ff50d01b33d7c2b710d87d768e6b7db83ee66ba8cbb30196d31ffd1fb243c9f22c5
+MISC metadata.xml 884 BLAKE2B 1c7ff44226488a73f114511ee461ccbfb2d429304d6ccbbbea3c2e55cc6903f6c66459706819029920278817bf075ee9101bb453e0b468e31c715a0dfddeea5d SHA512 5ad9ef51fd5652d20f13d87094e58b7fefc6ff84a6c4c31a0be7ba2eeebfe211f2cb1f6aaaddb0bf0c786f331c8983ca7bdcede58033d9ca7f40a7ee82722dea
diff --git a/app-dicts/sword-PorIBP/metadata.xml b/app-dicts/sword-PorIBP/metadata.xml
new file mode 100644
index 000000000000..623eee037dcd
--- /dev/null
+++ b/app-dicts/sword-PorIBP/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="pt">
+		Este Índice Bíblico-Pastoral apresenta os principais temas bíblicos, fazendo ressaltar a sua evolução no quadro da Revelação divina.\par A Palavra de Deus foi escrita em três momentos principais: Antigo Testamento, Evangelhos e Cartas. A Liturgia da Palavra dá-lhes a devida importância. Julgamos este Índice muito útil para a escolha dos textos das Celebrações da Palavra, temas de estudo ou oração e reuniões de grupos bíblicos. A citação seguida de (n) tem uma nota explicativa nesta Bíblia dos Capuchinhos, que será bom consultar, assim como o Índice de Notas.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild b/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild
new file mode 100644
index 000000000000..32c43b7e6217
--- /dev/null
+++ b/app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.1"
+
+inherit sword-module
+
+DESCRIPTION="Índice Bíblico-Pastoral da Bíblia dos Capuchinhos"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorIBP"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-PotLykins/Manifest b/app-dicts/sword-PotLykins/Manifest
new file mode 100644
index 000000000000..32a2a7803571
--- /dev/null
+++ b/app-dicts/sword-PotLykins/Manifest
@@ -0,0 +1,3 @@
+DIST PotLykins-1.0.zip 100068 BLAKE2B 9ca066fc4451309754fb557bae2dd528db626d4c764447553e6fe8dcc59746baab57b14d0263fb510bb90945d72dc78fa905ae8c24c188ff4f8668205be60534 SHA512 5a94d587a820da43749949869be72ae20693eb33f18f881ffe9242d1107d8a655a67598383cdd3a87658a8789212f1339414244a0abd8093fcc53d222cfd90bd
+EBUILD sword-PotLykins-1.0.ebuild 342 BLAKE2B 47fa1a17f7b1693d4af9358d4429e90101c1c2dbddf0ed12cf65a68cc14c83a906870ce4c96fec92a4cd1354ae6016bff800d3dc399c016f896beb4aad6b3f00 SHA512 656747c6fe71acf371159ee811894b4042dbc0014aea86f1ce16770852cbaec17e822939caf94f5c60a54f8d90f122716ed267a2b546d427b6be503d08eb4d2e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-PotLykins/metadata.xml b/app-dicts/sword-PotLykins/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-PotLykins/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild b/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild
new file mode 100644
index 000000000000..a89ffc37ec8c
--- /dev/null
+++ b/app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="1833 Potawatomi Matthew and Acts"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=PotLykins"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-QuotingPassages/Manifest b/app-dicts/sword-QuotingPassages/Manifest
new file mode 100644
index 000000000000..564b314c2c88
--- /dev/null
+++ b/app-dicts/sword-QuotingPassages/Manifest
@@ -0,0 +1,3 @@
+DIST QuotingPassages-1.2.zip 74662 BLAKE2B 3722a7335885b8fdd912648113aea7c8822ba78e4bd809c06c012b05813a3a1d7040cbcc0dfddd4bb82e3988b4eec868f373cbbf8010da998ce6c02e86e0791b SHA512 7f0ba6a3892f26318db19c8e1068e547707356e1bc30b41393f279fa49a5342d82781f4b29e3e188f6707172b0b36a4acd4b4e06a2a84129128779c6d775208a
+EBUILD sword-QuotingPassages-1.2.ebuild 353 BLAKE2B 8695b2c9db36133641fb6aa74f503b77e600d4c0cdf916632036597be3ade59aebb8e68c7c3c52da007e4a0670da2b75c5df8d59d2042337c4e755349d9daf79 SHA512 5e0f6b155a9e6941cd4fa5ef35a76f54e85da904ce49baeb224b63a5ac4c1faeef4f8d83cb03eeddabfa7b32a2ad1e307ffa4e496fd117871589547b4c3317bd
+MISC metadata.xml 492 BLAKE2B 57b9c807aae244b833b31cac3c73d832f909bf504feedd338ebf75bd054ba9019938890d61201d9df21a654a16a24582bc761f9ac2c23d13bd88bb5907a3b3b7 SHA512 906270a02138c63c4e16fc5cea99ffea38779a82b046c529538edb7948ac6fb62be19732deaeec31b1b57cddea4bac2b0d8df2715ce6b9062c64acf4f7aadad0
diff --git a/app-dicts/sword-QuotingPassages/metadata.xml b/app-dicts/sword-QuotingPassages/metadata.xml
new file mode 100644
index 000000000000..e3a02ea5ade6
--- /dev/null
+++ b/app-dicts/sword-QuotingPassages/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This module contains a list of examples where scripture passages quote or allude to scripture. The cross references are based on a database compiled by David Troidl, expanded and corrected by Andrew Thule.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild b/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild
new file mode 100644
index 000000000000..ac8dfbc2f512
--- /dev/null
+++ b/app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Scripture Passages Quoting Scripture"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=QuotingPassages"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RecVer/Manifest b/app-dicts/sword-RecVer/Manifest
new file mode 100644
index 000000000000..54c2f845aed0
--- /dev/null
+++ b/app-dicts/sword-RecVer/Manifest
@@ -0,0 +1,3 @@
+DIST RecVer-1.0.zip 1514709 BLAKE2B 7b20a173e0a2bb6b0aedb395b96180cb94201cda45c8a86cd725b755b01fc920cd4031ebb9ea9cc399046ea4246e4f1138857cde4e683172bc3dfcdf74997c05 SHA512 ae642dc6b228bc64db937c5691db14338b7859aec296c7070ef2159924055b6b4cadb730d27b2107d094d4be2b74880dd65811930d056a30a98b5a3df106a73e
+EBUILD sword-RecVer-1.0.ebuild 343 BLAKE2B 644a53e6cefe79aa75e16e7e2d119a11c9d3fddbf413b2282e83345c8939946f3199909f3797aad151352cd3db85d145acdcefeb9bbe22bf905122e78119d34f SHA512 b38922a87ef7d4ea55baef007572e08fc93ce3516024669391e00649c655af0b8e0f9da68418cbd51699f3d38368bf4c001a13abb05c9ed5490fa030b310031e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-RecVer/metadata.xml b/app-dicts/sword-RecVer/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-RecVer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild b/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild
new file mode 100644
index 000000000000..0fc7ddaa9b34
--- /dev/null
+++ b/app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Text Only Recovery Version (no outlines)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RecVer"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Rieger/Manifest b/app-dicts/sword-Rieger/Manifest
new file mode 100644
index 000000000000..b1a58d4d24ee
--- /dev/null
+++ b/app-dicts/sword-Rieger/Manifest
@@ -0,0 +1,3 @@
+DIST Rieger-1.0.zip 859735 BLAKE2B a25a62002ba19f6c66c4016522044771564182e1e81a9a22bcb8f73ce67a8083ba2982ecc90a267e5dae3326e3e37639a5b63563d2015db683323d5ed1ceb19e SHA512 5da6e85ecb335448712befb74a47c9ae21d2cd8d5ed6ba03227ffb8c916f3b4f261f15eb75035ac22dc1e6ec1fa9a0ea466002150eb93048182a19993055cc94
+EBUILD sword-Rieger-1.0.ebuild 338 BLAKE2B 98ed2f41471e035face1e43c282ef11634de93cc365c76d0849df4096bcd243151cec62ac2ba035396fd358459455fb1c9c4392bfa026908a3a8ce784adb1b92 SHA512 42bb562573d9bf4dd196d3ee234628b410cbe7654d1194f63afba94514680e2171cf1ad24c68cc7224b4a49f99fcd5ba7879359962e42f91c05edf45dfbbc28b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Rieger/metadata.xml b/app-dicts/sword-Rieger/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Rieger/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild b/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild
new file mode 100644
index 000000000000..9d189387b3bf
--- /dev/null
+++ b/app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.2"
+
+inherit sword-module
+
+DESCRIPTION="Carl Heinrich Riegers Kommentar"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rieger"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RomCor/Manifest b/app-dicts/sword-RomCor/Manifest
new file mode 100644
index 000000000000..934e578eac47
--- /dev/null
+++ b/app-dicts/sword-RomCor/Manifest
@@ -0,0 +1,3 @@
+DIST RomCor-2.1.zip 3056645 BLAKE2B 884683e5449cbe1f8cc6f2700b7cbd33790620e5477de63f1f009ca9e0d7aefdcba4b1dd6a253b21669c42ee24e6179f81ca286677770c8369337ea5455848ca SHA512 acc2c91819855da717ff43093a5d2e4055700032a48148a533be4e1f8eca81c722bfc325e4c860bebcdffffec0ac8297a39883aa93d5b18d35b4ee1253674cb2
+EBUILD sword-RomCor-2.1.ebuild 341 BLAKE2B 3c7f1405c6b7726d86fe662d10d73194de8d57f98f568c4579fd7610679d4fc1e3b6c821f130cf986515436257039f4bd9de5b29052838d9c690a24fed3b0a9e SHA512 812057fa01c620dcab3b35fa28750716041bcc7a98052a49e3f362c4e4271a3c296cadb059d13060e4ea5bf91f1d109adc042c35df1d97b458c17c6a5e713bed
+MISC metadata.xml 763 BLAKE2B 6671b0e117063c82fb1a50dea376c0f201efb2b71be8637f41b835afcbb3975723f788263fdf4e38826cca44925e2457bc9e78649b6b5f7a238a7b0050d88596 SHA512 b194f42933058c5e688603659dc5137140a7e8b8bedf0020958732787fca4ca9d31b33588bf25d7298bee1f73e1617946a020f1bd20bfb8d3ab442f86e9268f2
diff --git a/app-dicts/sword-RomCor/metadata.xml b/app-dicts/sword-RomCor/metadata.xml
new file mode 100644
index 000000000000..cc5a4dcac220
--- /dev/null
+++ b/app-dicts/sword-RomCor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Dumitru Cornilescu (4 April 1891 - 1975), a Romanian orthodox archdeacon, later a Protestant minister created this translation in 1921. It is popular particularly among protestants. Copyright of the Cornilescu Bible © 1924 belongs to British and Foreign Bible Society. Copyright © 2010, 2014 of the revised edition in Romanian language belongs to the Interconfessional Bible Society of Romania, with the approval of the British and Foreign Bible Society. Used by permission.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild b/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild
new file mode 100644
index 000000000000..e5faa67b746d
--- /dev/null
+++ b/app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Cornilescu Bible in Romanian language"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARS/Manifest b/app-dicts/sword-RusCARS/Manifest
new file mode 100644
index 000000000000..6d731633a459
--- /dev/null
+++ b/app-dicts/sword-RusCARS/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARS-4.1.1.zip 3625042 BLAKE2B 37a799559c84a743638a83f7a9ae12eb3ec58dece748eff0cc8b0d3e396ece1432ff415d40252b14abdbdc068ea61361b2eeeb3c925bbec0e256d21254d5ce23 SHA512 c4e6b38cb522525180d469b7edd0194bc095565c32235fc15ce65804f8fd98e7b9d56512dd382b13c18595fccd171baeef111521b123a35dab83dce4c71b4cd3
+EBUILD sword-RusCARS-4.1.1.ebuild 413 BLAKE2B 85242d6b7bb6d86e5fbabb54bb923251d6dea08c71c2fac45caa88af0a1756b8c9d6fb0adbe00e300f2f70f1167dd4ca9f5861dc76bce8c1a048deeaa7e0d101 SHA512 463ca4564bc9bef3175ccffae12bddc88d45c003810ad49c3653b8a0aaf5d7f199aa6178e2193867494327c0b57b31e14cfdf982611c6adf878920160f34012e
+MISC metadata.xml 1086 BLAKE2B c2aff4ab708eb6ca64e511c2002f3f8dea6ca3bfb35ae2c1150346f9f6ed6dc464b63511e4aa748838ca3a8995a2bd578cedbc04c69fa653a8afa894a6070591 SHA512 304cec0af763e58079abf4bd8f517a4cdd8056ba7157f8d59523d3dee0265f53e81b88462bc5ae323ccab54dc80fc43ae1650073a637061070eda81518f215f4
diff --git a/app-dicts/sword-RusCARS/metadata.xml b/app-dicts/sword-RusCARS/metadata.xml
new file mode 100644
index 000000000000..70c67b17f982
--- /dev/null
+++ b/app-dicts/sword-RusCARS/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
+	</longdescription>
+	<longdescription lang="ru">
+		Священное Писание. Смысловой перевод Таурата, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild b/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild
new file mode 100644
index 000000000000..105886df7d8f
--- /dev/null
+++ b/app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="Смысловой перевод Таурата, Книги Пророков, Забура и Инджила"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARS"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARSA/Manifest b/app-dicts/sword-RusCARSA/Manifest
new file mode 100644
index 000000000000..0c64fad69986
--- /dev/null
+++ b/app-dicts/sword-RusCARSA/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARSA-4.1.zip 3589059 BLAKE2B cb48dbcbca5d4cbd6b7e1b0ae1b40b3f29dd340a2ece88736090091f988ac1d3e93f1d7b79d2218e339e42f441ce53d6e3c8ac8a42edae6e08e02e4f8e87bef7 SHA512 b6bb2970175116f53b232657a47f66494048d0b78a997a635dbdb963a2994ac43d87229ea345ba3850d5cf4d5c48c4f4c2ccf8480a48119936520176e1c3ce1f
+EBUILD sword-RusCARSA-4.1.ebuild 414 BLAKE2B 0a3cb3c5eb62add0182024a8b31226060c058ff9df8f9ac765cabfffc4c73af2bb8c2cd41a72ec6f5db39a83675c464038f17b295bfc5d0cfb898b65467a6daf SHA512 c8e99a2683a8ba655518f5bb1adde1f4e9f0a985aa184ea561c12d524fdc75c3b6380c841732f2129298ee92ca1c703f93f081c4700166f61ea268cab1697c38
+MISC metadata.xml 1330 BLAKE2B d8cca38cd2fe2b6e5b08862251ca007a930500d89f45004ba6f48dc4d5c2586f14391b1c9f56614271b0fae6e6edb1c1b3a55658978a7ee4deca09f9126b8a98 SHA512 1496131c2b6b9e4f4e4fbe9c10fb2786758afe4209df662fcde25120cb678bf67941d5d577d8335dbb128ed39da76043be54e7c56695edef562c87531e3ba1e0
diff --git a/app-dicts/sword-RusCARSA/metadata.xml b/app-dicts/sword-RusCARSA/metadata.xml
new file mode 100644
index 000000000000..828e2d829ba7
--- /dev/null
+++ b/app-dicts/sword-RusCARSA/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		A Russian translation of the Bible which translates both elohim and theos as Allah in most contexts. The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
+	</longdescription>
+	<longdescription lang="ru">
+		Священное Писание-A – версия, в которой и elohim и theos переведены как Аллах в большинстве контекстов. Смысловой перевод Таурата, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild b/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild
new file mode 100644
index 000000000000..bb689f948cdb
--- /dev/null
+++ b/app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="Смысловой перевод Таурата, Книги Пророков, Забура и Инджила"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSA"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARSADICT/Manifest b/app-dicts/sword-RusCARSADICT/Manifest
new file mode 100644
index 000000000000..96332774dc93
--- /dev/null
+++ b/app-dicts/sword-RusCARSADICT/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARSADICT-4.1.zip 208866 BLAKE2B 20ecd33726886388edf45bd51d5a41e79efe2bef415565849a3723a47ea59b10f5bdb93f3a7601118707e91429901bd4d6aa0d8ad902ef4da5464dcd34401356 SHA512 7657f886168c3c972554781a85f9a715c971fb5344e02f71be3d2d5cc0ffd101400679de4723ede546690d978d094a63a1e22aed6c211c5dd09b0533c4978adf
+EBUILD sword-RusCARSADICT-4.1.ebuild 360 BLAKE2B 8c3fd69c00bb3f70a7602a02c8d505dd0a196984952b052f3b83ca84508b944ce1485b46c182fdce83db83bcf1830d4e7b58205a106679e196771512d9f6ac74 SHA512 65a2b4c3522dc6493efea85f7716fa5e9f10ede2721d08e9c2371870a37304584396788dbc91b5eb29ef7b226ab5075d1d5d2ece340c51f3ed522c9e7b7bb5b9
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-RusCARSADICT/metadata.xml b/app-dicts/sword-RusCARSADICT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-RusCARSADICT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild b/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild
new file mode 100644
index 000000000000..9f74a399d7b3
--- /dev/null
+++ b/app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARSA"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSADICT"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARSDict/Manifest b/app-dicts/sword-RusCARSDict/Manifest
new file mode 100644
index 000000000000..3adafa892ef3
--- /dev/null
+++ b/app-dicts/sword-RusCARSDict/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARSDict-4.0.zip 4126592 BLAKE2B 46795ab592d369b9ba1d8e758b8a36569ebd2e9378809881a6935b3a0f268755926b37e2657a732efce52fee37f95bf24495283847deae5ba98e36a1eba51469 SHA512 d4521e5b2e961bb2c8247d87a5d7d925477238951e37c2fd2e45594623b3372b1215ac4e39bb5bf4fe5529f3e800f7d43ada2ff70f0272a106006c3a280d92bf
+EBUILD sword-RusCARSDict-4.0.ebuild 358 BLAKE2B d797f397a74c20fd12e1ae90c44ed177afb43e0ed68fe6d7e2970a534628837e74da6974c37e98980972ac27b7e09c3840d2fa03318f9d59837ebe742eecd1d8 SHA512 8db2e1eded93091ddf6c2d43f6567fe720c058bb553ffea4d5ff08c868c6a55022ee82d5a1b3c4b39378d478f238f5c949d1f579d7047de36953e5e7ff5fc665
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-RusCARSDict/metadata.xml b/app-dicts/sword-RusCARSDict/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-RusCARSDict/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild b/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild
new file mode 100644
index 000000000000..edf37d6534bf
--- /dev/null
+++ b/app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARS"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSDict"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARST/Manifest b/app-dicts/sword-RusCARST/Manifest
new file mode 100644
index 000000000000..37ac5f638a2e
--- /dev/null
+++ b/app-dicts/sword-RusCARST/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARST-4.1.zip 3604067 BLAKE2B 41d226fe8eddeb02c238369aac26e800392e18a817a445d48a64e60ab78c977d7b3fe0ccc5f182b065a8d10e7efaedaa01a3aa937481aa156b94d36c954216c1 SHA512 68072e8b8ff3f30b4ee09a9f0256e6622abaad3f03d1accd17caefec5c2873c14ed52db02bf1148435dba4619b29363a9273fece3ba3f232212fc448ab016c22
+EBUILD sword-RusCARST-4.1.ebuild 414 BLAKE2B 78cfe5411df8f84518a2831e0e3aefe976f42f575ad5ba9940c60676f68f1c70f9f288d752c97d687294178f621e548156afc4d81db265f157ac8875d3003884 SHA512 8eee5e90d00e00f2b353aa85c93c370de04a1315d4a256409602c6ff23d50aaa211aa7665c20259d320d7e45635be02ae5ed7883cc30a71c7c12fb569deb762a
+MISC metadata.xml 1509 BLAKE2B 5c08553a4ca455495845a652151bbbb98b0c627a754ad04c34386d9c93767c064f13e79138335872a1a5946d5afc70e54740eec7b55781924926c01f9fc52888 SHA512 f71f9809301acd623bd1b75551a0a5d8293871082a804b4ecc3494479e981c1f5fa4ac89a777e53de250b657c6dd44c3a90b0dad3b5271517084b1852f09daf9
diff --git a/app-dicts/sword-RusCARST/metadata.xml b/app-dicts/sword-RusCARST/metadata.xml
new file mode 100644
index 000000000000..eaad8f1780c2
--- /dev/null
+++ b/app-dicts/sword-RusCARST/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		Due to the unique linguistic and cultural setting, this version of the Bible uses forms of names specially chosen by a committee in Tajikistan. The Eastern Russian Scriptures Translation (ERT Project, also known as the CARS Project) was initiated in order to meet the need for a translation of the Holy Scriptures designed for Central Asians and other nationalities of the former Soviet Union who read best in Russian and belong to ethnic groups traditionally considered Islamic. The first edition of this translation was published in 2003 and the second, thoroughly revised and corrected version of this translation came out in 2009.
+	</longdescription>
+	<longdescription lang="ru">
+		Священное Писание-T – в связи с уникальными лингвистическими и культурными установками эта версия использует формы имён, специально отобранные комиссией в Таджикистане. Смысловой перевод Таврота, Книги Пророков, Забура и Инджила. Восточный перевод. Издательство «Стамбул», Атаскадеро.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild b/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild
new file mode 100644
index 000000000000..7c45e8d2e377
--- /dev/null
+++ b/app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="Смысловой перевод Таврота, Книги Пророков, Забура и Инджила"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARST"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusCARSTDICT/Manifest b/app-dicts/sword-RusCARSTDICT/Manifest
new file mode 100644
index 000000000000..6027dc3b2795
--- /dev/null
+++ b/app-dicts/sword-RusCARSTDICT/Manifest
@@ -0,0 +1,3 @@
+DIST RusCARSTDICT-4.1.zip 209364 BLAKE2B 12c32e6708f100283c19f124b55fdb3a6d156d38d1e317da4b451e3da0423f4e4610948fa94447c636016fbf9096e772f33029fe698d9acbcc8fe9af737f3b4c SHA512 a46a02126d7afee216727d353e51fc269fa50886b995ae90e31b7496634ea2f244697676bb753b230b09a661f5f6cd7b8145f8124c65906a404cc1664eac65c9
+EBUILD sword-RusCARSTDICT-4.1.ebuild 359 BLAKE2B cf31df456bf2440b33a8af130b5abd2cb0f7e8cd68a50c27290c04a4c55313d91d00145a95ccb3eddcfebdf59f05a3137bc032cb60150f6f75a994244f2e26e0 SHA512 581f81385b7daa4ca3b5ebc8d0455a0e032cf4dfe6a1e2139d2bd328336a31ebd7553f1b6303e4ee2627c891bec82b44902550d1b96d1e051544c005b1737671
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-RusCARSTDICT/metadata.xml b/app-dicts/sword-RusCARSTDICT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-RusCARSTDICT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild b/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild
new file mode 100644
index 000000000000..f046146f14dd
--- /dev/null
+++ b/app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="A dictionary companion to app-dicts/sword-RusCARST"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSTDICT"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusSynodalLIO/Manifest b/app-dicts/sword-RusSynodalLIO/Manifest
new file mode 100644
index 000000000000..c460fe608086
--- /dev/null
+++ b/app-dicts/sword-RusSynodalLIO/Manifest
@@ -0,0 +1,3 @@
+DIST RusSynodalLIO-1.0.2.zip 3147693 BLAKE2B 839a505b14df0fa34ea83a265e04cf2e596a37ad241ef5ada1d92d7d0eb1138cfba72ffb5f53bef5ed9334c944a8d58c4b1738bf37b183d59e73b66e476732f1 SHA512 4667410e8050d6984a416646fd4a4473714c505dbe6b56dce4205d319c702f6c487fc1fa05f0aec280a749daf8c4c51faf652b0da45fdf5dfcf35c83b43a934c
+EBUILD sword-RusSynodalLIO-1.0.2.ebuild 355 BLAKE2B 4d150c5b0e41d5855626dd4dc43c0850691cf01dbfd5a0c1570610a573d4027c5eb1dc46758b7b80bbc34cae8423057049ca304ae65c93ad9c0295175bc0908e SHA512 ddef375f0a292870a03b2a207c29a749830212aa278bf47b023db2d17ea937556dba1579648d2d9aea35950d189df0b55a13f3359da9de3ce2391960ac8a8d56
+MISC metadata.xml 836 BLAKE2B 57eb941c57bd20e476b7be57dd9ed73dbe79f5b8542d8d09c0d112c7d48fd940e40ac3c56dcdd249c29311b329e4c627e5956b6e2a6c2eba0f713f018837651d SHA512 07f005ec1d9e43451a6b6e8def328d6bf8087141b0d14f703ed18db7b8d7dacb37a39e6224177598649712e25a8f5d5dd47b3de757800d25582d0dc0f931e093
diff --git a/app-dicts/sword-RusSynodalLIO/metadata.xml b/app-dicts/sword-RusSynodalLIO/metadata.xml
new file mode 100644
index 000000000000..d793886b630e
--- /dev/null
+++ b/app-dicts/sword-RusSynodalLIO/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This is the Synodal translation of the Russian Bible in the edition by Licht im Osten. Licht im Osten has carefully digitialised this text, updated spelling and corrected a few glaring translation mistakes. We are grateful to Licht im Osten to allow us to publish this text. The Strong encoding is based on work originally done by Bob Jones university, using corrections and suggestions also from KJV2006 and from Victor R. Zhuromsky's Russian NT with Strongs. Copyright remains with LiO and BJU respectively. Many thanks to both these institutions.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild b/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild
new file mode 100644
index 000000000000..547e3e4b491d
--- /dev/null
+++ b/app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.0"
+
+inherit sword-module
+
+DESCRIPTION="Russian Synodal Bible, Licht im Osten Edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodalLIO"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-RusVZh/Manifest b/app-dicts/sword-RusVZh/Manifest
new file mode 100644
index 000000000000..5821dde2c0a7
--- /dev/null
+++ b/app-dicts/sword-RusVZh/Manifest
@@ -0,0 +1,3 @@
+DIST RusVZh-1.0.zip 1918395 BLAKE2B b3d21b9bb4b5c083be0e71cb0260e531b4b86190ed37cfbb7885779713e400979c6055509aba2a57803e90c9767c62c677cc5422ff94e8a12e38334894741bd8 SHA512 4c871f453fc6115a607bc7949ecbaf4eb030de2a1419796efef81d55f1a8bb622e4ff8aef505d2a6acfc89e641875f4aea36c5a45c83122de016bb98c7105f70
+EBUILD sword-RusVZh-1.0.ebuild 383 BLAKE2B 745357b7e0ce012b1b4c9f34acb12b8af40529920fd9c902cc9010297eaf1fbc8d5ce7681cff4876cd20c6838de44ff055e81adbb9b64ef988aab002d4a8fb10 SHA512 c41a7e09b4667778e597e315bad841d6cda01b644b748cd8d5cfeb99f7e9694944b459df42d052e3a889c1bf6b2f607840f710ec9b85f7aac662ced9b696807d
+MISC metadata.xml 711 BLAKE2B 1ff6e620bedea1532b9df28bae3bcecf480ff602403edac8c9a541b466ce69c2e19b5bf0a2c430e75732972425889b8c7c0ba79aea517a63e7d5d144db3046b9 SHA512 5f2f685c446e1ad58c03347b425bdde2db9ad7dc418d31ba3f6470c7314a3667e3ddd3864ef33ac4622d14c3eb89cb82cfc720f7dc7b2e88af623205bf96b615
diff --git a/app-dicts/sword-RusVZh/metadata.xml b/app-dicts/sword-RusVZh/metadata.xml
new file mode 100644
index 000000000000..106ff437ffd1
--- /dev/null
+++ b/app-dicts/sword-RusVZh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Originally titled as New Testament with Indexing of Each Greek Word According to Strong's Numbers under edition of Victor R. Zhuromsky. This edition contains 143,457 Strong's numbers and is most complete Strong's New Testament edition ever published in hard and electronic copy.  This edition is based on Russian Synodal Translation of 1876 year, and is provided by Victor R. Zhuromsky strictly for use in the SWORD Project.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild b/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild
new file mode 100644
index 000000000000..37096053907d
--- /dev/null
+++ b/app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.3"
+
+inherit sword-module
+
+DESCRIPTION="Russian New Testament with Strong's Numbers under edition of Victor R. Zhuromsky"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusVZh"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SBLGNT/Manifest b/app-dicts/sword-SBLGNT/Manifest
new file mode 100644
index 000000000000..50de4add5056
--- /dev/null
+++ b/app-dicts/sword-SBLGNT/Manifest
@@ -0,0 +1,3 @@
+DIST SBLGNT-1.3.1.zip 602907 BLAKE2B 684e5f4943227acbc4082741a2720a05673e69aa945d0cc1fcca242b24c780fffb56bb8ab5d4c699f483a80cba7329dc385e56e5c87b46bc0de08b6c28d72455 SHA512 8cd6ef20e2f195eb324567a1e2d4124c24b6b69bcb796b21e1d198fcc6dca949003007b326af93b873c210c911a7d8976207f2536d91e7b6e29dfcafb2709d64
+EBUILD sword-SBLGNT-1.3.1.ebuild 342 BLAKE2B 425c8b169fadfd3d04729b3950116a5ad4c44105c1a06e3dfa343fbfac7de3df696e3b6828d2788543f5ce3a367579c45d4036dda85f0367c9b628f2e4c33436 SHA512 0c1da1143c52be4a5a224cd86c94413da476e980e5ce27683af68a174709bb9989a84ac3cf5a37476e4b465a7f0f5f10bce1137381a7b4a9bd0c70a43f818593
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SBLGNT/metadata.xml b/app-dicts/sword-SBLGNT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SBLGNT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild b/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild
new file mode 100644
index 000000000000..94f27a044988
--- /dev/null
+++ b/app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="The Greek New Testament: SBL Edition"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNT"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SBLGNTApp/Manifest b/app-dicts/sword-SBLGNTApp/Manifest
new file mode 100644
index 000000000000..a1a2d9a537e6
--- /dev/null
+++ b/app-dicts/sword-SBLGNTApp/Manifest
@@ -0,0 +1,3 @@
+DIST SBLGNTApp-1.3.zip 211517 BLAKE2B 46e91b64fdc3d7a0d460968ad9858bccfe8a0c1451d6a9bad73a6fe5997bfaaf69726612854d766cbbe456ae8a4f1c2235bf38eddd8410dbdb6edd00d819d9ae SHA512 9bdf607db57e4448c4999b597b2bef985f5c171c09419cebbbcd8ae3ce1360180977c33229f3a4ed2179b8129c75370f0bef11ae6cfdd9c4d000d017df2deadb
+EBUILD sword-SBLGNTApp-1.3.ebuild 356 BLAKE2B de968a4c2fc2eef65e22bbbf4ba60f462c7ff9b9548c5375e06244b99c71ced3c678f0ca5470ebd5542186783bef6c6b59ec63f0b276971f93d06e4c81d91304 SHA512 b9615829aa4c9c546bc361fd83f2414762a7f66e79be789f836c1cec942f5f64f9c1a31f72c2b83234b477abf82a1f0731c1ca47803ae225d73cb2139f3b426e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SBLGNTApp/metadata.xml b/app-dicts/sword-SBLGNTApp/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SBLGNTApp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild b/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild
new file mode 100644
index 000000000000..a0e4f3738ae6
--- /dev/null
+++ b/app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="The Greek New Testament: SBL Edition, Apparatus"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNTApp"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SP/Manifest b/app-dicts/sword-SP/Manifest
new file mode 100644
index 000000000000..7def24ffadea
--- /dev/null
+++ b/app-dicts/sword-SP/Manifest
@@ -0,0 +1,3 @@
+DIST SP-1.0.zip 1169815 BLAKE2B a01f1fe5b2055068360d9e61aabb23a6a9f9166628edea74309b9a05fa0b32ce372f6064f81562f97abaa6e2518082aad9a2f27955d6ec4012c39eecc1ee37fc SHA512 766d48ee136a093c99a2a58f221e4ec1e0ae68be6b2d95c0e5bc619ee3534dcf61f0ac9be389ce7f2295cba831e2916cfbf54d4ba588302db17ced51ae497b52
+EBUILD sword-SP-1.0.ebuild 322 BLAKE2B 128f92820c541bfbb2a08398d5a24bc27bcaf509cb07aac362ce463593fd2a10d7e560d8571ad54d2e01f8d279da8a42a21227ac0a85e67cefb820b79d3171d8 SHA512 0b084adcb8389b274dcf1e716d5a0b21b9dc8b3db609c0c748f8a304f603f6bfadb49f0398430fa6fcaf118cc648bf7f9c63694b1e2becf3f6bfed7ff51fed8e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SP/metadata.xml b/app-dicts/sword-SP/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SP/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SP/sword-SP-1.0.ebuild b/app-dicts/sword-SP/sword-SP-1.0.ebuild
new file mode 100644
index 000000000000..ce5dfcfefaae
--- /dev/null
+++ b/app-dicts/sword-SP/sword-SP-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.3"
+
+inherit sword-module
+
+DESCRIPTION="Samaritan Pentateuch"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SP"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SPDSS/Manifest b/app-dicts/sword-SPDSS/Manifest
new file mode 100644
index 000000000000..ab96415d1e60
--- /dev/null
+++ b/app-dicts/sword-SPDSS/Manifest
@@ -0,0 +1,3 @@
+DIST SPDSS-1.0.zip 126280 BLAKE2B a661af321e75bfbcc789236c6e5f9204a35ca6b84c3d13ef462c416c761b0f183e4e9d0247caeb54a3517dfc3abf782d235595d143f810d38079258c0d63b7fc SHA512 5fd67e8f332582c71e1a341e96af9eb6b3d21ab8a75ae5eb1ba08f1947bfa2e60f0f1aec494b706d2397171f6dd5a774abb26fdd5467973b5513d509ca8ca79c
+EBUILD sword-SPDSS-1.0.ebuild 367 BLAKE2B 8dbb4bfb1d62fe53802c9958138a1da2667d771c07d157cd8b202b1378f60670cce8aa237f85f33a8b69439cc6541db6a46f175c1616d8480d6307f7350ebb09 SHA512 e8b6d32389da1a39538059674b32bd06ba2fb42abdbff587c53d2746a40f98c94fab39222edf0b3b88e94f75c40f70fded2ee8d5d150295e7650644811d38c94
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SPDSS/metadata.xml b/app-dicts/sword-SPDSS/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SPDSS/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild b/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild
new file mode 100644
index 000000000000..6698635c3fa8
--- /dev/null
+++ b/app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.3"
+
+inherit sword-module
+
+DESCRIPTION="Dead Sea Scrolls variants parallel to the Samaritan Pentateuch"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPDSS"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SPE/Manifest b/app-dicts/sword-SPE/Manifest
new file mode 100644
index 000000000000..cdb498fa4f9b
--- /dev/null
+++ b/app-dicts/sword-SPE/Manifest
@@ -0,0 +1,3 @@
+DIST SPE-1.0.zip 275090 BLAKE2B 61464838b19677cae2a1ad577fdaf4e242441f119bc9d3029ec196c220f9c40b4139026d9bb120d793f5517a1aa698c699c223b077829d89f94eea5ce76b0f73 SHA512 e04821b9d3321086cb1fb52063b2acbbe649e6177a0ac6cc87d5ef83e31e0cafdc58606a598249462b93e7694d62632bd04e4acf206dd6e212ccb87bf04d1294
+EBUILD sword-SPE-1.0.ebuild 334 BLAKE2B 5c3f0a464543961780c1b57ecd6b189dd0730c55936d8fd6690c73aa5ea5aac55284524934fe66b765c7f2c6e836c4f0c6565c4759ecd9dfa1276bdf42d6779b SHA512 61d777000e1c95f51a9e133f26bdb7ab7716a435220f7a017c4c6cd4d71106cde48c2858532280cc077a033a07f2399e31920b2edee809e444fc86e70b7a1a50
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SPE/metadata.xml b/app-dicts/sword-SPE/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SPE/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SPE/sword-SPE-1.0.ebuild b/app-dicts/sword-SPE/sword-SPE-1.0.ebuild
new file mode 100644
index 000000000000..495731aef676
--- /dev/null
+++ b/app-dicts/sword-SPE/sword-SPE-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Samaritan Pentateuch in English"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPE"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SPMT/Manifest b/app-dicts/sword-SPMT/Manifest
new file mode 100644
index 000000000000..c565d4557f36
--- /dev/null
+++ b/app-dicts/sword-SPMT/Manifest
@@ -0,0 +1,3 @@
+DIST SPMT-1.0.zip 1146260 BLAKE2B e3190a4ee741cca6f275a72a068fe6d41415a2ccdbc2781fb6a4c6abed467724662888f1214474ef7857831038c6f0aaa568f26d27d9991191d36bfb034f3780 SHA512 3099430adc665913c87a214835ea3ccc644fea8b48a4c2f46737c065ea0768ab43547bc5a722034b5018e30b9e46ebd8fa48c3911b3ef68ee79ec0ef8626fff6
+EBUILD sword-SPMT-1.0.ebuild 355 BLAKE2B b29f3a0aee0e9fda63388d065882c7bcde283f8b9f1ca85c5d98394ce83c66354915a1570b66a52dee7fcdb9a83fdc629a6fd84e762f28bc65cd63f3ae4c04ec SHA512 00319c54c7505c9ad967b1c6ee085e415a079616092b9fcce19fe1441e2f7a6e6a45eda93b325cd1b0cc6c6d9a38aaff8ac38cfd069b6ba8868ac82114bb44ed
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SPMT/metadata.xml b/app-dicts/sword-SPMT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SPMT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild b/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild
new file mode 100644
index 000000000000..745928d43684
--- /dev/null
+++ b/app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.3"
+
+inherit sword-module
+
+DESCRIPTION="Masoretic Text parallel to the Samaritan Pentateuch"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPMT"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SPVar/Manifest b/app-dicts/sword-SPVar/Manifest
new file mode 100644
index 000000000000..bf20f430ff6a
--- /dev/null
+++ b/app-dicts/sword-SPVar/Manifest
@@ -0,0 +1,3 @@
+DIST SPVar-1.0.zip 271904 BLAKE2B f47e155f8149729f6ec836a732c4ed36d9a501cb5e763d80f218c151da3b79be5d19ca8bdc68583030e73e67f1783e95a4a642126f3467e1a54728ba389f78c0 SHA512 76ac4f9ac2fdadf8801ab60e122bda478194f749b549b7686c0cd7e1874cf053dd85d6a59ca3f4b1cc39b8e85bb56f01eb225d3456d217677dcfa269f7de4962
+EBUILD sword-SPVar-1.0.ebuild 347 BLAKE2B 25c25bcff5bbe3977bf2ddddb0313c8141a007714ded54e3c9f96ec437382767f98c0083834a7dc06d479cf7f38385ad633783ca2d822fe7c3a0257ab9a5b19a SHA512 798a57a65c82c06d59b8b990a08cc851125c5a4b0a805350d00f04934e76832029988af641008acda311aa5eb7525ceffc632e5d57a6b4b42d54ac26481bf302
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SPVar/metadata.xml b/app-dicts/sword-SPVar/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SPVar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild b/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild
new file mode 100644
index 000000000000..f3d17c456153
--- /dev/null
+++ b/app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Samaritan Pentateuch with variant readings"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPVar"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SahidicBible/Manifest b/app-dicts/sword-SahidicBible/Manifest
new file mode 100644
index 000000000000..a413c4d3bdfb
--- /dev/null
+++ b/app-dicts/sword-SahidicBible/Manifest
@@ -0,0 +1,3 @@
+DIST SahidicBible-1.1.1.zip 728553 BLAKE2B 8d8b040312efe77c48ba483080883b20a8e3c96d5b709e70cf8f03f3418453b5fff73427e780bdbb6e94f6aa0a69674fcbc17deb3177d411f0682cda00b47f87 SHA512 a7ce839c8ed498fe296218e6eac86f373a0bdb8cfba107bd4c33d4b2557acc02ee2d1cf57a605f096b2367c7d104486565c8a73d111da98ac4d87408a4595955
+EBUILD sword-SahidicBible-1.1.1.ebuild 345 BLAKE2B 56ef1de38c5cdfb9da98b6fc2e4b2ce4c556cfafaaf41b19b2c605eb86d76a23574e7db9e7c810c3795a7089f43f2305c408cc0267b1a005b701165d15a38a09 SHA512 385c6a1c601dae863bd4c805885585270dab41588267d0e712eafc401a8894ec657203f4495eba19746a01f5e2636ebd0ed163506e773379949d60b4fe000d4b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SahidicBible/metadata.xml b/app-dicts/sword-SahidicBible/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SahidicBible/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild b/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild
new file mode 100644
index 000000000000..6c6ed11ca4d4
--- /dev/null
+++ b/app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.2"
+
+inherit sword-module
+
+DESCRIPTION="Sahidic Bible - Askeland / Schulz"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SahidicBible"
+LICENSE="CC-BY-SA-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Sentiment/Manifest b/app-dicts/sword-Sentiment/Manifest
new file mode 100644
index 000000000000..ab7bd4696e9d
--- /dev/null
+++ b/app-dicts/sword-Sentiment/Manifest
@@ -0,0 +1,3 @@
+DIST Sentiment-1.0.zip 409335 BLAKE2B 6f25250cbe97cc3bc7dccc193f494306695f07caa14a9eeaeaa2398ce1ac02fce5c1fbf139c590f5af43cd0b420d2c51abcbe40189807e4061a1a1b07eb9ac8b SHA512 066711b437075176077d18a990c7d61d643b5b33e35f588e5e34d0a7a1e7edc9e738c899ccd7102656fcb640f121bd86a5a9ee1ad1c0ac51d1f5f99b2fb34eb7
+EBUILD sword-Sentiment-1.0.ebuild 337 BLAKE2B 96cf1f263e8d668671a7f2d2a9c48f519b7df09e352bf71e06c97a5e38d1df000f6aae18a80a7646d68e7ab6341565538cdced5d764d49d49eb7cce3cdf66113 SHA512 03de53602201f20db9316b48a1ce5840bc039424f695951a8f6460117ef6bb41d76f75aea40412f83c8c368bec512065a946e5c71eb10c928a25942792050efa
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Sentiment/metadata.xml b/app-dicts/sword-Sentiment/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Sentiment/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild b/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild
new file mode 100644
index 000000000000..221197dd0a3a
--- /dev/null
+++ b/app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="Sentiment Analysis of the Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sentiment"
+LICENSE="CC-BY-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Shona/Manifest b/app-dicts/sword-Shona/Manifest
new file mode 100644
index 000000000000..30d3a0bb464a
--- /dev/null
+++ b/app-dicts/sword-Shona/Manifest
@@ -0,0 +1,3 @@
+DIST Shona-2.1.zip 1433824 BLAKE2B 555b5f956a34e88aee96da0f8a0153e92757cdee6ce7ecd25a2c9463db0d2808b9ac02ed270ba7c093b1f00a13e334b83b5343c67ea6a256686277ba17c74b5d SHA512 043f9e75fa0201cc5850c32f9fc29bfaf2d971e4fac0a77cf7fca7c65d20141303acb43a32522a23a4f525807598dccfb134ab0c2a30892ed2cf7d4463d4160f
+EBUILD sword-Shona-2.1.ebuild 312 BLAKE2B 4793fb809636615ac4858fccff58a7cc156a4fb35e0eb8d49daa138a940539552439e5358edcfe0c83846860423d6e4083839b07a797a0ba9a58e963a77b46bf SHA512 20a4f2fe8caaac104cee5b289808b2bc8c66299aaf2b717a450b1f44a3d66d72d9208eb4b0d260ed1b04f270f8273328b80c2a1a5bf6d0e09ce2ada6379d46b9
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Shona/metadata.xml b/app-dicts/sword-Shona/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Shona/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Shona/sword-Shona-2.1.ebuild b/app-dicts/sword-Shona/sword-Shona-2.1.ebuild
new file mode 100644
index 000000000000..28dcd9f531a1
--- /dev/null
+++ b/app-dicts/sword-Shona/sword-Shona-2.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Shona Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Shona"
+LICENSE="FDL-1.3+"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SloKJV/Manifest b/app-dicts/sword-SloKJV/Manifest
new file mode 100644
index 000000000000..beb75e64910b
--- /dev/null
+++ b/app-dicts/sword-SloKJV/Manifest
@@ -0,0 +1,3 @@
+DIST SloKJV-11.0.zip 1289946 BLAKE2B 82dbed6f1ca68079146c808b2a99eab080cfb2b019336e402be977dbd856f50b2f51c28d4655f2498d6dc2dea82a15a2ff3769769b1ebd408e3599855e8eea75 SHA512 250864c6b5aac6de4d15b480848ebe3b66f8feb68871ee354107de94703db8139a45510c879a5882100f76920036804b7ebeb76e2bb5f12b4a59f732328a5fe7
+EBUILD sword-SloKJV-11.0.ebuild 370 BLAKE2B 3f6a07c8f0036f5115cea03917897d69dd4df74b6af29b8ec9d4f8de79501e9223d14153aedecfdfc46d2fd8c1e9c6b7355d306ba33e9399b1f90d5228cbe484 SHA512 1c5dfc58197a872c523381197eb9a60a3a9150c2dff0f1609c4410afc1eba11c8ce91ac1995a106ffea64bab5afd399376c4ee9efa58d6bd726ae06c278d4dde
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SloKJV/metadata.xml b/app-dicts/sword-SloKJV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SloKJV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SloKJV/sword-SloKJV-11.0.ebuild b/app-dicts/sword-SloKJV/sword-SloKJV-11.0.ebuild
new file mode 100644
index 000000000000..e29c925f68f7
--- /dev/null
+++ b/app-dicts/sword-SloKJV/sword-SloKJV-11.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Slovenian translation of Holy Bible King James Version (1769)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJV"
+LICENSE="CC-BY-NC-ND-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SloKJVA/Manifest b/app-dicts/sword-SloKJVA/Manifest
new file mode 100644
index 000000000000..3cf7d0d3c99a
--- /dev/null
+++ b/app-dicts/sword-SloKJVA/Manifest
@@ -0,0 +1,3 @@
+DIST SloKJVA-0.3.41.zip 765532 BLAKE2B 9213251aeb97bcb773987874f481e6798298a37b2821072f41ec7d9cd00c09b23546b60b14f3d9c5ad5f81ddfc4d79f02ebaf7419aaa4fc9f1611d7c224e7f77 SHA512 066924e395b8931a387ddc020b077c0d04cc583d4f999295086ee178e683ba46838bfcde424d7aee46f4a37de48cf33ebd4cf6ca86448b5371f74be39130442a
+EBUILD sword-SloKJVA-0.3.41.ebuild 341 BLAKE2B fc07dd93934aa244ed028ac9a7152e54cc84ed5ef555ea7b91a10203b0e1ea34c6051e3794cb9760105eb5578b902742a66ed7180706dcf6a35d8cc6fbf68888 SHA512 df63570a46aec9f1b27110c8bb6b9e7e5847fd3db387efe31a67bb849017ee958fecfc7b7a8d6b398eb903ae9a3f877970f7328537d63bebdbd14fe8c1c93ba1
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SloKJVA/metadata.xml b/app-dicts/sword-SloKJVA/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SloKJVA/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SloKJVA/sword-SloKJVA-0.3.41.ebuild b/app-dicts/sword-SloKJVA/sword-SloKJVA-0.3.41.ebuild
new file mode 100644
index 000000000000..af2e1babf257
--- /dev/null
+++ b/app-dicts/sword-SloKJVA/sword-SloKJVA-0.3.41.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Sveto pismo Kralja Jakoba (1769)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJVA"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SloOjacano/Manifest b/app-dicts/sword-SloOjacano/Manifest
new file mode 100644
index 000000000000..199fe50a8d8c
--- /dev/null
+++ b/app-dicts/sword-SloOjacano/Manifest
@@ -0,0 +1,3 @@
+DIST SloOjacano-1.0.zip 163348 BLAKE2B 5723462433b70f8946bfe24a79301b026d84381b8ba44a42fac18c72c4a4fdaec345bb880fd12c7db6c2343067e1aff7e784ee2259fb969540b63fc3571c7834 SHA512 202e3f53add5f587b43e2196d4e0ca297283f80adcec40a1b27ff326da6ff039d716bb94c14de6f8b4048424d4329e74f07a8a904b32b6f717885d92efbacbb3
+EBUILD sword-SloOjacano-1.0.ebuild 342 BLAKE2B f7c1de310d2e9354a5f1d5fa4c01bbf296f6e1fa23b454c365dd0c418c820c1bb24b65b4437c379e0feef3a26ef3301c7731086823b1a97aa54480c740474f53 SHA512 ae6ca0d4945569c1ff9282d98804289741061e1419078e564cf5235928cb4974a6fb7ea9de83136c4dcdba6a294f23575a373c8b8f09b268dfd1f5c15ab3b8ca
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SloOjacano/metadata.xml b/app-dicts/sword-SloOjacano/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SloOjacano/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild b/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild
new file mode 100644
index 000000000000..8c0f2d181ac7
--- /dev/null
+++ b/app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Ojačano Sveto pismo (Ps + Gal)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloOjacano"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SloStritar/Manifest b/app-dicts/sword-SloStritar/Manifest
new file mode 100644
index 000000000000..fd839f8ca32f
--- /dev/null
+++ b/app-dicts/sword-SloStritar/Manifest
@@ -0,0 +1,3 @@
+DIST SloStritar-1.1.zip 464914 BLAKE2B 43277208d60a534f70ebd5d110d2775744bcce1c9e3b96ecc0b611484afaa3a8cff39edb9ab343bd7afcdaf8a1a2f68d5f6e7a332fd3016b3427e37e9683c2cd SHA512 6246a6b2aecddb72a45b4ee9946560f25d41ed7f517db1776f3786b598f7a7c05812a4429720df8acdb69808a4e766fe92e60e0c7ac3e9b17a338a9547f66a6f
+EBUILD sword-SloStritar-1.1.ebuild 366 BLAKE2B ba9a528fd449510eab7904bd049e0025bbe25f9cf7041a7b58c107eae0e2d8174ec91ff510a22ce85effa601e6737c19f97688239e5ea874cc307562b4bfb400 SHA512 153a4ab5134c5e462574be7fca47bd81b9a8939bd6d6026f4114fc6d9cc854eda77cef66f68fbd0f819b6df347d41c88598775bda0d1cc710d4a8aef1c44bfbf
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SloStritar/metadata.xml b/app-dicts/sword-SloStritar/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SloStritar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild b/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild
new file mode 100644
index 000000000000..9dfe90cdfb7b
--- /dev/null
+++ b/app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6"
+
+inherit sword-module
+
+DESCRIPTION="Novi testament in Psalmi Davidovi Josipa Stritarja (1882)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloStritar"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SomKQA/Manifest b/app-dicts/sword-SomKQA/Manifest
new file mode 100644
index 000000000000..a65ee3b7979e
--- /dev/null
+++ b/app-dicts/sword-SomKQA/Manifest
@@ -0,0 +1,3 @@
+DIST SomKQA-2.0.zip 1900896 BLAKE2B 7f4162c8f925eafe4ee385dec070f03f58a5e32b7d5ee04859004f130cc01569a60e63427159739c41f4c54644b86a9db92977a110d421da6b14fda72b3e751a SHA512 b420de364fc7f199cefe0bd3b36b873f789e6ba439524c5e6207a8a733c3f557a51ba99107fcc67f59e4595560393b0c9778f91652549857d3efc8bba45f5b2d
+EBUILD sword-SomKQA-2.0.ebuild 338 BLAKE2B 9250938fdd04ba11b9206393bc5791beb0821e07ff81e716b9807e4757d881b4747ba4788fd45b1bd59714629c95d6c21c95ea236b419040144b4d534f6fcedf SHA512 8a20f7a2fadfdebb5861e1d23c5eec39d85588ec22f2b016b5ab354162354718cad848abb9cb04bf9a1b1589ccd93238789b01155b964832ed7b1051a0908539
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SomKQA/metadata.xml b/app-dicts/sword-SomKQA/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SomKQA/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild b/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild
new file mode 100644
index 000000000000..7525db566d36
--- /dev/null
+++ b/app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Kitaabka Quduuska Ah (Somali Bible)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SomKQA"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Sorani/Manifest b/app-dicts/sword-Sorani/Manifest
new file mode 100644
index 000000000000..b62d95822db0
--- /dev/null
+++ b/app-dicts/sword-Sorani/Manifest
@@ -0,0 +1,3 @@
+DIST Sorani-2.0.1.zip 526706 BLAKE2B 9a666d6c6a8a34e4f7b57cf57684f0c7b0d3c0560f956d45a34089d6e2fb291e311e6cce6f6dd5825a0e80a2a473e20b3b242aec45ca86c84cd27f51643f1fc5 SHA512 19f2ae307209df9527f3bce37b63ce1118caadf6765bc96324cf206bebc6111d2b69602070cb5268dda0f52d3d172e203a8a93069995dec91053a97e6df71743
+EBUILD sword-Sorani-2.0.1.ebuild 335 BLAKE2B 3d604cdc285b43e47d7739de50f2ab69ffcc7dde7bfa9cd568e022dda83679a449a2149d05380d6a0ed0a36f06a63f6a751afafc110fc02a355d28d5e6d7734c SHA512 b0ac34e8232739adcaf5b23e9fbaf31996e0b10c676074496584381e847781d0c670df4d4b982cd9119c6830e4ea41597aee6f28fba6724c4cb7a3ef9e62a228
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Sorani/metadata.xml b/app-dicts/sword-Sorani/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Sorani/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild b/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild
new file mode 100644
index 000000000000..8da80cf1b094
--- /dev/null
+++ b/app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Bible in Sorani Kurdish language"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sorani"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SpaRV1865/Manifest b/app-dicts/sword-SpaRV1865/Manifest
new file mode 100644
index 000000000000..e487da95eab3
--- /dev/null
+++ b/app-dicts/sword-SpaRV1865/Manifest
@@ -0,0 +1,3 @@
+DIST SpaRV1865-1.1.zip 1530877 BLAKE2B ca53784806d131195f53a48f38fe4e3ed39bc258db123951264bf84943622a129e3d930c84d1411ba5cca1cc407a00d2fec24a142350e2c459aa3769a4b1ae16 SHA512 df6c62ef00407f47a772131533ce73fb94ae5850d24ce6ee4ffe7bc26467b84fb29025172e2ba3a0ddb53fa8edc3f5a2042055fa88ab6f38174f796f8a08ef57
+EBUILD sword-SpaRV1865-1.1.ebuild 368 BLAKE2B b53c3eb2c123b21349a7601f068701b274522c0a33a71a39ac2390f294053b32e45bca69b72b64b3df256438fff6fb5adfb7ecfc6b0bee094b414c22c44371cd SHA512 45872b59c23068fcf4bd645a92c6b7139da81d005a731c73a19a8c23937742ae040b64cd907e32d69860c77580587221c46b4b87e8fa865c0e134005d4b9098e
+MISC metadata.xml 1319 BLAKE2B 3cc62645237a24218ef694e7d22e61046d5a7146e330c60c145be8a23f91398522c43ca70272f1095c4b934ddf3d0a364dfc83abd137f1e7002414aee20be420 SHA512 1f14483118e11c6197484a632faa8f316bc55bf2f56ce846666fb56367275d8b7efdb1874ecf0ee4e8aec27ea53ce3d6d560df3ab870ae7d847c2b7554ee76b6
diff --git a/app-dicts/sword-SpaRV1865/metadata.xml b/app-dicts/sword-SpaRV1865/metadata.xml
new file mode 100644
index 000000000000..e7a33d546776
--- /dev/null
+++ b/app-dicts/sword-SpaRV1865/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		The Holy Bible Containing the Old and the New Testaments. Version of Cipriano de Valera (1602) Revised &amp; corrected (1865) With updated orthography (2018).
+
+		The orthographic rules have changed since the original edition, mainly the rules that affect the accentuation of words. The update consisted in removing the accents in words that ceased accenting orthographically. The result is a text equal to the original but valid according to the current regulations.
+	</longdescription>
+	<longdescription lang="es">
+		La Santa Biblia Que contiene el Antiguo y el Nuevo Testamento. Versión de Cipriano de Valera (1602) Revisada y corregida (1865) Con arreglos ortográficos (2018).
+
+		Las reglas ortográficas han cambiado desde la edición original, principalmente las reglas que afectan la acentuación de las palabras. La actualización consistió en borrar los acentos en palabras que dejaron de acentuarse ortográficamente. El resultado es un texto igual al original pero válido de acuerdo con la normativa vigente.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild b/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild
new file mode 100644
index 000000000000..8a870960498a
--- /dev/null
+++ b/app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Spanish Reina-Valera Bible (1865) with updated orthography"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1865"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SpaRV1909/Manifest b/app-dicts/sword-SpaRV1909/Manifest
new file mode 100644
index 000000000000..020c556cbc75
--- /dev/null
+++ b/app-dicts/sword-SpaRV1909/Manifest
@@ -0,0 +1,3 @@
+DIST SpaRV1909-1.0.1.zip 2817495 BLAKE2B 2241138e28c7701c96182bd2ff049e5237c1cc80393f7c80087727f2501c6ef104053e89e97e3c5227ea623640a45f405cee0c8a92a9b3211d7abb7ba0307d2d SHA512 690706dc0a114ededaf7906c8e642fcb0c053b59e0b330e80521592385087aa2567979e55e9527fc905ebcbf324eea481d23fea8daa976321e0e5ef58d3d8fd0
+EBUILD sword-SpaRV1909-1.0.1.ebuild 353 BLAKE2B d34d24abfe0e1c31602276fe63b7d53d6faf7046a8ca97b630f0c5f0dce83e5cac6175e497e62ea4aaa4eea04519a66dcb5d598c2d7f9c4e771e2433075eecbc SHA512 0814ce521a0a4d11993fa5276d23d6521fdcff14e956f73da6b94d267469e2909cbf084c9075f6f733ceab32d7ee8477fb96264de1fac679e276483ebdfed11d
+MISC metadata.xml 938 BLAKE2B 1e708743f56ee77d9eb1432508c3f1d1186184efcc35a70aa783ea785f89e31162fcbc9f3667d063ad5a8aa3dbb81b5ddd379b6a2f06762ed3c43e631f8f5170 SHA512 d2b9b2fb7c460a839ad94c91f17433158ab9480889691970a05bc4c1887dcd16ed8cde823b7623f507c57ad613baadb3de49175045ecbd4192f033f0e4393fb7
diff --git a/app-dicts/sword-SpaRV1909/metadata.xml b/app-dicts/sword-SpaRV1909/metadata.xml
new file mode 100644
index 000000000000..b4b49e091155
--- /dev/null
+++ b/app-dicts/sword-SpaRV1909/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="es">
+		Biblia Reina-Valera 1909 con números de Strong v 1.0
+		La Santa Biblia Antiguo y Nuevo Testamento
+		Antigua versión de Casiodoro de Reina (1569), revisada por Cipriano de Valera (1602) y cotejada posteriormente con diversas traducciones, y con los textos hebreo y griego.
+		Sociedad Bíblica Americana Sociedad Bíblica Británica y Extranjera
+		El texto de la Reina-Valera 1909 es de dominio público. Las etiquetas con los números de Strong han sido editadas por Rubén Gómez.
+		Los números de Strong se actualizarán periódicamente. Por favor, informe de cualquier error u omisión al editor de la obra: rubeng{at}infotelecom{dot}es
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild b/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild
new file mode 100644
index 000000000000..124f6d10e4ff
--- /dev/null
+++ b/app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Spanish Reina-Valera 1909 with Strong's numbers"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1909"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SpaTDP/Manifest b/app-dicts/sword-SpaTDP/Manifest
new file mode 100644
index 000000000000..a33d5732e1cc
--- /dev/null
+++ b/app-dicts/sword-SpaTDP/Manifest
@@ -0,0 +1,3 @@
+DIST SpaTDP-1.0.zip 408008 BLAKE2B 1e938511ba68a92d116fe39450cfee3c0358b1588527446d3f10aa0d6c49f1f68eea1966087662cc4664f8aaa3b1eb3f2ba5d0438a7fe8c84fa677ca201294de SHA512 b0806c9a34f5af6b01eb64ac813f41481ca103a59738ee59a46663b715c6a969a93ad61be65f9796488078ba9d15a9c4c58900ce3e54bf415566bac3a7fbb56a
+EBUILD sword-SpaTDP-1.0.ebuild 364 BLAKE2B aa10ab3ac57b329f982a769c638cb65b6fa6022f63f0089b44e84a891f59ac996df4932fc7e84d0ac9a42210895185becfa3e33a6ffe9617867af091b7572683 SHA512 def915d6355b9ffed7a472001dbb0ee21de532135a28f65b4db8876eb610e896f26b81ad783a1a0e50ec940d42d12cc712f860ce2244f7a6867457153052effd
+MISC metadata.xml 1777 BLAKE2B cd3fc29f3d11be5230c9451426c28df2f8803e5fc113d8c4573533a3ffbe0c5c1bde8d52d401a40ae7aa20e691f097019469bb17f75c26570cfc3472b0159d3a SHA512 dca5ad0fef62438852bc0dad99ca9cd2ea532c98ed16183184080654c0790dbd9971b9ed23928139260045657879eb796cb2c0c8642701151014ca0771206b02
diff --git a/app-dicts/sword-SpaTDP/metadata.xml b/app-dicts/sword-SpaTDP/metadata.xml
new file mode 100644
index 000000000000..7e3602247e0c
--- /dev/null
+++ b/app-dicts/sword-SpaTDP/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="es">
+		Traducción de dominio público, abierta a mejoras de los Evangelios Esta traducción se basa especialmente en la biblia World English Bible - WEB (http://www.ebible.org). Así como la biblia World English Bible, esta traducción y sus fuentes se liberan al dominio público. En particular están permitidos por siempre el uso ilimitado, la redistribución, reproducción y retransmisión por cualquier medio conocido o por conocer así como su modificación. Nosotros, los traductores, no ofrecemos garantía alguna, sólo quisiéramos hacer la voluntad de Dios (aunque no estamos seguros de estar haciéndola bien). Sin los conocimientos, ni autoridad que requiere una traducción de un texto inspirado por Dios, nos atrevimos a comenzar porque no habíamos encontrado una versión de este texto en español y de dominio público. Probablemente al traducir hemos introducido errores y eventualmente la versión en la que nos basamos también tenga (aunque hemos procurado comparar con otras traducciones). Quien movido por su fe en Jesús desee mejorar esta traducción está cordialmente invitados al grupo virtual evangelios-dp http://groups.yahoo.com/group/evangelios-dp Puede buscar actualizaciones o citar como fuente de la traducción: http://de.geocities.com/nuestroamigojesus/bdp Lo invitamos a difundir esta traducción, a mejorarla pero sobre todo a colaborar en la construcción del Reino de Dios que creemos se logra haciendo la voluntad de Dios, siguiendo a Jesús.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild b/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild
new file mode 100644
index 000000000000..fcb13f3c03cf
--- /dev/null
+++ b/app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Spanish Traducción de dominio público (Mateo a Romanos)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaTDP"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SrKDEkavski/Manifest b/app-dicts/sword-SrKDEkavski/Manifest
new file mode 100644
index 000000000000..cc7978df680f
--- /dev/null
+++ b/app-dicts/sword-SrKDEkavski/Manifest
@@ -0,0 +1,3 @@
+DIST SrKDEkavski-1.0.zip 1609954 BLAKE2B 98fd1edd87512d5ee6c0a7aacc45034109129b3920d1d6e2a01c97a53f97a830252bc07cef2f480f8c8bc345bc75a7bcdae213b8d8cbcbeeb473763c6c275e53 SHA512 fad6a98670657cff8ac427d4ae82eac45fa9b2c91c47a64aef185012b80b9d30663db055b8c5ddb28dc1d529c7708f7d0aaa08a36d237f94f9f35809b8500272
+EBUILD sword-SrKDEkavski-1.0.ebuild 374 BLAKE2B ee1c8027716c31f27d6b2a74e839b947ff48db9ead827f717cdf87e094bafba9600b785b1f02350e5578c03aec5edcdd2d45aa23c84a05c464a3c453a08ec920 SHA512 691dd9c323f1ab35ab0cf8a9c8dd34dbe81a356dc7ac46e10b5deddc32b3bf1cce20399f1e32532bce8921a3ee450a3effbb0946d7314c8a4796fa80adf97a76
+MISC metadata.xml 585 BLAKE2B 8d361230398d717a37885f206a0bae69d1462714a50fe2438cf33f634e7ec25fcc7c00ea05e80a891dc256e64ca55781208ad3e8735b0e977a275abfbaad748f SHA512 b1086071e60032166bff095ce692ce255e9a4a9ad503a2ce4f76704e8b377e077a6a9eb810b49248349d190162ba9fe9ba0f0514e65e5518e7437cbb55484b30
diff --git a/app-dicts/sword-SrKDEkavski/metadata.xml b/app-dicts/sword-SrKDEkavski/metadata.xml
new file mode 100644
index 000000000000..1498e07d10c4
--- /dev/null
+++ b/app-dicts/sword-SrKDEkavski/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Serbian Bible: Vuk Stefanović Karadžić translated the New Testament in 1847, and Đuro Daničić finished his translation of the Old Testament in 1865. This Bible translation is a public domain, Biblija Srpski prevod. Vuk Stefanović Karadžić Novi Zakon 1847, Đuro Daničić Stari Zakon 1865.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild b/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild
new file mode 100644
index 000000000000..e5ded6d5fbe8
--- /dev/null
+++ b/app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Serbian Bible Daničić-Karadžić Ekavski, NRSV versification"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDEkavski"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SrKDIjekav/Manifest b/app-dicts/sword-SrKDIjekav/Manifest
new file mode 100644
index 000000000000..1cdfba789177
--- /dev/null
+++ b/app-dicts/sword-SrKDIjekav/Manifest
@@ -0,0 +1,3 @@
+DIST SrKDIjekav-1.0.zip 1609798 BLAKE2B 916c704100d5b981be159fdf1d6d5fbd62ab1e443c5464abebebb769a3567d48afb15c6a5be876c59f2092bc9f9152c9fb0430b71ddcd8d68f25fad73e34d473 SHA512 2f4ca321da2bd6b31ed2bd77842de2eabca3a2f892ba2175818e2e1341bc2a6bd18116d59046d80b9b8c1cd106d4c621ef91d9d6979f9e882acf73f7fc89e668
+EBUILD sword-SrKDIjekav-1.0.ebuild 377 BLAKE2B 9cc41803553d22be84f3c1be90e7aa2350fbd99ac76535aadad8dbbbc6c26f82daad4bc79a67f61024e893aa0d365be9edf55b682c5058025e99a700690de0ba SHA512 d19cb1995c2f3990319d3c8562574841a8d44bf7e8a5a03997c91c5dc4bad53472625f60b11bbbf0c03d15fe71284a76728ee023e609f41962f553b234ca9c1f
+MISC metadata.xml 588 BLAKE2B 602e8d790dea2660cb02c80a4366a566bab22f28f86abf01946ca66ce2b1cfc974465f57b4ae271217326f0bde442b5b724c8558f346a7aacd4d2d2508fdb07b SHA512 496b3189b7309274c18c1841f921518bd0d261544da29d1f004218437807b0725ac2c3ee5c474a85aeccffed37db2afd9c751f8eff28e0e6c15f42f74ba4589b
diff --git a/app-dicts/sword-SrKDIjekav/metadata.xml b/app-dicts/sword-SrKDIjekav/metadata.xml
new file mode 100644
index 000000000000..53d1a05292dc
--- /dev/null
+++ b/app-dicts/sword-SrKDIjekav/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Serbian Bible: Vuk Stefanović Karadžić translated the New Testament in 1847, and Đuro Daničić finished his translation of the Old Testament in 1865. This Bible translation is a public domain. ,"Biblija Srpski prevod. Vuk Stefanović Karadžić Novi Zakon 1847, Đuro Daničić Stari Zakon 1865."
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild b/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild
new file mode 100644
index 000000000000..ceb68993784a
--- /dev/null
+++ b/app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.8.0"
+
+inherit sword-module
+
+DESCRIPTION="Serbian Bible Daničić-Karadžić Ijekavski, Calvin versification"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDIjekav"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Swe1917/Manifest b/app-dicts/sword-Swe1917/Manifest
new file mode 100644
index 000000000000..e2223507e883
--- /dev/null
+++ b/app-dicts/sword-Swe1917/Manifest
@@ -0,0 +1,3 @@
+DIST Swe1917-2.0.zip 2375221 BLAKE2B 339c07519f283dffede8d9ee35af180dfa4e6ff0b7ad9fa5fe36d00e628547bbb6aa4ec2ced9fbebad7fa2a897e99d0b6c4ec310cdfc7001c2e4b9e54c972eb4 SHA512 40d14d09389cc6655f691afd767f0633f1456d54368a922b8578b652311b99ba2dbb15e6b29f435955e77f9adb24f65358f32335d468c9fb095983988729f696
+EBUILD sword-Swe1917-2.0.ebuild 328 BLAKE2B eb8c327043d810cd3e3b24c95ecee8cc7bab5bf7588fc816de0b42e34b3ddffaa98fc698ebaeefe8d993140a3d7d54d85a076d5b927c7d2da4e5f8df6ebff43d SHA512 c508bdeb542979c65edb7e8e69acb2e5607445f0122482def86ae8ca95d5c8d31fd141f706155331ef8e7de33f6e1642d218b9240e26d1f4ed10c11162099f2d
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Swe1917/metadata.xml b/app-dicts/sword-Swe1917/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Swe1917/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild b/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild
new file mode 100644
index 000000000000..ab99f02457d0
--- /dev/null
+++ b/app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Swedish Bible (1917)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Swe1917Of/Manifest b/app-dicts/sword-Swe1917Of/Manifest
new file mode 100644
index 000000000000..297f5ff5c39e
--- /dev/null
+++ b/app-dicts/sword-Swe1917Of/Manifest
@@ -0,0 +1,3 @@
+DIST Swe1917Of-1.1.zip 61369 BLAKE2B f61b354cd25e31925cfc4d64d96421540255cbe521416786165c9a25a604feb04ea86e569ddbc235ecf83d75132a0e5067dbb587af04c51486f2c85f54ae8b9f SHA512 dc38fc33fa813e94f09de94d2a9e1230236440b200fd489576fecd7d5b50745d3a383ed640f130a593453ba16d3246acb119c561bfb8b5242173f7f8cd3009d8
+EBUILD sword-Swe1917Of-1.1.ebuild 388 BLAKE2B 1a9c4557838fb5ecfaa6c71950237eb5fdfe5b8546fb9677adadc77b9c04f6995f45888edd00a75e77cab62164fd7a281e778071a46f470b216da508e64845a6 SHA512 63444ea07cebf70b61fce61c699e3bc2b7edea3a0c8eec8fb3db8b86df5c44bf1845a2f60ed59fa1be96604586eb7a5cf146c2e8f70e0f186b2cabf34c37ca59
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Swe1917Of/metadata.xml b/app-dicts/sword-Swe1917Of/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Swe1917Of/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild b/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild
new file mode 100644
index 000000000000..382e87f9290c
--- /dev/null
+++ b/app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Ordförklaringar och sakupplysningar från 1917 års översättning av bibeln"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917Of"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SweFolk1998/Manifest b/app-dicts/sword-SweFolk1998/Manifest
new file mode 100644
index 000000000000..e922b85232e9
--- /dev/null
+++ b/app-dicts/sword-SweFolk1998/Manifest
@@ -0,0 +1,3 @@
+DIST SweFolk1998-1.2.zip 1633828 BLAKE2B cfdd4df8998d942c4358f5ad7625968d50fc9f8f0c1181faca4db2718105615140587782f07ea9262fd016de9ad079e8e109e4d2b03d609747f1d4490bd22599 SHA512 ae2e2f51512c2ab7e7fac1d1366b1e9f59d2aeeffe93ef5077a84bdc8581dd09fa690be7fc37f4e3fa2554e546f88444fc804d31090b732aa03f36b61f72a620
+EBUILD sword-SweFolk1998-1.2.ebuild 333 BLAKE2B 88ac64e31271abaab5ba420fe484c5ec7d6913295e9978b7bfcee7c14847ab356c252f32c239f990ee4a30de30dbae74183a574a07fd08e0677d56333b0e0f4a SHA512 93354dfff0f0e93f2cea725e47031b4bf5a4f0bdb096ce66ebc7550c3665944ba375eb7e3d67111903d5fe7027b95a248300c3d79722ef0da9bfebbb6046e395
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-SweFolk1998/metadata.xml b/app-dicts/sword-SweFolk1998/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-SweFolk1998/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild b/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild
new file mode 100644
index 000000000000..b61d5a5a91f9
--- /dev/null
+++ b/app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Svenska Folkbibeln (1998)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweFolk1998"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SweKarlXII/Manifest b/app-dicts/sword-SweKarlXII/Manifest
new file mode 100644
index 000000000000..5e0c93ccab55
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII/Manifest
@@ -0,0 +1,3 @@
+DIST SweKarlXII-1.0.zip 1051209 BLAKE2B 16a8fd29310ad5bd83d1de25181bef571bc76cccb8ab92d9313203031e319db3ff497a13af591535b81ee584b1d386eacd4a947d9447c64e297005fd3e1f1760 SHA512 1822468c6ab0a441f3c262f81a606864e4eca77de0cad92d19e6b989bf90084d733ab01f6b0fcea16fa7f1b234d4376f57578713b47bead0042ed99dc53c3008
+EBUILD sword-SweKarlXII-1.0.ebuild 342 BLAKE2B 3f8c144a30e46b27461e04592d259ff2bdd21a9f1ea54077d70b2ebab19b7abd25991599e110bb2e60d0cb15fe695d5e28f04a5df0996c643616aebcb4f67df4 SHA512 dccac1d882856ac16f14189197bbbb5d5efc23e3cf23e91c5d70034d9b567c48588a64b06040b6a91d71db735711848961aa10fe88060fcc04dba37e9760de2a
+MISC metadata.xml 587 BLAKE2B 9431984cbcc1f3939db117638c6372a32be5862572e5ad84588ddf5ccbca303d85142fc44cc147f82c348801edd0c5178e4fbb6e84ebf4243c9b0e958200b106 SHA512 33078b5df4c49b32af1c687a0c4dde8afac50e69e1cfe185d5bcfb8a727c7d5b51a9534d0d57ba3d4fbbc44a925b3dac61950a7dea83b11eb1d98f643f7cf83f
diff --git a/app-dicts/sword-SweKarlXII/metadata.xml b/app-dicts/sword-SweKarlXII/metadata.xml
new file mode 100644
index 000000000000..eedaf3bcac90
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="se">
+		Karl XII:s bibel är den reviderade utgåvan av den svenska bibelöversättningen från 1541 (Gustav Vasas bibel). Den trycktes 1703 och var den officiella svenska kyrkobibeln fram till 1917. Denna modul är inte fullständig. Se http://bibeltemplet.net/bibelnonline/KarlXII/ för detaljer.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild b/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild
new file mode 100644
index 000000000000..1d93163a83b8
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Svenska Karl XII:s Bibel (1703)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-SweKarlXII1873/Manifest b/app-dicts/sword-SweKarlXII1873/Manifest
new file mode 100644
index 000000000000..783793047960
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII1873/Manifest
@@ -0,0 +1,3 @@
+DIST SweKarlXII1873-1.0.zip 1495180 BLAKE2B a1babb97a0e9bb7e19e7b247a400f18138a3b057bfc1ea6562ec0058781e0fd468d5e3b2a8f3463d11a776342c01a7a4e672d128bb71a5e9b66657d8dd4898b5 SHA512 45ae34a1b943800863f6ee9a1b199f396dbee2d9e15e6216fc12a816cd44292c9db48a83e6814fe8555b635335cae45ebe29c48ffd77fbde16454f16ade4ae68
+EBUILD sword-SweKarlXII1873-1.0.ebuild 346 BLAKE2B f668ab472a15afa96f45de8213c9917188a5c80275e96fa05228a1bfe3375aba71b568d5d676047809f7e7e1252a59c7c24a17cc5c55dc72a5c7edd3f4ebb30c SHA512 6124409b4371ac2e1e69df6b031881e0ce988005cb9e93cabe8717f280c2bb383aac9638dc7bf2c151d4e84863b8a363fc49b72db6362ac336fb3ce03dc0f715
+MISC metadata.xml 525 BLAKE2B 8635d8e89c03e012b65857730d404cfeaf3edc6315f18f8fa6a33496ca1027f466d2151c791300f07e1412251585a23698934f30f609a6f97bf8e62bd1afb4fe SHA512 50ce017033fc26b3aff7454e91e4206aef8a853f4db084d751d3235be77afb983e0144228b241d050617795800e359edd1286a8e51f3ddf8a7b8eb60336c1f1f
diff --git a/app-dicts/sword-SweKarlXII1873/metadata.xml b/app-dicts/sword-SweKarlXII1873/metadata.xml
new file mode 100644
index 000000000000..77b9be1a1c3b
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII1873/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		According to 19th Century Orthography, Morphology &amp; Syntax of Late Modern Swedish used 1732-1906.
+
+		Text from an OCR of the British and Foreign Bible Societies printed edition from 1873 and spell-checked against a re-print from 1976.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild b/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild
new file mode 100644
index 000000000000..c14c438fd0ce
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Svenska Karl XII:s Bibel (1873)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII1873"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-TNT/Manifest b/app-dicts/sword-TNT/Manifest
new file mode 100644
index 000000000000..e576672d2e2d
--- /dev/null
+++ b/app-dicts/sword-TNT/Manifest
@@ -0,0 +1,3 @@
+DIST TNT-2.0.zip 511100 BLAKE2B 457c492e5d9e28985a26f55204dcf6ad22f1da5f5c9b9f76a0fc4149ab70b5e5b5c96f1e322cfb584c4cef5ad4465ff1ccffa5c87b4a4929d1b15999a967e72a SHA512 f70575d04fb02e89eae53a7c92ee79bc994c947ee9ad57327df5b0b81b18ef233a7640a7ee1308b97bfca2a513c27885b77264d3c0edb78fa2baec9dfabf1c3a
+EBUILD sword-TNT-2.0.ebuild 336 BLAKE2B 4c83b197517d540ffa60f0d496b5ac59a70a29218782dac09cdd105ff2da79e78d489f50a4e2f3ada58e09726781d9df3b5ce6eacc2aeb575a4bbfefdc086e8c SHA512 c2d08fcbb8b85f0eb558c210a593165c54218a1f547233e2bec9a5eb56eb5cba7fc5796e3a32a01f166915889814867dfa8532f088af767ec9572a5e2c604944
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-TNT/metadata.xml b/app-dicts/sword-TNT/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-TNT/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-TNT/sword-TNT-2.0.ebuild b/app-dicts/sword-TNT/sword-TNT-2.0.ebuild
new file mode 100644
index 000000000000..d41c42f7f27a
--- /dev/null
+++ b/app-dicts/sword-TNT/sword-TNT-2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Tregelles' Greek New Testament"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TNT"
+LICENSE="CC-BY-NC-SA-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-TagAngBiblia/Manifest b/app-dicts/sword-TagAngBiblia/Manifest
new file mode 100644
index 000000000000..b2aabce31d9f
--- /dev/null
+++ b/app-dicts/sword-TagAngBiblia/Manifest
@@ -0,0 +1,3 @@
+DIST TagAngBiblia-1.2.zip 1489402 BLAKE2B 099f7690037ded93a19495b44482003aa822c3992edde5c650bb33725693806dd111d032b7f62e87d812784394fe68f5270931acba1d4b2148149406c627e461 SHA512 762150c09ec07225d25c3861cd572781c1ead0f8726bb8e93d2f0343da57616ae6a51272c2d0ebd6eef37b1a2ed88c4c13992eae667d1e09de8644f09cf7472a
+EBUILD sword-TagAngBiblia-1.2.ebuild 371 BLAKE2B 6da872c7182fa8317bf001d5c471b289fbe4f1f94e19834b0a41ff179a412248fe556e3dcf1b672754806cb86694e7f747c1eea04987d4f84fa500c36b710474 SHA512 f38eec942cffb7d8a1af8f1ea385b9876f7f6096145b30ba0daf8f33a71871bfc8f0b3b1a75881ea7e81b2efdff34f7b194e15d4ebcdfae744b6b49ad1cc696c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-TagAngBiblia/metadata.xml b/app-dicts/sword-TagAngBiblia/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-TagAngBiblia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild b/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild
new file mode 100644
index 000000000000..c8aca06a4adb
--- /dev/null
+++ b/app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="'Ang Biblia' in Tagalog by Philippine Bible Society, 1905"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TagAngBiblia"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Tausug/Manifest b/app-dicts/sword-Tausug/Manifest
new file mode 100644
index 000000000000..fb9706d82d72
--- /dev/null
+++ b/app-dicts/sword-Tausug/Manifest
@@ -0,0 +1,3 @@
+DIST Tausug-1.1.zip 645228 BLAKE2B a36e610ba87e1fa2ea3040ee2cec32e9e9b081d19efd3a44d9c51e35e864bb2be3131cf6a4c9e3b592a4fbd7b5f7d146a7f65993e7f6e530bc40697f9a67ef4f SHA512 90f9a73f07394a29cf1e03af6f4b18a64ee9c95eec2f5eac4a28c7b81c17d423dc6e69a87b3179a755b25e68d3f202d17d02940106dcef1911dd9c2ba159409a
+EBUILD sword-Tausug-1.1.ebuild 325 BLAKE2B 6f558dde74442f01fdca822995d91d2052f95b103e8ebe99b43949ac1bb1fe62563cbd57a50bacab4c07376cac91b92eda985ffe74ad7c9546cd7513b91dfa4e SHA512 cf8d7212fe5c2971e15fb335382d6c291867fcd84bf6b520238412fe84e8222d1df5593ca87bbbbd0b7bd5bf461efb5c181e357dba0d1c6b48804a412e8ecc34
+MISC metadata.xml 402 BLAKE2B 601a24b8c8a6a9da03fb72f861d09cc8a876197a1ed085bdfb2533f05d336ea2c331d4a9d5f6d2c798e5220cbab77b5bc36ee2897782bd83439f0a0e82d8ecbe SHA512 6ac1cc6cf9a2e6e9ab59a4bec6ae8dc2098a77822682314c2801b05b9546115897a719381ec70f6b5d7326ccf71a964c7849819258446ab2d1c992e5fc2a5e15
diff --git a/app-dicts/sword-Tausug/metadata.xml b/app-dicts/sword-Tausug/metadata.xml
new file mode 100644
index 000000000000..1b1e8e5c3165
--- /dev/null
+++ b/app-dicts/sword-Tausug/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		The New Testament in the Tausug language. © International Bible Society. First Edition 1985. Revised Edition 1998.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild b/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild
new file mode 100644
index 000000000000..d4dbe01f4ec1
--- /dev/null
+++ b/app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Tausug Kitab Injil"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tausug"
+LICENSE="CC-BY-ND-3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ThaiKJV/Manifest b/app-dicts/sword-ThaiKJV/Manifest
new file mode 100644
index 000000000000..2aec926ea27a
--- /dev/null
+++ b/app-dicts/sword-ThaiKJV/Manifest
@@ -0,0 +1,3 @@
+DIST ThaiKJV-2.0.zip 2168169 BLAKE2B 1088e9301b5f09b37d3ac3e90c36d95e9ea9074c8cd828255b7bd2291003d3cec304ff865ae6923115230df7349bfca7381cb0bff26592f038c61c423e1bf046 SHA512 6d6a7b2a036378ba62e946397958885fb76966027445be6d1d1ee8045f9d57e43c166a879c781536265212693f56cbd96076bcba49ba7601689a9d2f2d0c451f
+EBUILD sword-ThaiKJV-2.0.ebuild 327 BLAKE2B bb28aebb77cc6218c724c8d63077d1f16d2ddd677e1bfee77666061cee949d9dec015e2fafaf2cd8d930ac4e371a53e33851acd69bd6d0ce9a7c09c56869dec4 SHA512 b9863cd4a86d92295b6ad9cb982d5229fcf1c8cf3f90900af9dde2bae4981272d331ba01dc835557afc78e58faad98b9af965735dfc26b0e2ae46519529cc0b3
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ThaiKJV/metadata.xml b/app-dicts/sword-ThaiKJV/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ThaiKJV/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild b/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild
new file mode 100644
index 000000000000..bb8cb4c01b38
--- /dev/null
+++ b/app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Thai King James Version"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ThaiKJV"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-TurHADI/Manifest b/app-dicts/sword-TurHADI/Manifest
new file mode 100644
index 000000000000..db7152d93ea7
--- /dev/null
+++ b/app-dicts/sword-TurHADI/Manifest
@@ -0,0 +1,3 @@
+DIST TurHADI-1.1.1.zip 548110 BLAKE2B 346acfbe730d6e8c1ef6f0e42d8d25cc8ed9169958a5871d56e1c5be61aa11f94a660b45f657dcc6da270b3f2f99e52a17037ea96e6dae41644338adde244c4d SHA512 48ce8d47e90ab560b112e380bd6dc2e9d2a6827c1509357751ab2f9702040f63e8db07b5fd06341d884ec4ba88de39bc6889fa0cdbd342b1d9229092039c7bea
+EBUILD sword-TurHADI-1.1.1.ebuild 343 BLAKE2B 990500175245b2cff7740192a0f60eee5e4703a5ad5e7003098cbb2d7bcf30612b5bc2c151b2eeba68fb5eba36081e567e2317dad2eff8ddd3df5aa167e30aaa SHA512 3a265d9f5c21c04859e11d3472585b8189993c34b5369953770c9733304e8b789a2657439e9d44856d17a2a89ede3ccba31e729c9276658e3380b47e526aae9c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-TurHADI/metadata.xml b/app-dicts/sword-TurHADI/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-TurHADI/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild b/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild
new file mode 100644
index 000000000000..3201783da606
--- /dev/null
+++ b/app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Turkish Easy-to-Read Translation (HADI)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurHADI"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-TurNTB/Manifest b/app-dicts/sword-TurNTB/Manifest
new file mode 100644
index 000000000000..5887c8cde00a
--- /dev/null
+++ b/app-dicts/sword-TurNTB/Manifest
@@ -0,0 +1,3 @@
+DIST TurNTB-2.1.1.zip 2132224 BLAKE2B 50dea0e56b120d66d9a0dba88e916ca02995c665b22e3afb9220c0218b183cfab47c37796f2745858c691ab45c808c4cef1f0e15b232fe26a7df8e8051c4ed1e SHA512 1cbedf1eb264b68cd72780810f36c4cadc70e70c14efdd0a4b50a594cae874058935c836b3f768342817492d6f4d327439e65bc522dd9dd69df2f2a4210c100f
+EBUILD sword-TurNTB-2.1.1.ebuild 335 BLAKE2B 799c52b66f73d9ad9fbb59dbcffab12caa12a5a5f3f0520da674afb5eb81c53f2c64fc6aa01dd3886e64571006b8fa849622d03e1f5c956dc1596802e3d15228 SHA512 0c7f1e58e856e85bbc61b3d1291ed80782e8fba8f66dfa53d40c54db435947e58de2eb005801b5b712ed56fc4c32b68c2e4053fa9f28c6c3b808da0c5e11c7d2
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-TurNTB/metadata.xml b/app-dicts/sword-TurNTB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-TurNTB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild b/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild
new file mode 100644
index 000000000000..981241a7515e
--- /dev/null
+++ b/app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Kutsal Kitap (New Turkish Bible)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurNTB"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-UkrKulish/Manifest b/app-dicts/sword-UkrKulish/Manifest
new file mode 100644
index 000000000000..b778c78909db
--- /dev/null
+++ b/app-dicts/sword-UkrKulish/Manifest
@@ -0,0 +1,3 @@
+DIST UkrKulish-1.1.zip 428367 BLAKE2B 1d1c55d0fc54ed55b55e11bef31e3aaa463480d2058923f3591279002511d05636ec069d23f0687e6b4fe705fbbb72f0a0fb567bf2cfd9325c2af5607b42bdf2 SHA512 4a8d15ec0e62c1affe69c49e1b10b8c72c6a0790cb93924b11b82136d9809399764a42c25fab46927bee27f360935b7ee73350033ca309ccb14ac021b017af2d
+EBUILD sword-UkrKulish-1.1.ebuild 364 BLAKE2B 0700e0b6eaa0e4a937e5ec07b46fa1dfad4e81d53bf2fc8f7c70558636d5179172d295ccddcb92966749a3a35d8c28939d70dbb3302ce56950bdd4761d265e95 SHA512 09ef8e1a3ac5f8c05184c5c9b25bbb0b19b48814a61d605af83fe9c7eeecbfa01e8bd182a5920b8758d71915fdcd24db46b27c4c76bda4801784b35c2b8470b5
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-UkrKulish/metadata.xml b/app-dicts/sword-UkrKulish/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-UkrKulish/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild b/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild
new file mode 100644
index 000000000000..fc8e2b4a6073
--- /dev/null
+++ b/app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Ukrainian New Testament translated by P. Kulish (1871)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UkrKulish"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-UrduGeo/Manifest b/app-dicts/sword-UrduGeo/Manifest
new file mode 100644
index 000000000000..57c29964ff7e
--- /dev/null
+++ b/app-dicts/sword-UrduGeo/Manifest
@@ -0,0 +1,3 @@
+DIST UrduGeo-1.6.zip 2187611 BLAKE2B 45b7a47ba84defa0f8215e0a9f5d3247d76081dbe26185dd8fcb1bbcfcc617bd18119aeeef5f6dd192371844dccd416232a955eda44c5796988f37b8bd53f73d SHA512 991cfa169b2fe4a4e117c54e67eb40c9715bfb10b8d6c35df0a3a81cb525afcdde05ee727029996545f0a85280e0556231b45ff0e62c6716b88cf0ec60563839
+EBUILD sword-UrduGeo-1.6.ebuild 352 BLAKE2B 5d7e0df8c3e70b030e099f1aed9ff5065d81f4955faf56351ea05b916b82a28c16aa026a60c4ae261b768b16449183b17343d200437d554546250f9b2a4932cc SHA512 4604a5dc91e82a9132e20c168cb351b862874ce0ca4b463f343bb500b5e16f5834716a4b43e38f04f01a12a908084534620778fe52fa3d788195edb08d5518be
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-UrduGeo/metadata.xml b/app-dicts/sword-UrduGeo/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-UrduGeo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeo/sword-UrduGeo-1.6.ebuild b/app-dicts/sword-UrduGeo/sword-UrduGeo-1.6.ebuild
new file mode 100644
index 000000000000..064de4d50018
--- /dev/null
+++ b/app-dicts/sword-UrduGeo/sword-UrduGeo-1.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Urdu Geo Version (UGV) of the Bible, Urdu script"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeo"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-UrduGeoDeva/Manifest b/app-dicts/sword-UrduGeoDeva/Manifest
new file mode 100644
index 000000000000..d17432d0ca87
--- /dev/null
+++ b/app-dicts/sword-UrduGeoDeva/Manifest
@@ -0,0 +1,3 @@
+DIST UrduGeoDeva-1.7.zip 2442351 BLAKE2B efefe39dc9b5bcaa4d14e68de9d612deb162727da3c57f43638626c10bd6fd4981db75a9a6414e5f6b2bb4fbe02881f13fb6c695af985bf0f95a4ff6c5693254 SHA512 24f4250fc878705364d9c3aa0758f4613f6b14756c48443135f3b4cbafced1077fedcf5b9cf1b7a336a97b40365dbd1acdf36e81e5fde26970c70a836e7111ef
+EBUILD sword-UrduGeoDeva-1.7.ebuild 355 BLAKE2B 6c4f5a9f414c9e1064135cb72644049f6e86e205b4b14810d588e469603ef25477ea096fb65eeffee98c650bda78244e83841f3f160b3a319ff96256c839b29b SHA512 da6469781fd48e08b0b2ce1372e31c488154f2f18c3157921549b17d8c778b956d9385bd515202ca7614ab3a977a0e97433911d8b76535f96db0b0944c5e76f7
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-UrduGeoDeva/metadata.xml b/app-dicts/sword-UrduGeoDeva/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-UrduGeoDeva/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.7.ebuild b/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.7.ebuild
new file mode 100644
index 000000000000..227e70cd36cc
--- /dev/null
+++ b/app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Urdu Geo Version (UGV) Bible, Devanagari script"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoDeva"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-UrduGeoRoman/Manifest b/app-dicts/sword-UrduGeoRoman/Manifest
new file mode 100644
index 000000000000..3e8c70047f7d
--- /dev/null
+++ b/app-dicts/sword-UrduGeoRoman/Manifest
@@ -0,0 +1,3 @@
+DIST UrduGeoRoman-1.1.zip 2029001 BLAKE2B ceab12a198581cb1c30aeb08437e1c18018bcbc2d90b644145e243b9ca723a98da07ae20a9af6ba955a964f7c0ba4a97671649be11549d9e46a32df8a9dacb79 SHA512 2776d1c54405b1d43f6f6a390570306cf572f44d742a57f3dd4f678fea7b171297bd6e9d6f5ad36d50258497bfafdaea8bb5bee2a8565a5ef519ef09cd246a52
+EBUILD sword-UrduGeoRoman-1.1.ebuild 358 BLAKE2B 8dd8aeeed8b9ec33f5bc11b751ae1682acac8296618f10e97c4e85a26ef94af0f23469ef7301e7a851d9d008512949a75e1f17ca63451bac50acf22d6ce258db SHA512 1eb458986a44c4854c8f8e731fddb5edb2985bffaad9bdf7cba1708f1152642af512c7cf13c14a5d9cf0a8f8e96c595ff6020ae535d07d4d2808778336ee2fac
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-UrduGeoRoman/metadata.xml b/app-dicts/sword-UrduGeoRoman/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-UrduGeoRoman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.1.ebuild b/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.1.ebuild
new file mode 100644
index 000000000000..fe6d48fe7636
--- /dev/null
+++ b/app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Urdu Geo Version (UGV) of the Bible, Latin script"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoRoman"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-UyCyr/Manifest b/app-dicts/sword-UyCyr/Manifest
new file mode 100644
index 000000000000..2c93057a5829
--- /dev/null
+++ b/app-dicts/sword-UyCyr/Manifest
@@ -0,0 +1,3 @@
+DIST UyCyr-1.1.zip 1958778 BLAKE2B 56d10db568b790bfbc9969be6ccf5f2abb1926ee778846cf8bc02e235fbf53321083021101777b051ef7dfc373b6de1d5cd52bbe71206d209f3f30f31beb5324 SHA512 b1e1393c5774d485b700b7d2b0ece24b600ec40a82b0859310c2c99190b1a5e19740afc0ad8cc1e2569c4f7b7d28b18e3d6d12ca048fc48652ebd5376c5a9935
+EBUILD sword-UyCyr-1.1.ebuild 349 BLAKE2B e7c9f7a197ed129b130885ff65ce6302a05233373f33f375222ef9cabc6fee6b621437d7f251af5ab6297a2effe68274f13cb36550409bf2136a889dc1485f10 SHA512 25e00ad17de9fce745f1226488fc4f7190ae3dd18a8a8314e37d15fb829778e1e727f4594a69d4fd50dae1cceda59768db8eb1179a61ff3329885df27c8c8c8c
+MISC metadata.xml 6885 BLAKE2B f5b258bb7ac236812e62f5a252e6a2be79fb9dcac29a8100e36abe4580efda06a6b07f15f65689e2ee031b86bf94775632564a1459fa8822ba684af61d0dbd94 SHA512 1876c801f5a45e1e315a2b83bcce287ccfcb7d0ae9eab76ea49bd24dc4dce694c05d6ef41daa2059597aed5b1dbe6a670466621a4b9adeb4a5f550f51372102d
diff --git a/app-dicts/sword-UyCyr/metadata.xml b/app-dicts/sword-UyCyr/metadata.xml
new file mode 100644
index 000000000000..98651843311d
--- /dev/null
+++ b/app-dicts/sword-UyCyr/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="ug">
+Муқəддəс Китап, Инҗил (Йеңи Келишим), Тəврат, Зəбур, Пəйғəмбəрлəрниң Язмилири (Кона Келишим талланмилар), Һазирқи заман уйғурчə тəрҗимиси
+Священное Писание, Современный уйгурский перевод
+Һөрмәтлик китапхан:
+Сиз «Тәврат» вә «Инҗил» қатарлиқлардин тәркип тапқан «Муқәддәс Китап» һәққидә аңлиған болушиңиз мүмкин. «Муқәддәс Китап» барлиқ инсанларға Яратқучи Худа тәрипидин берилгәндур.
+«Муқәддәс Китап» «Кона келишим» вә «Йеңи келишим» дәп икки қисимға бөлүнгән. 39 қисимдин тәшкил тапқан «Кона келишим» Муса пәйғәмбәр арқилиқ чүширилгән «Тәвраттин» ибарәт бәш қисим, шуниңдәк Зәбур вә башқа пәйғәмбәрләрниң қисимлирини өз ичигә алиду. Қолуңиздики Китапқа «Тәвратниң» алдинқи икки қисми, йәни «Аләмниң яритилиши» вә «Мисирдин чиқиш» киргүзүлгән болуп, буларда дуния вә инсанларниң яритилиши, шундақла Нуһ, Ибраһим, Яқуп, Йүсүп, Муса қатарлиқ пәйғәмбәр вә исраил хәлқиниң әҗдатлири һәққидә хатириләнгән.
+«Йеңи келишим» дәпму аталған «Инҗил» болса Әйса Мәсиһтин кейин йезилған болуп, у 27 қисимни өз ичигә алған. Қолуңиздики толуқ «Инҗилни» мәзмун җәһәттин үчкә бөлүшкә болиду:
+1. «Мәтта», «Маркус», «Луқа» вә «Юһаннадин» ибарәт бу төрт қисимда Әйса Мәсиһниң дунияға келиши, яратқан мөҗүзилири, тәлимлири, қәстән чапрас яғачқа миқлинип өлтүрүлүши вә тирилиш җәриянлири баян қилиниду.
+2. «Һәзрити Әйса әлчилириниң паалийәтлиридә» Әйса Мәсиһниң шагиртлириниң Хуш Хәвәр йәткүзүш җәрияни баян қилиниду. Буниңда Худаниң Муқәддәс Роһиниң улар билән биллә болғанлиғидин уларниңму Әйса Мәсиһкә охшаш мөҗүзиләрни яратқанлиғи һәм һәр қандақ қийин әһвал вә җапа-мәшәқәтләргә учриған болсиму, қәйсәрлик билән кишиләрни Әйса Мәсиһкә ишинишкә йетәклигәнлиги, нәтиҗидә мәсиһийләрниң саниниң зор көпийип, мәсиһийләр җамаәтлириниңму мәйданға кәлгәнлити баян қилиниду.
+3. Салам хәтләр Әйса Мәсиһниң әлчилириниң йеңи қурулған мәсиһийләр җамаәтлиригә язған хәтлири болуп, бу хәтләрдә Әйса Мәсиһкә ишиниш йолиниң асаси чүшәндүрүлиду һәм мәсиһийләргә нәсиһәт, илһам вә тәсәлла берилиду.
+«Муқәддәс Китап» дунияда сетилиш сани әң көп болған китап болуп, төрт йүздин артуқ тилға тәрҗимә қилинған. «Инҗилниң» өзила миңдин артуқ тилға тәрҗимә қилинған. «Муқәддәс Китапниң» биринчи түркчә нусхиси 1666-жили Түркияниң султани Мәһмәтниң тәрҗимани тәрипидин тәрҗимә қилинған. Әң йеңи нусхиси болса 2001-жили нәширдин чиққан. Ушбу китапниң ахирида көрситилгинидәк, «Инҗилниң» уйғурлар арисиға тарқалғиниға кам дегәндә миң жил болған болуп, кейинки жилларда Турпан вә башқа қедимий шәһәрләрдин тепилған ядикарлиқлар бу нуқтини испатлайду. «Инҗилниң» 20-әсирдики биринчи уйғурчә тәрҗимиси 1914-жили, «Муқәддәс Китапниң» толуқ уйғурчә тәрҗимиси 1950-жили нәшир қилинған.
+«Инҗил» тәхминән икки миң жил бурун қедимки грек тилида йезилған болса, «Тәвратниң» көп қисми униңдинму кона болған ибраний тилида йезилған. Шуңа, уларни тәрҗимә қилиш һәқиқәтән асан әмәс. Әйни чағдики тилларни бүгүнки тилимизға тоғра, раван вә чүшинишлик қилип тәрҗимә қилиш тәрҗиманлардин зор әмгәк вә алаһидә җавапкәрчилик тәләп қилиду, әлвәттә. қолуңиздики бу китап ялғуз бир кишиниң әмәс, бәлки бир қанчә кишиләрниң әтраплиқ издиниши, чоңқур тәтқиқ қилиши билән вуҗутқа кәлди. «Инҗил» әдәбий грек тилида әмәс, бәлки һәммә адәм чүшинидиған аммибап грек тилида йезилған. Шу сәвәптин, тәрҗиманлар «Инҗилниң» әйни тилиға садиқ болуш үчүн, һазирқи заман аммибап уйғур тилини қоллинишқа тиришти.
+Худа «Муқәддәс Китап» арқилиқ Өзини инсанларға намайән қилип, уларға болған меһир-муһәббитини вә қутқузуш планини көрсәткән. Биз китапханларниң бу китапни оқуп чиқип, Худаниң ирадисини вә униң ата қилған қутқузулуш йолини тонуп йетишини үмүт қилимиз.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild b/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild
new file mode 100644
index 000000000000..30fd6af1ffc0
--- /dev/null
+++ b/app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.2"
+
+inherit sword-module
+
+DESCRIPTION="Modern Uyghur Cyrillic translation of the Bible"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=UyCyr"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VarApp/Manifest b/app-dicts/sword-VarApp/Manifest
new file mode 100644
index 000000000000..636eae45fa2d
--- /dev/null
+++ b/app-dicts/sword-VarApp/Manifest
@@ -0,0 +1,3 @@
+DIST VarApp-1.0.zip 925096 BLAKE2B 51051e5c529dcaaacf426cd9182902a7b99ac1e54a98bf3711ed9a37cc0f23c7e3ebd20965552fcb129b4c3be86d0d9f6b550b0304d720b30f38e35ed6398428 SHA512 512030bc6ed288b1fbb356d52b2e33cfa73a392dfd64777402b84d9bfe58336e6df7fddd04fab393b98f7ede21293e696d7540394d07f832d9f2254b9292f1ee
+EBUILD sword-VarApp-1.0.ebuild 332 BLAKE2B 36576eb0af4a9ec115ce92b114d034d380ead01f862f496f70cbf4aa14fbc1f7bccb2db75ee8ee99eb3ecb7b0fe31fca2d10eabb3a25ff9d2e4b8a22d139c6cf SHA512 570ee23e52679b7b969c7f63978de9042e747a85e476e1055e7c0a4327d881459dc31eeca95e086ea06fcc3f703a87bc4cbcaa54d558f87e7572935da10efdbe
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VarApp/metadata.xml b/app-dicts/sword-VarApp/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VarApp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild b/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild
new file mode 100644
index 000000000000..1db3964b87fd
--- /dev/null
+++ b/app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.2"
+
+inherit sword-module
+
+DESCRIPTION="NT Manuscript Variant Apparatus"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VarApp"
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Viet/Manifest b/app-dicts/sword-Viet/Manifest
new file mode 100644
index 000000000000..495814259a34
--- /dev/null
+++ b/app-dicts/sword-Viet/Manifest
@@ -0,0 +1,3 @@
+DIST Viet-1.4.1.zip 1557474 BLAKE2B 3826bf444b9bab0d685a540796aa7bbd032df597453e4de66a5e7749ba36c87501340cbd6bf3be1f7e26f76b2b4d7b5ec43168984c014ec719e6306470254e0c SHA512 ffa89c972243108390db78051556159abd6023f849fc22ce87a100cf05515a6a18e0124c1e477a7bd11412498af1328f4527b533e86d01946ffbe28d6a0dbb66
+EBUILD sword-Viet-1.4.1.ebuild 328 BLAKE2B e38568f15ee52efa0aeb324c604b44cac9efdda8d9ee704c006a8728dab65a6e95b30f6ed7efcc6a8d17d7eb0b08a961b9f1ea0d39f6ed343856db032b6e1b6d SHA512 8c07d0283c884ebb17c02e0393cbbf08873651a0bbce7699d96ef35ab8aea99622c2717f79b9799abcada301e9484acc8cc6ba2940de874d1dd10720899d1fd1
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Viet/metadata.xml b/app-dicts/sword-Viet/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Viet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild b/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild
new file mode 100644
index 000000000000..acfe2ac58352
--- /dev/null
+++ b/app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.2"
+
+inherit sword-module
+
+DESCRIPTION="Vietnamese Bible (1934)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Viet"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VietLCCMN/Manifest b/app-dicts/sword-VietLCCMN/Manifest
new file mode 100644
index 000000000000..59e8fb6a9880
--- /dev/null
+++ b/app-dicts/sword-VietLCCMN/Manifest
@@ -0,0 +1,3 @@
+DIST VietLCCMN-1.0.zip 1958369 BLAKE2B 44802e1037f5c6a5df982e3f3d07f49215d0f8eb192113bc95bb695edce0afe12636c589311065eb51f0b99e36ea3f8a1d009f6a4f7d5f2fb5d4feb11c76d689 SHA512 9e2fa69ec54b2e3b77c124d84b4b1ca4facdcdecf84bbb891b2bac7b99c12e7cb9c4e8bbc75f66389866022181bcbb1eca9c241a11c45f7a9f636c45d3461edf
+EBUILD sword-VietLCCMN-1.0.ebuild 336 BLAKE2B 2e7c4d101a5ff73339ed55bdcd83ee944c85497fb27be9c1c2afe31bf8d3e7dd1c099e6775a54952086d3a9df63d09edfec918b0edfd79bbc2a4d94ac3cf620d SHA512 8d8e982541e5c2912179172af98ae35c40185ebf9914559e4a473ee99320f89f8900625de90dcf55903d25ba6449c733bb46e7838782cf61084386c37e10e230
+MISC metadata.xml 518 BLAKE2B 0a55d9651ae6d9ed0a44897f03196d97cd86ae098871c5a59a9463b377f0d49d2461993a7562e7d57bdb62e1c9f8ea58378c30d58cfd5227ce99df41cd300d45 SHA512 2a14b3ae4e7b723b07f87a2d3773c0b965b27a5b00bd2f268d4fd8ee490d9da49c2e3087c2e9a0ac8fa82658534a6488e7975a50d4483f091283fa537091d287
diff --git a/app-dicts/sword-VietLCCMN/metadata.xml b/app-dicts/sword-VietLCCMN/metadata.xml
new file mode 100644
index 000000000000..0d8aa110c5be
--- /dev/null
+++ b/app-dicts/sword-VietLCCMN/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="vi">
+		Lời Chúa Cho Mọi Người, Bản dịch do Nhóm Phiên Dịch Các Giờ Kinh Phụng Vụ thực hiện. Dẫn nhập và chú thích : Bernard Hurault, Louis Hurault. Hà Nội: Nhà Xuất Bản Tôn Giáo, 2007.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild b/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild
new file mode 100644
index 000000000000..381dba0498e6
--- /dev/null
+++ b/app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Lời Chúa Cho Mọi Người"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMN"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VietLCCMNCT/Manifest b/app-dicts/sword-VietLCCMNCT/Manifest
new file mode 100644
index 000000000000..c642cc7fcb95
--- /dev/null
+++ b/app-dicts/sword-VietLCCMNCT/Manifest
@@ -0,0 +1,3 @@
+DIST VietLCCMNCT-1.0.zip 887742 BLAKE2B 25f6c1531bb807c71d4226e9114f35e144493918b9db4602dc8392cc308ad30532d9e62ee68e227652ceb51c442c21f3e4f7fd597c6ba45f84673c74ba1e5d86 SHA512 e890df3d2adb1b8d359326151217117d083bcfd7ff80c61c4c6d608c157ce5709384dd24eed0ce71edf484c8f20941ad4717f795e0974becb7b9d48c8abd3ff8
+EBUILD sword-VietLCCMNCT-1.0.ebuild 350 BLAKE2B fbfc95cbccea89cddfbda2862b65d25d9b3c44bcd18af150ac8dfd15715ab434e4df82bb351d1285d9361740a14814f9f85d69d65c24bd7c076147807ab23355 SHA512 8390c16d108ef6d1dbefb5b21fa1558885407b9fbb59968094ce293d1e25234b1a62d6a4facad6e9e2bc51ea2fcfb06bbce9e829ade78be93bdb2d778dfd0d6b
+MISC metadata.xml 518 BLAKE2B 0a55d9651ae6d9ed0a44897f03196d97cd86ae098871c5a59a9463b377f0d49d2461993a7562e7d57bdb62e1c9f8ea58378c30d58cfd5227ce99df41cd300d45 SHA512 2a14b3ae4e7b723b07f87a2d3773c0b965b27a5b00bd2f268d4fd8ee490d9da49c2e3087c2e9a0ac8fa82658534a6488e7975a50d4483f091283fa537091d287
diff --git a/app-dicts/sword-VietLCCMNCT/metadata.xml b/app-dicts/sword-VietLCCMNCT/metadata.xml
new file mode 100644
index 000000000000..0d8aa110c5be
--- /dev/null
+++ b/app-dicts/sword-VietLCCMNCT/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="vi">
+		Lời Chúa Cho Mọi Người, Bản dịch do Nhóm Phiên Dịch Các Giờ Kinh Phụng Vụ thực hiện. Dẫn nhập và chú thích : Bernard Hurault, Louis Hurault. Hà Nội: Nhà Xuất Bản Tôn Giáo, 2007.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild b/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild
new file mode 100644
index 000000000000..810d5550e433
--- /dev/null
+++ b/app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Lời Chúa Cho Mọi Người Chú Thích"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMNCT"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VietNVB/Manifest b/app-dicts/sword-VietNVB/Manifest
new file mode 100644
index 000000000000..1a04b8dd33ca
--- /dev/null
+++ b/app-dicts/sword-VietNVB/Manifest
@@ -0,0 +1,3 @@
+DIST VietNVB-1.4.zip 1914442 BLAKE2B 8ec207b384f7823a3c6aaebfbf8fa3c7de04f3ba6ed46a691432856171ebd44a4d4d51e00c3534d08ae7bbcb9499dc02aa41f72318d63b1a405c4eafd8a56885 SHA512 628fa49425f12bc8c6309e9244b0042f58a13803b869cd8b2b7015c6f7c10226472145885163bbf193cf745aec1c5265ba9bb9bd7f57029963a4cabbe2b45821
+EBUILD sword-VietNVB-1.4.ebuild 331 BLAKE2B 19c7705129bedb649a5fd5f3defb3eb76cdaec8d13900951dd9ee2b07a4e7e1c3f8d22701c8b30c2edd187f931f7151724e2006a60874574962d7f2a3bd14898 SHA512 9560c16d85e5bc0d64fc38500c3fb386e6969dc34f4ad60af111a93fdf9b2bbf4eac9a27ea7df65f83c2958b1efe26cfccbc0c4a0b11d33bfa6a7550927d50f2
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VietNVB/metadata.xml b/app-dicts/sword-VietNVB/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VietNVB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild b/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild
new file mode 100644
index 000000000000..e741f43d26f0
--- /dev/null
+++ b/app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="New Vietnamese Bible (2002)"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietNVB"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VulgClementine/Manifest b/app-dicts/sword-VulgClementine/Manifest
new file mode 100644
index 000000000000..8d6f63798249
--- /dev/null
+++ b/app-dicts/sword-VulgClementine/Manifest
@@ -0,0 +1,3 @@
+DIST VulgClementine-2.0.1.zip 2075201 BLAKE2B 6e3ea414bd1b6299d0152f6bd8aaa77878329a5eb4a5558b7f517058273a5de487b64107e30b966dbc81b31a4572ad568e88f1c9c130f951ee693a2946cee709 SHA512 e1cbe11884c361e2934c9f872a3b4116734259c2f4cfc5a8b90ff1c8d7c757d48eb8362c4cef0759c23e793e76a58c0e17edc724e24c2bb9fe486ba18916b918
+EBUILD sword-VulgClementine-2.0.1.ebuild 333 BLAKE2B ddb457731f92a7a55c68ca51bb9d5972e69b5b9dd06d963b4d367429af02b4d935bcf73322ebb0ed5bd02415f11117ab19418116f47f4dd0fb4216bebb867441 SHA512 239699109cfe0d55e9dfe4822109709e7e0db2e09630240af54db4cc199c7a67df3498f9e3bcdeee7eb515ad1591d958fb8b8cbc3d9d5dd9c283159d763d3959
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VulgClementine/metadata.xml b/app-dicts/sword-VulgClementine/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VulgClementine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild b/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild
new file mode 100644
index 000000000000..06846def324e
--- /dev/null
+++ b/app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Clementine Vulgate"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgClementine"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VulgConte/Manifest b/app-dicts/sword-VulgConte/Manifest
new file mode 100644
index 000000000000..8737436c4a28
--- /dev/null
+++ b/app-dicts/sword-VulgConte/Manifest
@@ -0,0 +1,3 @@
+DIST VulgConte-1.0.2.zip 1641941 BLAKE2B bc725367f449d0d864641040d73eca08e17199f393e85d266f75e905328d977648d6306f35fb22e936118aa421b0a4fb8139132cd90478258b65f15ad5d2f61c SHA512 d648b7843252ebcc946bccac69db9fcabd3417cfffe25ef0f7f7ba1cbcb2a38bc460ca4dcd92cc1273c7c523cba5d5630fc152454f2149005c42b3618e329500
+EBUILD sword-VulgConte-1.0.2.ebuild 343 BLAKE2B 875483929d17890b9e31fb4b3318a2b8caa0b4195f77fbb8a5989480c9474d4eb00feb192f8675c31120a30d719143a6957c24ac3df88a047ed0ab917c391d17 SHA512 eefc0fbd0079e6508dcb000d27fb154ad50501f5908c01c50f5a90ca99a21538fbb1447650a54f1d63497e347f0220b439edc63ab9c518bb026fa399223cd83a
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VulgConte/metadata.xml b/app-dicts/sword-VulgConte/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VulgConte/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild b/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild
new file mode 100644
index 000000000000..f23ee0e23d9a
--- /dev/null
+++ b/app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Vulgata Clementina, Conte editore"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgConte"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VulgGlossa/Manifest b/app-dicts/sword-VulgGlossa/Manifest
new file mode 100644
index 000000000000..c62832c66334
--- /dev/null
+++ b/app-dicts/sword-VulgGlossa/Manifest
@@ -0,0 +1,3 @@
+DIST VulgGlossa-1.0.1.zip 2148186 BLAKE2B 5d24b1b10e3847776cadd041d53982a2555d6330fdbcffbad466db76ab12cc95e5af00c748c0f7a46b7c79399e3a5ac66e8fe5602cdeb6d42e28719abea03473 SHA512 b184d3d33d4ede0d7e836e7adefd473f6e8793048c1c10da4eafcfb891a82d1ec46b1bf3bea2ccd858fd879e6479aaaf2a620d0645d7a6f2f51d4453c937daca
+EBUILD sword-VulgGlossa-1.0.1.ebuild 338 BLAKE2B 1097d5af010cc72267a57dff11211a20c1bf49efb994a3a15e19d2a1920f7896737bd0dd1de7288262027fa91c6e49960337b25e419fc58ef1563979296a2425 SHA512 b50937d6e41df61cf5ea811c50d6c7331ab690e748272ee646efaa833d706f8c08d9047abe71e2cba71e0afa2f77f6b4bbcd4b98ae2bb4a576121e988362f1cd
+MISC metadata.xml 442 BLAKE2B f160b3b75b21271af69d1ae73d80f92a2016fe9a5ec192813fc42cbb2d6c9989b9208dda2bb66bbb76d433a17bd4c7b62e4d1603a791b1640c1033ca007bc0cd SHA512 9083ba14fb44e09b6bd9ed54deb2f8ba0942f2870055ce28ad6aea10c6ed732fb6e186d7d91c28217d44fc671548588603b706dad3b0a14f4fb5d410e5eb265e
diff --git a/app-dicts/sword-VulgGlossa/metadata.xml b/app-dicts/sword-VulgGlossa/metadata.xml
new file mode 100644
index 000000000000..ab0317efe7cd
--- /dev/null
+++ b/app-dicts/sword-VulgGlossa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Glossa ordinara (Ordinary Glosses), edited by Jacques-Paul Migne (1800-1875), published in 1879. Electronic text prepared by Steven Killings for VulSearch.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild b/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild
new file mode 100644
index 000000000000..76e2a3f1a196
--- /dev/null
+++ b/app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Glossa ordinaria, ed. Migne"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgGlossa"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VulgHetzenauer/Manifest b/app-dicts/sword-VulgHetzenauer/Manifest
new file mode 100644
index 000000000000..db5a5d05e679
--- /dev/null
+++ b/app-dicts/sword-VulgHetzenauer/Manifest
@@ -0,0 +1,3 @@
+DIST VulgHetzenauer-1.0.2.zip 1641511 BLAKE2B 8f1254308b050e3665a9e63e587d0f7316636281bfae0417f87f1f2663fcd5c7c9ec31e1ce4eb849257720add59cf29c0d9b46d7d8868a2db2b689f0173f39fa SHA512 66870e298235047d4a9d295e670ad7713c273248ae31231630d01cb10a9d227f02485f485d6699bce991c843041dbf416d687fb74e343414e9e7d3c8405d9c80
+EBUILD sword-VulgHetzenauer-1.0.2.ebuild 353 BLAKE2B f57940e8c62961f79bb75a0c1ed86452e7c47a37c86ce0ee7f647aa9208729a8d364394062d71727915f62d6fe777d116e9712bf63c4222f08877753c658eda4 SHA512 60ac5da0f152f7e38d7bdb4792c0a68059ce5052114864528e14e5e074a5b8a70ea79013b858f6231720063c4c114deec94f156bad93425a7aff50057a525571
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VulgHetzenauer/metadata.xml b/app-dicts/sword-VulgHetzenauer/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VulgHetzenauer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild b/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild
new file mode 100644
index 000000000000..ba17c2aa85d8
--- /dev/null
+++ b/app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Vulgata Clementina, Hetzenauer editore"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgHetzenauer"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-VulgSistine/Manifest b/app-dicts/sword-VulgSistine/Manifest
new file mode 100644
index 000000000000..ad4741eeb6fe
--- /dev/null
+++ b/app-dicts/sword-VulgSistine/Manifest
@@ -0,0 +1,3 @@
+DIST VulgSistine-1.0.2.zip 1632044 BLAKE2B f11f8b11280bc872de85cdb227b9f349332719f263272f0d7b4ba724f854e292031b3d197297cafd6a82516b2d54601469e2a273eb26630c81950e9c73e847ce SHA512 b53f5a452716f39ac93de0ab0356b4177160608c37e8d5fcc4452f8212f57d76875ee69ab1447ae66c9188c4eb8cf9889147f0b76a686a703cbef12634da30e9
+EBUILD sword-VulgSistine-1.0.2.ebuild 327 BLAKE2B 3345a2872112617ff93f04884dcca12a332539e25f5d3529e3e57763c00bdf46bf32a57a0b2daf770338afc7d9b92320684729947de1d65f196cb57f189d1e52 SHA512 4ad9f601affaaf802d1d634fe7ac3a6121bf8e9ff91f9cfa8c0a3aa2254975a0aff5a612f7a7ad3b91e3dd639201e9e4e58db07186839a64ec63435bc508b99c
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-VulgSistine/metadata.xml b/app-dicts/sword-VulgSistine/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-VulgSistine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild b/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild
new file mode 100644
index 000000000000..088b4e622126
--- /dev/null
+++ b/app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="Vulgata Sistina"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgSistine"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Webster1806/Manifest b/app-dicts/sword-Webster1806/Manifest
new file mode 100644
index 000000000000..ef2dff24a76e
--- /dev/null
+++ b/app-dicts/sword-Webster1806/Manifest
@@ -0,0 +1,3 @@
+DIST Webster1806-1.0.zip 1953871 BLAKE2B af39baefd2d1ab5e3975f52fb45afb9eff2d20fb0b5d077f0047eae5b0cc6c00176adbcb6dc6a2dde4a8a6bf09353281bfbe03d4eb600a02d25388cc22d1a1e4 SHA512 d6926297f5edd0f20141341119c2ca89ddc8025d6717f9825d1d34e6be73a7576ff05e4bd5bf84e053011faee5c2ca2fbba3d0fae8f566ff181601d2671557ab
+EBUILD sword-Webster1806-1.0.ebuild 376 BLAKE2B 9e94b045b2aef57b45b0ffe6fb9ed3f4f4195700ba4d33b9cb3d7e5c7e7d5d9611768348080b881a993a73ceda6ff22f75ad425e8e5984202df9821befbe4015 SHA512 9b84b9ee30d68fbc14bf5bbf5362efcb58e3067eb0b510c2e3eddb64a08809c3d1b59b5cb8c55eaed3de7cdb4646fb8538b83dc2b266b2eacc9666833bc88053
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Webster1806/metadata.xml b/app-dicts/sword-Webster1806/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Webster1806/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild b/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild
new file mode 100644
index 000000000000..185253a756bd
--- /dev/null
+++ b/app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.11"
+
+inherit sword-module
+
+DESCRIPTION="Webster's 1806 A Compendious Dictionary of the English Language"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1806"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-WelBeiblNet/Manifest b/app-dicts/sword-WelBeiblNet/Manifest
new file mode 100644
index 000000000000..e0f206d689e4
--- /dev/null
+++ b/app-dicts/sword-WelBeiblNet/Manifest
@@ -0,0 +1,3 @@
+DIST WelBeiblNet-2.5.1.zip 793457 BLAKE2B 43c62105079631a83c033e3ef9e1a7fc8a4da10c5d73531d6187bd8c7b7c0c8663775788783a30b678795da97aaaac8f87d4df33767696defe9741bd1c0d31d7 SHA512 62733735103786f6b4815ba50698a0126641467bf2bc035f8e07aed864036dd2d329cc65e74114126912df4f892f8612139576117fed46822ccde86b6310f9ba
+EBUILD sword-WelBeiblNet-2.5.1.ebuild 379 BLAKE2B e6b800e71249917f2753e1a938c95f2b0c1938d5b8d2ea6cad2ef6e0dcf0f69aeaff99db3c98304e5823becf9a6cc99dd4d3657684043001fd2d3b49cac94874 SHA512 fa7c5f82eb71d5ecef560ac13a0b1a790abd24e9918a32f09a2a60a084103b411e316ab8c557d747a47c72f5ec3e637fc389290209b768bd48f528875bdefa06
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-WelBeiblNet/metadata.xml b/app-dicts/sword-WelBeiblNet/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-WelBeiblNet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-2.5.1.ebuild b/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-2.5.1.ebuild
new file mode 100644
index 000000000000..ec0ef44877fc
--- /dev/null
+++ b/app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-2.5.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="beibl.net translation of the Bible into colloquial Welsh by Arfon Jones"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=WelBeiblNet"
+LICENSE="crosswire"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Westminster/Manifest b/app-dicts/sword-Westminster/Manifest
new file mode 100644
index 000000000000..c4959a534a0c
--- /dev/null
+++ b/app-dicts/sword-Westminster/Manifest
@@ -0,0 +1,3 @@
+DIST Westminster-1.0.1.zip 444333 BLAKE2B e12f3f5de0666dbe4a64dede65d14c06cc03fa134fe3c47b7cda5c21f98f2bf3434c65c543a495b088ef41b4159ec02e63c70779736d643aaab0f22af4c2ef25 SHA512 8d11a793fdeccd04f75073129e5a695733d3b73c4396e54c51bdaa283f3847c295e041d81c04f4c30565206ec793e5a8f32ff1ccdd1611c419d08b32a2a58de3
+EBUILD sword-Westminster-1.0.1.ebuild 347 BLAKE2B fc4df677e5d2684cfc8c0362f9b3b65718972a8a3bcc1ae2645b00b12d3394008d0ded4387cf8598dff8eb1de866a420c976f7fa0cb4fb4b160002acb75302aa SHA512 8ad78baff11694624395e8bd10949f327d8f5a9741b830be45615865d6c9e77327702f558d11a126653041130cfcb04325a408bed54443d2c396657623c09f4b
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Westminster/metadata.xml b/app-dicts/sword-Westminster/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Westminster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild b/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild
new file mode 100644
index 000000000000..50ced2c56fad
--- /dev/null
+++ b/app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Westminster Confession & Catechisms"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Westminster21/Manifest b/app-dicts/sword-Westminster21/Manifest
new file mode 100644
index 000000000000..51ebd6a16956
--- /dev/null
+++ b/app-dicts/sword-Westminster21/Manifest
@@ -0,0 +1,3 @@
+DIST Westminster21-1.0.zip 214728 BLAKE2B 465ef32e151c6f0cd9a040175c6358c343ec117dbcc0d50ca4e47bfe3685c64cb19a108f58dcee9b5366ddd8b89d117540701ce638deec046104a01720e8bccd SHA512 63ca88120c26130a0275c724cba205d5e0905d3568df42dcc4026c632f724b950394ce93a6cc7c2288ef8a9a015ebf9e6b9102c545f9bce59884aad34635250a
+EBUILD sword-Westminster21-1.0.ebuild 389 BLAKE2B adf2771d7294ac8714dd7c7a781e07b1f7abc1a3bb74ce1559f54311cf294ea85a04835b954433335b1e7ce243e8ff23638a3137dcc8074e72218e5621875f47 SHA512 e5e63ff82679c4071a7604a4bc997796b4d5f86ec6121c58fe645411fe9245cc1837175d3a903b1a763f92a9bdda21ecf172b3f0f56a6995ce2d366c43b21030
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Westminster21/metadata.xml b/app-dicts/sword-Westminster21/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Westminster21/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild b/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild
new file mode 100644
index 000000000000..a6d7d35096dd
--- /dev/null
+++ b/app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="The Westminster Standards translated into twenty-first century American English"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster21"
+LICENSE="freedist"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-Worsley/Manifest b/app-dicts/sword-Worsley/Manifest
new file mode 100644
index 000000000000..662ba18ac4ba
--- /dev/null
+++ b/app-dicts/sword-Worsley/Manifest
@@ -0,0 +1,3 @@
+DIST Worsley-1.6.zip 407194 BLAKE2B 26a2868fa67dff75cfccef91537c6c7105a62106d50b5344496676620b7f8b35c80021cebea3f08121f908dc85f6f406542640e4f1e229c595f78026deaac369 SHA512 6a88eb8a77207c14548d6ea7322f16a6f88d504e835d6cd90254562c89e539c8c0d9094f447d7db5626a5842b859db9dd5810e1cb6917982103e1e434c0821a6
+EBUILD sword-Worsley-1.6.ebuild 328 BLAKE2B 8d2c88aa9c2fe540ac585ba9e40d3628bb29ed51c44aecc4a4f1a98da4238de9887d19a34c293861ba6bbf76b8c2b45ec7eb86348bfa67768b0c957dfae01a4b SHA512 e2d21bc26f1d9c00bcfcbc627c61c1f3b513541ed04c9f493a016645bfc4b86f140a4807257044dad0acc3b56a898b842feb09b20f7de34ddfea6c54d6e29288
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-Worsley/metadata.xml b/app-dicts/sword-Worsley/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-Worsley/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild b/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild
new file mode 100644
index 000000000000..ff5fb82b502d
--- /dev/null
+++ b/app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.1"
+
+inherit sword-module
+
+DESCRIPTION="1770 John Worsley NT"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Worsley"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ZhEnglish/Manifest b/app-dicts/sword-ZhEnglish/Manifest
new file mode 100644
index 000000000000..99b33f8ec83e
--- /dev/null
+++ b/app-dicts/sword-ZhEnglish/Manifest
@@ -0,0 +1,3 @@
+DIST ZhEnglish-1.0.1.zip 1148611 BLAKE2B 9f43eeeafd6c83b9b516fcc9a74b05b33f5926b3aca43dc9ee5cbb82b794ba3632c237cbb95ea49df7765c48e2a10093e59e8047f356c2c93d87a02258c4a03b SHA512 dcb596976899a48c9209d3194d7389f5e97ceef1d0108b490d5e6455c16b59a7de490fbbb69da0039dbc1d64f0fdeab7664cf2d6f961d93be7fbee09b155dbba
+EBUILD sword-ZhEnglish-1.0.1.ebuild 337 BLAKE2B b51a112be41a17f25920ab5a9b801d7974fed228c72c9dc0dab285fc339a6259bb05918875a64910038cba3efd011834d55bf236b0cb3dae2624951aaf3881e3 SHA512 ca8603fbad65fd6c1d9603bad595b3b3e2a71faf671d4e2ffe30e776884c635ee65e53387b44a8d0e05e9cf1922fa98e14c1c2d20341b3c2cc53739dafe6ba7e
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ZhEnglish/metadata.xml b/app-dicts/sword-ZhEnglish/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ZhEnglish/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild b/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild
new file mode 100644
index 000000000000..af0ee6cafe89
--- /dev/null
+++ b/app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="CEDICT English/Chinese Dictionary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhEnglish"
+LICENSE="CEDICT"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ZhHanzi/Manifest b/app-dicts/sword-ZhHanzi/Manifest
new file mode 100644
index 000000000000..a9904ccc9e65
--- /dev/null
+++ b/app-dicts/sword-ZhHanzi/Manifest
@@ -0,0 +1,3 @@
+DIST ZhHanzi-1.0.zip 801576 BLAKE2B 773c13c5de6a9064611b1f476e55358bbd4921bb1f8be4ae67f916cbd5dd2e53a4215e1f7031120d6378ea14784dcd4d9b71d8bc723f3736166346333e697b33 SHA512 0cd514d514fafddc70c964210a33018bb219dd1dd97b320f043105b229992f924be171b462b8b56c43c09f8681d4d37ba34c9b3d9ac452a3b012ff8c8ca7b8c9
+EBUILD sword-ZhHanzi-1.0.ebuild 343 BLAKE2B e60ac51a695e63f12415871e4052144cba3a5e248bea6a60c172d435aaae43ea85c712497ad5eecd86ba45bf4732236343fda7198bd8bcba22c07a8ed6ca9c33 SHA512 f9d6bf88f446f68550b17313edeb63d044f71509c3c6237d5dbfe157b77ab5126c35e4b2c04107781bdfbbc39edee6db5f6b460023854a196e720853d861ae30
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ZhHanzi/metadata.xml b/app-dicts/sword-ZhHanzi/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ZhHanzi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild b/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild
new file mode 100644
index 000000000000..2e1fc9bcfa2f
--- /dev/null
+++ b/app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="CEDICT Chinese (Hanzi)/English Dictionary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhHanzi"
+LICENSE="CEDICT"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ZhPinyin/Manifest b/app-dicts/sword-ZhPinyin/Manifest
new file mode 100644
index 000000000000..fecabb43f8f9
--- /dev/null
+++ b/app-dicts/sword-ZhPinyin/Manifest
@@ -0,0 +1,3 @@
+DIST ZhPinyin-1.0.zip 644691 BLAKE2B d970905361fbc09217af237118c14854f5b36483314aca19c954710e01ab740479caeabfa414397ded1d0c23624d8d3b0065af11efd1863f9ccab4f4d75c5a37 SHA512 0c96c831d97dd8d7b707e4124b336bb8c6f01338e75fdf4c604371e2f120ceebbb37d3fc28458f86fea74b3accba88689dfb9da6ec8982d721758adfd06c4007
+EBUILD sword-ZhPinyin-1.0.ebuild 345 BLAKE2B b28892c4bbf03427bbab84e724dc752e9ba519877380ed0d9f53ae9717de1ae50ad8b5dfc5335e7de5802f320bb6298472e088727b74f475a9547cb85e855c0f SHA512 4a0827946097bf939df47023303fbef5810eefdd9075f9417bce5c351563ec730525606e9540e9e291bbecaf13ed28bdcb30b83fdac2ef3fbf96a95b9e47ea62
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-ZhPinyin/metadata.xml b/app-dicts/sword-ZhPinyin/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-ZhPinyin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild b/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild
new file mode 100644
index 000000000000..52a7d30e6514
--- /dev/null
+++ b/app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="CEDICT Chinese (Pinyin)/English Dictionary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhPinyin"
+LICENSE="CEDICT"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-alzat/Manifest b/app-dicts/sword-alzat/Manifest
new file mode 100644
index 000000000000..16a0da2d5c18
--- /dev/null
+++ b/app-dicts/sword-alzat/Manifest
@@ -0,0 +1,3 @@
+DIST alzat-1.0.zip 43100 BLAKE2B aafd0cdd7e31c005335e1c1c77b7fb6fec14cf2ee5d6dfcca5021d4616845c347f6c5d0eddcdd9c87d9d36f79a16af404e07ae50c77e95d2ee2ab9120a5f72fb SHA512 aef7a83aca6a65bffa87750b9f3ca13afabb1369dcdf3beeb5d70556fb9f422e75851675e31566e41751c7e92249c169fca6c53874ff295565546cde4d19606a
+EBUILD sword-alzat-1.0.ebuild 353 BLAKE2B 99b7b0be070c590a4fc0ee27219c9b27283772881f354632c63dcd6cd89374678cda61cef4ea41a80c94944763fa22c45f4053c23a2f9b38f47a33f8a3f3de9d SHA512 1154636e841489d511038e1254e6aba1475a6c4eff3c715dcca8c3a25f5ae61fc6c3dea94d5cccce33ff234337b0ec483ac8934561d9c9d6deb00e2f55e8981b
+MISC metadata.xml 515 BLAKE2B 8e1cc900300f0141b25c9eae6f5e0d26c63958dd3d433cfe689c01a9957cfeeeb4125842c867202e9f7a0b7d7b6888dc9d0be8c684a726da0ec46cddac1dc04e SHA512 63e82bf124ee5e638db19fc465b5db83a057ba47cf2225c1644caea1fd78bd25e6a60c9a31accaa16c4b463881992890a1a01b53e469c0421d1886f9279626df
diff --git a/app-dicts/sword-alzat/metadata.xml b/app-dicts/sword-alzat/metadata.xml
new file mode 100644
index 000000000000..1f47dbd6f6dd
--- /dev/null
+++ b/app-dicts/sword-alzat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="ar">
+		كتاب الذات للبابا شنودة لثالث 2005 - تم وضعه بهذه الصيغة بواسطة مركز الكمبيوتر بكنيسة السيدة العذراء بالزيتون (Bible@StMaryZtn.org)
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-alzat/sword-alzat-1.0.ebuild b/app-dicts/sword-alzat/sword-alzat-1.0.ebuild
new file mode 100644
index 000000000000..def18024833a
--- /dev/null
+++ b/app-dicts/sword-alzat/sword-alzat-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="الذات للبابا شنودة الثالث"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=alzat"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-br_en/Manifest b/app-dicts/sword-br_en/Manifest
new file mode 100644
index 000000000000..5ff33777748a
--- /dev/null
+++ b/app-dicts/sword-br_en/Manifest
@@ -0,0 +1,3 @@
+DIST br_en-1.1.zip 7016 BLAKE2B 12264230697b98ed21ce8e0191a2380cc6c10db617e524405d0f64a6fbc6dbd79b05807c0c262ff57bc3c736dc67693c6d08ab66493cce99616cf045b60a383e SHA512 8c5bc58e0e4535192367302cc55a9b7208127bd52d0591f10e3493edfe51a237a69a2992e22f83d49fbbc0f2d04bf56a191d5d2481284dd95d916e5390396cc8
+EBUILD sword-br_en-1.1.ebuild 333 BLAKE2B 7ca79ce1ecf5bbf924954ddcebd7b75076b2e5336904381206f4d716fc87858f7b538bd13f5940b5bd0c571cbfc0f24c7d6eec62692611b583f380938f9e1dd8 SHA512 40b242e7aded6dbfa71e42d4941f19237f7cf3893d69fb6479cce7b46d48e626f549161d5a38cb18cd9722d6855250c60983a9fa40ec285ad83128084bc813c2
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-br_en/metadata.xml b/app-dicts/sword-br_en/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-br_en/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
new file mode 100644
index 000000000000..1d7845e171ed
--- /dev/null
+++ b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Breton to English Glossary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-en_eu/Manifest b/app-dicts/sword-en_eu/Manifest
new file mode 100644
index 000000000000..0f3a1e944777
--- /dev/null
+++ b/app-dicts/sword-en_eu/Manifest
@@ -0,0 +1,3 @@
+DIST en_eu-1.1.zip 10034 BLAKE2B a4de449ef3ff7b3e5436dea9f0e5a50545261973eb26ba03efc065c0d863b2a68a87a87e17369e85a6447209794f559488c968f7b17d38f5734b0e9c69811b00 SHA512 684297b7eb438952b2d0dc78be5d2b468da7515d304050fab3cb0023bafe32cf78a9ff9fec9d4e248e07da6f4b9ebf50a21f651f560f8224fd517efc885e4fa4
+EBUILD sword-en_eu-1.1.ebuild 333 BLAKE2B 6d7496cd9ce5a05637852fa1679eef4b8629bed637c81bd3354e2020ac13ea8240c56f756eb2513b66f6a59a6b5d8656382d279721750050f1578b90655c3704 SHA512 6d1067568049cadc1e90e8524ecb89f4db717ab759af9c2a629682015b7c1613a84766879678af635ff729b91e41847579d9fcedf75e2230048b11f065ca10f7
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-en_eu/metadata.xml b/app-dicts/sword-en_eu/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-en_eu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild b/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild
new file mode 100644
index 000000000000..fa921043c05c
--- /dev/null
+++ b/app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="English to Basque Glossary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=en_eu"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-f35/Manifest b/app-dicts/sword-f35/Manifest
new file mode 100644
index 000000000000..648bbfe14d6a
--- /dev/null
+++ b/app-dicts/sword-f35/Manifest
@@ -0,0 +1,3 @@
+DIST f35-1.0.1.zip 405415 BLAKE2B 1692983807c5f26904cbf35e08f07f574f667738103c60ba4360e2379a06698a14ac4cbce910567ad9588b61e7ead0bd742243763326e3895505f7e33f1adc62 SHA512 a3c686a44d645c11463ab1d52140e9493e4a93aff59132acac7c66d4957fd629e3e9b4b279d8ba6c3fa2b93642c07a4642ff7ac7517783b34ed733af42969039
+EBUILD sword-f35-1.0.1.ebuild 367 BLAKE2B f9e23e7c96e8f9bea8a4add49aeea1d91fab4a34027ff076a7ccc44f2f6c0bfac844591912ea5a25c3a7116147909d02e02f2eb70c73290aca1e2657e8bb32aa SHA512 846cb21fd94c016a0be72fd22c31593f7269d01e743447e9709f1514c59f8c03b5a9d3de31f50d990ecd1b3a94ef93705864f1400c753acea09f6e6874bc1558
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-f35/metadata.xml b/app-dicts/sword-f35/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-f35/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-f35/sword-f35-1.0.1.ebuild b/app-dicts/sword-f35/sword-f35-1.0.1.ebuild
new file mode 100644
index 000000000000..f4972ef5f6a7
--- /dev/null
+++ b/app-dicts/sword-f35/sword-f35-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.7.2"
+
+inherit sword-module
+
+DESCRIPTION="Wilbur Pickering's Greek New Testament According to Family 35"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=f35"
+LICENSE="CC-BY-NC-SA-4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-la_en/Manifest b/app-dicts/sword-la_en/Manifest
new file mode 100644
index 000000000000..dbf771c4d04a
--- /dev/null
+++ b/app-dicts/sword-la_en/Manifest
@@ -0,0 +1,3 @@
+DIST la_en-1.1.zip 104210 BLAKE2B f28418e4c1524466930cb4a56b3136e8f2fceb69e9d303b04cc01f7e9edd4a909bd1b190f3821ea1777cd905513edf23689a2d8bea136e52a5223a8dda195a9b SHA512 b4e3128b93d974a0ccd46dac277efcbe661675460a757cbe765a4fd239a24047f18e088cf3d3907d5162d3e2fa0317412863acb71d15aa9ed062a8560591d903
+EBUILD sword-la_en-1.1.ebuild 332 BLAKE2B ad953a7cb93fb213ab513a1984e483ffc82b40a718d25482e26fe8a4b7a33f623a99d53869d3b9529a940e030ad9aa49e241144b8c8b95eff2f1ece07696f2ac SHA512 e5e9b9301b7883a639bc5ef0914d7619bdbed380ef49fa79e84626a787eade4dade88d39997689fdda6ba9fe1d4f52a9b1e438f6bcf06b92339a45650938193f
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-dicts/sword-la_en/metadata.xml b/app-dicts/sword-la_en/metadata.xml
new file mode 100644
index 000000000000..3e5026ee3754
--- /dev/null
+++ b/app-dicts/sword-la_en/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
new file mode 100644
index 000000000000..e9e7940993ac
--- /dev/null
+++ b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Latin to English Glossary"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-sml_BL_2008/Manifest b/app-dicts/sword-sml_BL_2008/Manifest
new file mode 100644
index 000000000000..e3a5a0360b6d
--- /dev/null
+++ b/app-dicts/sword-sml_BL_2008/Manifest
@@ -0,0 +1,3 @@
+DIST sml_BL_2008-1.0.1.zip 925123 BLAKE2B 2004c732396cae332024cb6589fd6de7aa5b28a377ea3a5ddcb8ac0ce03c7d13f63b00b8672894ab988bc706eaba48ab01b7d56ebf7b5d72e982ae919f32015c SHA512 d99af18fc5d1f506f8d5152b0c77d14bd0a09dd3f0258523a35ac8d395e0ff36c2c6735ca714bb5084864703cf4c5f8386d030f4d52a2e714453fafcf30c4ea6
+EBUILD sword-sml_BL_2008-1.0.1.ebuild 345 BLAKE2B fc395d9820dfd7b7cb54aade84151736cb00c1ddbaa5f6e8f77861a49669dd7c9472b2f7763eac2ea36239962157f89144ce27865080e8924d2683a3d826eea4 SHA512 4c209890d65cc2a68493b57e2f5472bfffa9089c351397ad860238c48ebfd17487d884ed718f3f7fbc9c38cc8bbaabe3c01c1980bfb93ae7841373a22199dc97
+MISC metadata.xml 866 BLAKE2B 8c21cb5fc38056add80b3023559a60f0a1027f9ab21d1e4056e503d2a3bc1edd94ff95779ec70fec28e07b5abf2c24331617c6a2baeae4b5cb0fc67f391b2a52 SHA512 21d22e572114fb239321df60383efeca6c6cc4cddeff849417b50a7acf24ec5963cada9f07144a3217c6d0eae4594a7a42e26be9b7279760a04959291381cac2
diff --git a/app-dicts/sword-sml_BL_2008/metadata.xml b/app-dicts/sword-sml_BL_2008/metadata.xml
new file mode 100644
index 000000000000..8ed0aa8ecd74
--- /dev/null
+++ b/app-dicts/sword-sml_BL_2008/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		Pudji maka sanglit ni Tuhan dakayu'-kayu', ya magpapanjari maka manglalappas, ya tubus ma pangita'u maka kawasa.  Pinarakayu' maitu Kitab Injil maka Palbahagi'an Kitab Awal-Jaman, kitab sussi bay pamasulat e' Tuhan ma kanabi-nabihan maka saga a'a kawakilan si Isa Al-Masi.  Wajib binassa maka kinahagad saga kitab itu sabab landu' ahap panga'anta pangita'u maka kasannangan maka kalappasan.  Ya tumabeya' ma nionan Kitab Awal-Jaman itu, ya na Kitab Tawrat maka Kitab Jabul.  Luwal palbahagi'anna talapay maitu, subay na tahun sinong bo' tasalin ni bahasa Sinama saga jud takapin.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild b/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild
new file mode 100644
index 000000000000..7045af2648d9
--- /dev/null
+++ b/app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.1a"
+
+inherit sword-module
+
+DESCRIPTION="Kitab Awal-Jaman maka Kitab Injil"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=sml_BL_2008"
+LICENSE="CC-BY-ND-3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-vlsJoNT/Manifest b/app-dicts/sword-vlsJoNT/Manifest
new file mode 100644
index 000000000000..696c661a1cec
--- /dev/null
+++ b/app-dicts/sword-vlsJoNT/Manifest
@@ -0,0 +1,3 @@
+DIST vlsJoNT-1.0.1.zip 419089 BLAKE2B 8b123dee9f2b07fb7800be47c03d835393879152c32e066effc6085ae69a0f90a2a29c1e7ecc9d70882eb56be144e15be695c46277cefc8e5bf1138338c6a5cc SHA512 5adbfe6d67503b7669f9ab65315e63ae4648cde484b9f9d9c4967b96aba3429a257282deeffaa16729f797468e18712e52121487e8aa35ede279e25a01f23c0c
+EBUILD sword-vlsJoNT-1.0.1.ebuild 349 BLAKE2B 8b1cb7bba8e763e02ca09815c70c05088e95f08bc20194b7f9f9ad62b661c55ba7f75782c54723f05cfc21a4472abd5a422bee27f2840da556e0765adea989ed SHA512 1f87009cf249a96ab72ce380c694f24372379a35f741025358ef388552a7d385aae2e37064e70d6b6a36fc107df86087383f6cd7492dd55297f65db9cb0ed352
+MISC metadata.xml 617 BLAKE2B 0e1db7daa2607223fbcc18c60f4834b24c821fb46c79348b13784ecdc8029c3b63ded66635a6e0e6d932d4c119f5698dc72567ac5ad3a1ae1e7019e717a745bd SHA512 de51defde399e2d4b38b67cc32008d1cbbb0517601a1f2813f4db1c6019941b5a738ff99b8f8051f890b16b529b481928305b944e95d9a84ca68dff5a024c35a
diff --git a/app-dicts/sword-vlsJoNT/metadata.xml b/app-dicts/sword-vlsJoNT/metadata.xml
new file mode 100644
index 000000000000..e7354e1efa7f
--- /dev/null
+++ b/app-dicts/sword-vlsJoNT/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>
+		This New Testament was published by the *Britsch- en Buitenlandsch Bijbelgenootschap, Antwerpen* in 1890. Nicolaas De Jonge was a Dutch reformed preacher working in Flanders, and adapted the New Testament into a language closer the Flemish dialects. [More info here](http://www.biblianeerlandica.be/biografieen/de-jonge-nicolaas/)
+	</longdescription>
+</pkgmetadata>
diff --git a/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild b/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild
new file mode 100644
index 000000000000..84128272a277
--- /dev/null
+++ b/app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.6.0"
+
+inherit sword-module
+
+DESCRIPTION="Het Nieuwe Testament by Nicolaas De Jonge"
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=vlsJoNT"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f5fa8beaf1f8..625e6909482c 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 95589b3e2503..637394956fc1 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,17 +8,13 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
-DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b
-DIST emacs-27.0.91.tar.xz 43730296 BLAKE2B 9ed0f425539cd22b84e3c1e2973d6a66d983e6b6de5fff30c1db2ca3fb1d761cf2c4de566b28dcffff858d032ff996a528e14daaecc45eb71aa07c3f3a6e4a74 SHA512 fcae087c7d153ce45640dc5785e0829e85b14400eec70f833e1f7ee7d3903f1e4adb469d812596fc6e7ff792ccaeda3fde5fa1c37b609ab83e8432d9f63be36a
+DIST emacs-27.1-rc1.tar.xz 43758028 BLAKE2B e1cc285a954aa1de00c4925909f9d027c5edb71aab740cf856e47001a0b0343cbab547819b367e8391814df4f833e39f1624d914ee52381b612e41b9b02c7fb2 SHA512 fba75ee01e3f82e8fedb09f94d2a6edf76fa2e4cf1e135294a86ffa8d8444292c75cccfeb30037c25f76cd5f0c6376145c09550614e7e42ddc934a8656424134
 EBUILD emacs-18.59-r12.ebuild 4461 BLAKE2B 894572f7e472d2f79ffa2baef17602763072c0b4fe20e511208a346dbe8a655e6674be680c96a96a9d1312d84eaed8647d8c194037c990869c954f5791ac4f30 SHA512 c5b153cc299fdb5568301794aea6943cd39be2a7b3dafa5d39c8d3debd6a3a48279592b9bd116f8079335105e691b52a3dfe10f94f8777b4a404af4678088d1a
 EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f76eea114f7e1d1619e884383680bfa2926966664c3a298bdf75dbb85f3b90dfc94b51f1b7c7669978c7e630dabc SHA512 e1ae3906e405d95e724ca3b79655a7e27eb4881d7a5589a7df383caf96a24f26f275f043ce54c0478130a711b0e1d06108c3943613088969f976883ab5fd9e5c
 EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273
 EBUILD emacs-25.3-r6.ebuild 11100 BLAKE2B 18140ddfd34e3434632cb6953a64764df34950024b08f459e57846886b456769d1a0467342ac5bb0797502a589600777aa5d9659d98e7db68f3aec3b8d6db6b9 SHA512 72d7d3cc11214324da56dbb4d2c57750b73bb085feb1e353f5d690066fd0b06e3ecbe617c4778a42078ef45de3745628e9b406bcaa6c4bf1d6ead2f0a19106c6
 EBUILD emacs-26.3-r1.ebuild 11887 BLAKE2B c598a530fcb8c470d8f8d4d3a1106bd8acddb2d03e660be00282fa173d87c68585ca7cf171d64c3d11bdf0cdb5e3ef7e2b54db67fb93af03e66f9575802d5032 SHA512 40e57173380373d8855f6f599d25417dc468da51483109054d1df4b8eea85a53f10e85f958e405d8bf7948bc61e19afa412da7a51755f7ea3c907bd598aa7359
-EBUILD emacs-27.0.50_pre20191223.ebuild 12898 BLAKE2B ebeef6a8ea281e8549fe6eafaeac049e66f24a18c4bc65358afc8a5ea89b8cac9b51d554f4b2e4881ae43a8b41b8bb02bf37a719c03e1b3bd4d0a5740662308b SHA512 89ec7e4c0f2e4ee776e28d8da10666e712b076817a7c34a31f74d9c9173f6ec4a9857016c4c2b6a8b3bace442bd49b8ecfb1814cf49f8479f1bafc4370f15261
-EBUILD emacs-27.0.90.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
-EBUILD emacs-27.0.91.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
 EBUILD emacs-27.0.9999-r1.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe
+EBUILD emacs-27.1_rc1.ebuild 12851 BLAKE2B 74d127ba6cb7ca328d073947af28afb4c8b2cd848cf5cd8103a7c0b0f06188f00ae16691e2cf6e93448d0d6148fe5bfc4f8818994e02b42e662435b4604a26e1 SHA512 f80b006e4d41de89f6ba17b29a4b629181fa116f7ba8c39c675fc687436bce83c3e2a884c4a17409f4e2ff36db23294823c6140c86fa306528507095219f709e
 EBUILD emacs-28.0.9999.ebuild 12871 BLAKE2B 7aa3322befb032b60349d2b5ba2311429b3110428130cd0552bb2397dfd7c89ebad55f8f6f9fc576287c1af162e7d43145393be3e693c27e3fdfad00102e37bf SHA512 11d00e05d8053659dc025755262f46c9d8e4b37aba4492b366f9bda19edc5e9a46932a543410377c9dc6d17a01495b36592bb9f163f5d3fa968aa16e5ba27b03
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
deleted file mode 100644
index b16211b43e36..000000000000
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-dumping=pdumper \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild
deleted file mode 100644
index 6b20eefd9d28..000000000000
--- a/app-editors/emacs/emacs-27.0.90.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-27"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="27-vcs"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	sys-libs/ncurses:0=
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gmp? ( dev-libs/gmp:0= )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	json? ( dev-libs/jansson )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			harfbuzz? ( media-libs/harfbuzz:0= )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="app-eselect/eselect-emacs
-	sys-apps/texinfo
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
-	!app-editors/emacs-vcs:27
-	app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with harfbuzz)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-dumping=pdumper \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gmp libgmp) \
-		$(use_with gpm) \
-		$(use_with json) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-#src_compile() {
-#	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-#	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-#}
-
-src_install() {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use systemd; then
-		insinto /usr/lib/systemd/user
-		sed -e "/^##/d" \
-			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
-			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
-			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
-		assert
-	fi
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${EMACS_SUFFIX} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
-	fi
-
-	local DOC_CONTENTS="You can set the version to be started by
-		/usr/bin/emacs through the Emacs eselect module, which also
-		redirects man and info pages. Therefore, several Emacs versions can
-		be installed at the same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d ${ED}/usr/share/info ]]; then
-		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.0.91.ebuild b/app-editors/emacs/emacs-27.1_rc1.ebuild
similarity index 98%
rename from app-editors/emacs/emacs-27.0.91.ebuild
rename to app-editors/emacs/emacs-27.1_rc1.ebuild
index 6b20eefd9d28..ec0279847418 100644
--- a/app-editors/emacs/emacs-27.0.91.ebuild
+++ b/app-editors/emacs/emacs-27.1_rc1.ebuild
@@ -12,15 +12,14 @@ if [[ ${PV##*.} = 9999 ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
 	S="${EGIT_CHECKOUT_DIR}"
 else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
+	SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
 	FULL_VERSION="${PV%%_*}"
 	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+	[[ ${PV} == *_pre* ]] && S="${WORKDIR}/emacs"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
@@ -146,7 +145,7 @@ src_prepare() {
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
-	AT_M4DIR=m4 eautoreconf
+	#AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 04f05b4efddf..84a3cd265a56 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -5,7 +5,7 @@ DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c
 DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
 DIST nano-5.0.tar.gz 3034734 BLAKE2B 03ea59c97c0e421ed92f588a2e6991f968b2f341761db66fda077ab827d00b9eb13930f08011f0028010e2005bb912ead723928b482a0532e924f85757a75569 SHA512 7e650676a15a185a9695eb49ae5cf441e3d42ae13817a9d3e64cb347c795840712778ac464fd5c578cc6464132206ee06dba52a06a218bcc865485ce3502a4bb
 EBUILD nano-4.6-r1.ebuild 2237 BLAKE2B db4fb753e8949f3049410ac0fb8d34239d1c1e05695a524aa65cb56bed024d81f7144c1bbb6474128a80fb07ea23943e804de96380053450949530554c6e4165 SHA512 de8b6e421684b4f11bd9e913e521bfbc1e6403751a9fa6af74c8ca6d90fbc2ef46d520939004a92c07a716fee66114bc244e8d862c91d823121791f36ee8eb8b
-EBUILD nano-4.9.3.ebuild 2342 BLAKE2B 1380f71b045e85005b55fb02aeb5f2f204c01f800b9f174452c25fadee8df2ecf654a676959af8e79a49830d3325214599483bc0339485e32f4edc8c2b415ec4 SHA512 08eda78ae7eec8c8977b1d563561c53704bc023e39eaa9c4b7377ae12658ef7ef170d44f1028873f97f2a576776380e8f5f3fd14e3b67ed88eb50c21c525d32a
+EBUILD nano-4.9.3.ebuild 2337 BLAKE2B 4df433d82759fd8f8771ab391e292fac3124ee0d195f1e0451d709b830dfe286b738196cf0a718ba41680b5ad367461f91bb518c64f58e92de5f4610d287472b SHA512 de99980c409d97da3d8a285ab63a026c53a4a71482861d2015b33d95a5ece21d15fab9dc126caa2abfc8d2d579e35f1634b003732df2e734f0d2a2aeca19d293
 EBUILD nano-5.0.ebuild 2226 BLAKE2B 83c855ed72868135ce12e7d1f141641e21556071fdf469f08404dc68ca4e9c70cf7664879695480e73e6cea8b297d8a20a4a5c149e93c707666dfe4daf2ed607 SHA512 8d8d12cba3c374af1c1e2484895ecc51df85397e1c6f0fae6fb691907b4373ed24a17876b0582b27f5de27cfaa25f487b55abc710eaf1cba7889fd3e84218225
 EBUILD nano-9999.ebuild 2226 BLAKE2B 83c855ed72868135ce12e7d1f141641e21556071fdf469f08404dc68ca4e9c70cf7664879695480e73e6cea8b297d8a20a4a5c149e93c707666dfe4daf2ed607 SHA512 8d8d12cba3c374af1c1e2484895ecc51df85397e1c6f0fae6fb691907b4373ed24a17876b0582b27f5de27cfaa25f487b55abc710eaf1cba7889fd3e84218225
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 12638bf0a523..99ad346b01fa 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~m68k ~mips ppc ppc64 ~riscv ~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"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 0ba998d468ce..de503beec17f 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
+DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
 EBUILD okteta-0.26.3.ebuild 1771 BLAKE2B 32a6c29bc2f3bdb8cbd607c78c6f74007ec5997d6819ac2b4e6ba687440f501e6985c554dc8d3409783cb96b83d8ee1120fa42f7e0e43f1e2d0ef40baae28fe0 SHA512 e9f070af1cfc2969620dfc79232308b9cd0b4e9675d309cc78f049d0f457f8652f386f10133373f116a9eb655f43aff7372c9e84454805e8469aa7316b35f2fb
+EBUILD okteta-0.26.4.ebuild 1773 BLAKE2B 4f4b11017eb36dadaed81b0fe6dd62dc0d58ffbc36357ef4a3e670f1d4a2807674e04461759e33e58f5cb9fa909e40d1d2d9d4dff6c03d20507db6a9da1436eb SHA512 943ec81b68a0b3f1a540c239922e73998bfade879533842e16c5c8b615ce1b94fb023ba9a4aedc230315257122c3d156234ad0bb8f2cdaf90e9cb12116a1f865
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.4.ebuild b/app-editors/okteta/okteta-0.26.4.ebuild
new file mode 100644
index 000000000000..4f2ba889d3b3
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.okteta
+https://utils.kde.org/projects/okteta/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 handbook? ( FDL-1.2 )"
+SLOT="5"
+IUSE="crypt"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5[scripttools]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	ecm_src_test
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 35c24ab7e2be..bef1a74609c1 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 7c5b9d549d5f..ba3304a4021b 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,4 +1,6 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
+DIST ddskk-16.3.tar.gz 1252772 BLAKE2B 133685fc0587e10c89145eeaf014c8e0d1ce0dad63b9207559030598f521aee00facbca9550753493e579d5acec10e8b36c1499087d1b6c05317754c434b9b69 SHA512 47624690851269ca818bed5cfdfdb21bbbd3152c0a7c64a114ab595a92d2e79600fe738953e6a73a26b0195102eb1e9e03ad4f6bfca1bc4d3e3732bf59aa8a27
 EBUILD ddskk-16.2.ebuild 1491 BLAKE2B 9c128ebe2d7ebf3559085c48ab45ecb72e3b4185e3fcf85506bc519cfcf923959f15d9c8f68faef9e4ef5ab805f3dfffb6c08e40a6838991c0268de899c54905 SHA512 1939dc7bd18d3f3e6d8874e98e27761d6e7aba9b0759ee2dbab0d2807ac3b002d62fb446feed4e96302f957f0ef4d2d62889d57ee81ac56416ec65747b2e5c5b
+EBUILD ddskk-16.3.ebuild 1538 BLAKE2B 13ba8959f15352fc6a5a144c5277f1bcfb6c9e0adf18247137e1cbc0eb18fdefad591f5de243b2b01b2d3ecba941ea30f6b378f61922945dcb42778231463bd1 SHA512 7abb07fb2a797ba4f12ed7def9730851af7719614d4a6c044054c770d0eca59d0c27a43858c9a3898d25b86211756f19a3a63c67f7b6cab0d9cfeead188919b9
 MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.3.ebuild b/app-emacs/ddskk/ddskk-16.3.ebuild
new file mode 100644
index 000000000000..71f0c28fa72f
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-16.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
+NEED_EMACS="24"
+
+inherit elisp ruby-single vcs-snapshot
+
+DESCRIPTION="One Japanese input methods on Emacs"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="https://github.com/skk-dev/${PN}/archive/${P}_Kutomatsunai.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ruby"
+
+DEPEND=""
+RDEPEND="|| (
+		app-i18n/skk-jisyo
+		virtual/skkserv
+	)
+	ruby? ( ${RUBY_DEPS} )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
+	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
+
+	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
+
+	default
+
+	rm -f skk-lookup.el
+	mv {bayesian,tut-code}/*.el .
+}
+
+src_compile() {
+	emake elc info
+
+	emake -C nicola
+}
+
+src_install() {
+	local lispdir=${SITELISP}/${PN}
+	emake install-elc
+	elisp-compile "${ED}"/${lispdir}/skk-setup.el
+	rm -f "${ED}"/${lispdir}/leim-list.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	dodoc ChangeLog* README.md READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
+	doinfo doc/skk.info
+
+	local exts=( nicola tut-code ) d f
+	elisp-install ${PN} nicola/*.{el,elc}
+	if use ruby; then
+		dobin bayesian/bskk
+		exts+=( bayesian )
+	fi
+	for d in ${exts[@]}; do
+		docinto ${d}
+		for f in ${d}/{ChangeLog,README}*; do
+			[[ -s ${f} ]] && dodoc ${f}
+		done
+	done
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e05536745bfe..15b3c902b7a0 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 40fa6b5a2d7e..434dada768be 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,7 @@
-DIST buildah-1.14.5.tar.gz 11023227 BLAKE2B ebd6cecfc6fa4635ae662dddc722a350fd0b9c87c3d4d67f8010d5ea070270da4f4cd5759612b84d55ecd27b90904950b96471d75057bc6b7d45989312ebec8e SHA512 759d2ba26af43d6ff7ee891f88114a0cde6307439f7837343bfa6edba2473805f0f2e584264e8be01b9f0af07b1fd323243af5feeb9535ada4475ce53a980ff6
-DIST buildah-1.14.6.tar.gz 11104320 BLAKE2B fa618e095523e853454170504aa2747d29e8bec16282eb4bdcf9d8ddeccceeb7ad706d0d127dc621ef0840136737b328c31d9b6b2f9bd1b734beb6d24a15bea3 SHA512 869addbd41c115ca92eab30133c76cd0d449184e95f3b64fa57ad84f50834e6f6189bd1a7e4871aba270b96bf69192ff00da7f0e086439c811c5093342ac14d2
+DIST buildah-1.14.10.tar.gz 10660400 BLAKE2B 5ee35cd90d652da8b30a01ae34aa73d68b2c531ac72017be87f6381717e1a59da6a9eccfcbab3b046a2a1a2b1c3e66e404ff6fab85a6d54a55320c6a6a405dca SHA512 5e9e1fd0f2c75b9846c1d457cfec3bf546b7e0683ea27607479c6ef5dacc8fd977ce57a885ef5ba14db0876ee47ffd8d3c54e349fe3375743a8bf70618c2c057
 DIST buildah-1.14.8.tar.gz 10660799 BLAKE2B b32375900c3509b88ae37366f1d2e2b593d0705cabf74c305bf0838f8e22ef9805e37b6bbe1a054d9fc3e48fa5c086fd0524362d570742eec846fb4b079c74d5 SHA512 8cc64d8262ffe3727f4c32051f4f3456ab0b54f221ce6d144a301b732170eb487dc356f4e056c804ca9806172e60920239b62800a0aac2dc5de83cd656ea97f3
-EBUILD buildah-1.14.5.ebuild 1124 BLAKE2B 30c1cbfe0c90d0f93c2ec25cc49cea13503329a65dc92e17da10bc3ef3c926514f09c52c6a9297aa2315365de6c28d219d671ba47e276d12a4a9109348408dc2 SHA512 1eb7b89fe046fe1f02850b3451a9a125a34c4adfc20cbaa3f11053e3ee31c7504850e6519fcb912ced3ea9be9bcff7cc6b98fa2745f26e8720a57eae1b015c3c
-EBUILD buildah-1.14.6.ebuild 1125 BLAKE2B 916ae6de2bdac9991a2b04489cc6f06afa422c12f006c5c460bab00433e4fa3ea346368c5f0a9ffa5db458f84f94ff084ecf3a7ace70e84de2abbd1ab5f97eb5 SHA512 3d85d286096c7e8ab3d123c63d97bff19b536b5a116842f5c57dfae1eef15e6beb42946dfc490012c6b96e909dd94dae602e3efe78babc81cfb40eab0c2cbd39
+DIST buildah-1.15.1.tar.gz 10344892 BLAKE2B e84f8d245536f8864f057f576d92c218420ac975fabfbdc8b6bf591c2ef43494d49fe9095320a07de450f2ea64d046aa4ad680f08be80210e0dce1ffa874a286 SHA512 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be
+EBUILD buildah-1.14.10.ebuild 1127 BLAKE2B b5e1e175571322ed8d5941165f323447e8ca0fbbec96279d28af82629cd1bc813073d67488c029a729eebd69f697f2160b831def2f94ee1c34c071fb10e1dd46 SHA512 1a66b6f0e7cd5f41d782b1e0b6a724bf79955ebe19322f2b7122b172f9909eec41ab74b109b281d1656efb259927d9c3dc5c0b63720eb32191704e314720a5a1
 EBUILD buildah-1.14.8.ebuild 1127 BLAKE2B 741f08120fa2bbcc63bf3aa0c9bf0902fcee9793801e844e1b1dbed1a4455bf9a9557ac9691e0a1446bbcaaa2d0034f7d01ee23c05a9d3dc8e0d5690b1e3b7e0 SHA512 5fa88e3d2f46673d76ebacb9afc2db86129c6a8a0bce7f9e79d31cb68594802cab1389ee9559835a73d480dc693fbcd0cdafd27a8bf407063ba2a87746a78091
+EBUILD buildah-1.15.1.ebuild 1129 BLAKE2B 1aa6fb0deaa96dece4d116db4cbf7724edb4e138e3918d0c1d4a6a6771a1409f5bfce8ea4b09897e6c12e14dad3ea835aa2a2d78eb603232bfaab798655fcc84 SHA512 c75c60019d75cdc954ba4105ef905d165a5dc654c82aca8fe6b3b108a4262a3b342dd18aabeb9269aeb9089a8f2550b4eecc226af4535ebb9a5c6c2972c0b2d6
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.5.ebuild b/app-emulation/buildah/buildah-1.14.10.ebuild
similarity index 96%
rename from app-emulation/buildah/buildah-1.14.5.ebuild
rename to app-emulation/buildah/buildah-1.14.10.ebuild
index 079c23170d2a..7439b8eff82a 100644
--- a/app-emulation/buildah/buildah-1.14.5.ebuild
+++ b/app-emulation/buildah/buildah-1.14.10.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT=5247a1f
+GIT_COMMIT=42ef63f0
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -21,7 +21,7 @@ RDEPEND="app-crypt/gpgme:=
 	sys-libs/libseccomp:=
 	selinux? ( sys-libs/libselinux:= )"
 DEPEND="${RDEPEND}"
-RESTRICT="test"
+RESTRICT+=" test"
 
 src_prepare() {
 	default
diff --git a/app-emulation/buildah/buildah-1.14.6.ebuild b/app-emulation/buildah/buildah-1.15.1.ebuild
similarity index 96%
rename from app-emulation/buildah/buildah-1.14.6.ebuild
rename to app-emulation/buildah/buildah-1.15.1.ebuild
index fe2402a5756a..dc0c95b69733 100644
--- a/app-emulation/buildah/buildah-1.14.6.ebuild
+++ b/app-emulation/buildah/buildah-1.15.1.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="selinux"
 EGIT_COMMIT="v${PV}"
-GIT_COMMIT=09cce629
+GIT_COMMIT=c967e88ef6
 SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RDEPEND="app-crypt/gpgme:=
 	app-emulation/skopeo
@@ -21,7 +21,7 @@ RDEPEND="app-crypt/gpgme:=
 	sys-libs/libseccomp:=
 	selinux? ( sys-libs/libselinux:= )"
 DEPEND="${RDEPEND}"
-RESTRICT="test"
+RESTRICT+=" test"
 
 src_prepare() {
 	default
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 4f4ba90f0369..d6822f54f55f 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,5 @@
+DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
 DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02
+EBUILD docker-19.03.12.ebuild 8404 BLAKE2B 592424738f7faa2033904c135b9c2710208262414e677e94b0b45391ddbfb2430d46be641a703bc23645c0635d47685a5e3704460e971ad419467386fa460c9e SHA512 5121e71b234370ce920960e1e0c09fb21074d69518a3e87fd11d636e8f3aba0c2a47d420ccce580b0802d0eef0147c9c63d2fa51717cb1a95f7f572ab9eb7f3d
 EBUILD docker-19.03.8.ebuild 8401 BLAKE2B 45402601322a6703605ea3f638585fe605cdcfc90b525bec9284bbb2af59e1b00d1e7657291e6b0f8f20e5bd1602d9df357c6193692a7ebc7fbaabb013fa1feb SHA512 cba4ff2acab7f8ea0c07580a392e8ba39cb0108459207af9feb68bef8674ee3efbfe7cdd9aad866d26f322453c70b1c72ff273adb4c10e83ee8d6819c90f514d
 MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
diff --git a/app-emulation/docker/docker-19.03.12.ebuild b/app-emulation/docker/docker-19.03.12.ebuild
new file mode 100644
index 000000000000..c0cea011dfbf
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.12.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT=48a66213fe
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+COMMON_DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${COMMON_DEPEND}
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.13
+	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20191011
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 1c46ffc67f55..5e2742f53186 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -6,10 +6,12 @@ DIST libpod-2.0.0.tar.gz 9126598 BLAKE2B 3c2d18a921b88ef235b14f069e7571f83b1add3
 DIST libpod-2.0.1.tar.gz 9136153 BLAKE2B 4c60dc047ae7fd6a2918589a30f6dc94c13251ed0002e77919adfb9dbe0a3c7b14e40e204c5879273589673a573aa318a3d5b972c32236143e166cb96a7cc3c8 SHA512 e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730
 DIST podman-2.0.2.tar.gz 9192157 BLAKE2B b8635ea5b166082be03a041f74d6c7a5c8bed04131b039ba505f87240a1a2e4503a3dc14c037eeb41955ff7f949dc0978571ec63f011adb9e5a6efa1157b6bce SHA512 5bcdca28021c8b36b5689e69c00232ca20404af0903ea632cea350ecf6b6eed091260f1b8fea8fe6d06caa7a475ba87ef4f3e86e83807ffdd187f9ccc41cb194
 DIST podman-2.0.3.tar.gz 9303421 BLAKE2B c0882c7fff60f33d1dc6752120a36ce35ce321c661ec29ae940f392b5ef9fb6176fea556a89ca9823b4981997d6e61545531d39d95b31d23602b0d3e1a78870a SHA512 ee6d4f4735196fc07e03e9c1e99aa62650d9651bd5f24657398d42b3f2ebf59240a49fecfbf71a3d90636ea44c243cc4f7504c43d8f48e76ee504b3d10762240
+DIST podman-2.0.4.tar.gz 9305631 BLAKE2B a6a5760886d112b6cd69625137ec0aa9e368e8ff09f114123ff0b17ad2ef5b26b5eb645a5bbabc30a7cb900d7844587e0051969fefba9d5e8b5652a571857e09 SHA512 39313615b4c0befec3a073b7bf4a689208e39cb7bcba81f6d8982e188402c457cbe4835a128274761e55ab1272a780f9747caa07746fe62af7a568eebc96ad6a
 EBUILD libpod-1.8.2.ebuild 3881 BLAKE2B 4555be189f9d335b03b6eb074155c039d604395b5ae0772cf3da1502b6a626266c80b9a2ec997dc4c13b31bdfb9f30877da749a0810ec2beac594ee4c0502f1f SHA512 001f631f58a2e0d11f07c5739ed7e2a3c36b0de5dfbe0637e3cb06d31ba68e730de59e05e0e155c92702f39bcd4da05d43e795c1030b800d50198158fd06bed4
 EBUILD libpod-1.9.3.ebuild 3920 BLAKE2B d65bd39116779af1c238061b5d8696615a789c2a5874a0aec558d67d5f760be6785c84be56f75a310cd312078db14b937a4695b7432a50b1236296af4155600b SHA512 e9f823ad0f4a513e760ce0108af2621a1f9f029a603cc87be4f743e99cde57c44bd28242c89f3702d2ddef3af65cfe51ecce5ea552e5320f8bd27f34c1c6777a
 EBUILD libpod-2.0.0.ebuild 4335 BLAKE2B 7d9c3f7bbbc09135dfb63034d24ffd7b23b06a107a5d00967ce4a1ec978a7d6e647e2fac818289ca5cff060f46d93075e7d8dc01762e4a0a616885d668ccad4c SHA512 cf72840fde4a723ccb39573fb6ffc460195c7fe8a056241003de385dda9e3a48a0af4e9d8130d58c70614f1d7ea84fbe5e7d1ef3a3329f725d6464688e64796c
 EBUILD libpod-2.0.1.ebuild 4335 BLAKE2B 3d031ce218cd8b0f258c3caaab69e6c337f0a54e8c4507e85cd8fe4d77a2d95ed3ab4047850584a5a0a095c82755d67a9965be93d8c0978f11b3a95e636cec3d SHA512 182349484588aa6c169fee9af2d615b7102d9fc7deae0e9cf0ebffbf853b3e7c99b82d6bf3e4407cb746daf067205263dbed6211f753b068e696622878064979
 EBUILD libpod-2.0.2.ebuild 4393 BLAKE2B dbf3f0a47c20044235e309e7f3e3743254ff8683a739e4500fcbec6f5e1182d9b39e93e7120b15ed7e8906e758d7646f97b1cca83b7e835a7e6358d24e3a9ac0 SHA512 bcdfb9b4705bcdced7aa9ea86060132f04f7b57121a20ea8c9b5f351556895f96f08f9ce421b360c3edbda1114c9f32a62c434e88c99d4bd62e710c84af63158
 EBUILD libpod-2.0.3.ebuild 4393 BLAKE2B 65b396fbc63951d84fcbe07ce2cee59e3a7c636c388c20e5e3f25d488e62fadd56263bcc6739c5f8ecc5cc41c117dbf26fcc8ed691e5f00935896a5f8f58ab40 SHA512 ececd412dae05d587b9a4f96663771f02c78df29740f1b9e3adbcfa9056db6830c8abc73435d67907c0e05bbb865dcd744fc36ae2d1c14cf024edbc4d3c75b2f
+EBUILD libpod-2.0.4.ebuild 4393 BLAKE2B 6456bfc2386051d4162a9f5c8a53404efd29ea8b0b497a7f19e2f5ffc99f1970d7055db67d0970f703e0fd22a88a8b9e13f535570c13f82b3e7dfedee9f0cfc3 SHA512 7d52f47fcee8026cdb770d39a9eff26c89d77df603b968fcaa44ac01026d48c0d5c6b09737e27dedf721ba871e147fff461e18a13716222faee296b83d4b17a4
 MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646
diff --git a/app-emulation/libpod/libpod-2.0.4.ebuild b/app-emulation/libpod/libpod-2.0.4.ebuild
new file mode 100644
index 000000000000..a5572a93cf7d
--- /dev/null
+++ b/app-emulation/libpod/libpod-2.0.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="cab27868766a3b01ac14ff46180af8644c41d1cd"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs +fuse +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	>=net-misc/cni-plugins-0.8.6
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	fuse? ( sys-fs/fuse-overlayfs )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	local makefile_sed_args=(
+		-e '/^GIT_.*/d'
+		-e 's/$(GO) build/$(GO) build -v -work -x/'
+		-e 's/^\(install:.*\) install\.python$/\1/'
+		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+	)
+
+	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+	sed "${makefile_sed_args[@]}" -i Makefile || die
+
+	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+		-i hack/get_release_info.sh || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	# Avoid this error when generating pkg/varlink/iopodman.go:
+	# cannot find package "github.com/varlink/go/varlink/idl"
+	mkdir -p _output || die
+	ln -snf ../vendor _output/src || die
+	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+	rm _output/src || die
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins seccomp.json
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index d84233ffb1c8..94a0cf09ffd9 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index c8c86566d715..f30c5029fc50 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,6 +1,3 @@
-DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
 DIST eselect-vi-1.2.tar.gz 2078 BLAKE2B 0f78afe201d9db72de005e035fd044435faf76b0027ce570cad09f3b4f0f497631f57107222de5e649c8badc0cbc3172edd1f1600e5b7bee8ba6f78b2ae9277a SHA512 77ec5281a25156d4a6c4b35fb154aa5837e4d2335637ecdb66a75984419439526f2215abe39a4d08e68d8dd3e337f47947f5a8fbf89ae7ecca8631e7dbf50dc5
-EBUILD eselect-vi-1.1.9-r1.ebuild 622 BLAKE2B d945046cf6f7d627e8231a8fac1fabeb824f4c397826064b726a4bdb851aeb098fdaca0c868d84b514c02b9a135953ddcbe26e7664e58daf09025bc6b5df0f02 SHA512 f53469343836844b128baeb82e22a8f99b66a73ddd784fd5343070c4b583f86b928375b77cbfba360f766ab59cdac0d792c198353204ecc3cff05d0fdb817e24
-EBUILD eselect-vi-1.1.9.ebuild 622 BLAKE2B 5184466895f5425fc3e8e1b3fa27f3e4dd9e9b612d2268cbcd77158cce20b538511dc52285f6e4723e911990483d6b95710faf04c29f9deaf27d0e1bb548052f SHA512 5b493bbe4ba4ff59d31ebf2772ea2b81c7971a48592d538696f0794077442fb78996bcb9cca2956dc6dd045e226ea34f3426639e84e92be290d710b1e27971db
-EBUILD eselect-vi-1.2.ebuild 635 BLAKE2B 19f2f61506723e10c0b2b77fe51469099a7e6a6bfc1b714b84f909e3d5f62e1312d3c3ea17eb21d8e56f09a946205ac5cc8cc8e0b0ccda554e100cec5a0ae5b9 SHA512 1a3920fb7a9754ab93726d5f0199ed35b7db2facfd63ab381235f9d2450391e1b26944cd813fc7d4e607179ce9d284262251e80aac8b7ebd82b2e8a8319b96b1
+EBUILD eselect-vi-1.2.ebuild 634 BLAKE2B 18ad8a2475ff84c73a33ff672e3f3d384689cb0f7ec1d7f3057bad2dee7a0b1d6c1609e4992825e98a2451b5a024029c3d9819270611c85a17e707fe7e9821e3 SHA512 15fd1a7083ae100255e814f0bd73a0c5a24c6efb603ed23fd5f136fc5a73a1f17a79fec25b58d9d833be357439530764703f8f12853de2eaef5aa64effc1e9f3
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
deleted file mode 100644
index 63b066d61b92..000000000000
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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-admin/eselect-1.0.6"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
diff --git a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
index b2b7430a981f..53174634927e 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 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"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 23fdb1badc22..129bc952d143 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-cangjie/Manifest b/app-i18n/ibus-cangjie/Manifest
index a35a0c2f784d..3b8b0682ea23 100644
--- a/app-i18n/ibus-cangjie/Manifest
+++ b/app-i18n/ibus-cangjie/Manifest
@@ -1,3 +1,4 @@
+AUX ibus-cangjie-2.4-metadata.patch 2227 BLAKE2B 6997c3653224b15722cb17b7f33bb101f18dc443062a793f7c8fc6288c9dfd917c7b8e00a3ba2dc0673041195dd43468cf441edbd89c00615d0691a6f2268e33 SHA512 07cf9d87b0c022f36a8f9c9c59a1ade144a4d1e7804bd95579ae2b4186a7942feeb8c77be3a1e41229c3e56e5c28a603e316e28e0d8609a8c94351676216df8e
 DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
-EBUILD ibus-cangjie-2.4-r1.ebuild 907 BLAKE2B 88eb239b187d1df15a1214db7ebbca12e14b4830deeebf02b893a085de98c8909fd32a268702c92d28061ff3ef86c3a5790ad3b8ab795452c4aaf9357671ffbe SHA512 9649b8edb49766db2e1794444c36351175b28838cf15c11241076a85f0734190569092b794a2e83278220f2af2b6cc036a8711c2770fa11f13996ba4d434bfcd
+EBUILD ibus-cangjie-2.4-r2.ebuild 1113 BLAKE2B 5f43c01dc419e991fc65be4664ac940ad32b61e3dc1496879dd3835048b3c6bc76ccde72620a7296bf178acaea86c5852e505f0996fe42bd52da0be1eda4889e SHA512 c8827da3c930cfaa6c86986ed65e7ee8fe0c4824014971b453caf56610fa0e6ff6dad0215956e0e202843737bdddb83641834af732fcc3efb86ccc1ae208ead1
 MISC metadata.xml 321 BLAKE2B f6906dfe6babd501643f94145258a76d52aabdf44274f8989d88b513157d178a3e564089e97b694371d85b750214d359213ed7ab00dab78c6262bc23314342ef SHA512 5681abe463968d6ac39a94d5b30428be7bcb9fa5ebb2318223ca9ab4261b303fa37eecb1d506f7131609856eba12deddccf7c8cd4d01954f5bd71a4e327551e7
diff --git a/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch b/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch
new file mode 100644
index 000000000000..acc2b0ca9e88
--- /dev/null
+++ b/app-i18n/ibus-cangjie/files/ibus-cangjie-2.4-metadata.patch
@@ -0,0 +1,61 @@
+https://github.com/Cangjians/ibus-cangjie/commit/378f57b9126eb2af7660c45073107ba8f1dac3f8
+
+Author: Boyuan Yang <byang@debian.org>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -28,7 +28,7 @@ ibus_cangjie_datadir = $(pkgdatadir)
+ @INTLTOOL_XML_RULE@
+ appdata_in_files = data/cangjie.appdata.xml.in data/quick.appdata.xml.in
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ 
+ component_in_in_files = data/cangjie.xml.in.in data/quick.xml.in.in
+ component_DATA = $(component_in_in_files:.xml.in.in=.xml)
+--- a/data/cangjie.appdata.xml.in
++++ b/data/cangjie.appdata.xml.in
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="inputmethod">cangjie.xml</id>
+-  <licence>CC0</licence>
++<component type="inputmethod">
++  <id>cangjie.xml</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <_name>Cangjie</_name>
+   <_summary>Cangjie input method</_summary>
+   <description>
+@@ -12,6 +12,6 @@
+        experience for people of the SAR by default, but provide useful options
+        for others.</_p>
+   </description>
+-  <url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
+-  <updatecontact>hklug@googlegroups.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@googlegroups.com</update_contact>
++</component>
+--- a/data/quick.appdata.xml.in
++++ b/data/quick.appdata.xml.in
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="inputmethod">quick.xml</id>
+-  <licence>CC0</licence>
++<component type="inputmethod">
++  <id>quick.xml</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <_name>Quick</_name>
+   <_summary>Quick input method</_summary>
+   <description>
+@@ -13,6 +13,6 @@
+        experience for people of the SAR by default, but provide useful options
+        for others.</_p>
+   </description>
+-  <url type="homepage">http://cangjians.github.io/ibus-cangjie</url>
+-  <updatecontact>hklug@googlegroups.com</updatecontact>
+-</application>
++  <url type="homepage">https://cangjians.github.io/projects/ibus-cangjie/</url>
++  <update_contact>hklug@googlegroups.com</update_contact>
++</component>
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
similarity index 67%
rename from app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
rename to app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index b217f0feaf8c..b5215cf73eb1 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-r1
+inherit autotools gnome2-utils python-r1 xdg
 
 DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
 HOMEPAGE="http://cangjians.github.io/"
@@ -21,10 +21,17 @@ RDEPEND="${PYTHON_DEPS}
 	app-i18n/libcangjie
 	dev-python/cangjie[${PYTHON_USEDEP}]
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}"/${P}-metadata.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	python_foreach_impl default
 }
@@ -37,10 +44,17 @@ src_install() {
 	python_foreach_impl default
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 422d0e0808aa..4a2c1ed849e2 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.8.3.tar.gz 8184044 BLAKE2B 06b7bc3c39f8c135d5e6d2c90ceaa2df8c38041cb4cc7d583cc335bb3bbdbf4915a6bcb0fff80bbaae797e8bda74bed26077ab4739a8f9584ecfaade833eefbb SHA512 18cee36b5f5c3d6da1cb455e785317c0e2b9826e49e3b2655f4f7a3fce4bdd279ff24614083559996031876702879530799a709e196dc5d68345f0d942972dff
 DIST ibus-typing-booster-2.9.0.tar.gz 8191076 BLAKE2B 4b0e53679b907fce56361c60aed2d50f0ac3bef422f9c56b4b5ca8733734c0341f90dfbcf2a9db747a801d999a49198de2b091badf8efe141d22fddb9b35ec6c SHA512 33e0c53e3f16e312eee7db2395d0a5506150e60a47882a7531c9d082e0ca405aabd922b4774a507399d31f38feed78fb87a09efc5550f08dd3794703f1fab235
-EBUILD ibus-typing-booster-2.8.3.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+DIST ibus-typing-booster-2.9.4.tar.gz 8222228 BLAKE2B 8ba79ceaff6cd5ce37d093b08438a22ffb7b1295bba6d0b3af141b5804e89d04807d14fa5c5ce959ff728d76fcc5e60c0a51f113baa172710d59866733bd9741 SHA512 9c323301deccec0904cb2a2e34015ef11885ecd635ddb99afc6811a7f684dca448a026301155ae26fe0a38c00ca0a4d714ff933c39a60e4299434cfbca455d58
 EBUILD ibus-typing-booster-2.9.0.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+EBUILD ibus-typing-booster-2.9.4.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.4.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.4.ebuild
diff --git a/app-i18n/libcangjie/Manifest b/app-i18n/libcangjie/Manifest
index 0727d4c11c33..4b6e8e9567ef 100644
--- a/app-i18n/libcangjie/Manifest
+++ b/app-i18n/libcangjie/Manifest
@@ -1,3 +1,3 @@
 DIST libcangjie-1.3.tar.xz 575240 BLAKE2B c7e3129a6dd9690223e46f20a7bf06148ed279880461faf031a6542a09e0b21f6740767a8e6fd43acb79175deef437c385df3448e672ebfb0b9f72701afb66a3 SHA512 216ad965cb265d700cc94e6b7892dd9a7d814eba364b7700870b7e704d17d8dc75be4c7af0a7a7fc0088a32e389e62822a05d089f1df714c5ffd347ece8b9f35
-EBUILD libcangjie-1.3.ebuild 404 BLAKE2B 9f7d51a9942333cb773d3cc67e8652a01fb3c1fc0947e850448b5198819bbe161e1175cc0fed7c380672ed794b6b26fe1a5e4e5928ba29dfcde8ade1adc60e60 SHA512 750dd521d096394e77482838b89644bd8beb41a6923342c5c6d0da5b0539e403387884be20e99edb1a92d8668d7aca417dde9ad5df15b0dfafc44da282f26296
+EBUILD libcangjie-1.3.ebuild 401 BLAKE2B 15ae5ef6ac8e957b0cb75b54ca8f00596fe8cbd947250e2988cf0dd78ba1fd0d8abc22ce57a9ae98509d17df500e00f2f3dfd9956db5e77812f831b97a70e136 SHA512 7f8b375d9f3eec36119859025edf068af864328e034bcaf7876a027b3dd935963ad0e9c7cf94e0bbea846892f5aacb0314bb93984c7266ddefc61017ea535b53
 MISC metadata.xml 319 BLAKE2B 8661ade14e715e08e8ba0ea03a1069aec4a36ca5e463364cf62f476310bec5232b4df140995a664b0906a8906a35cf9128f78dd0bf323a0813e4cc5165f56671 SHA512 872c4521b24942fbec5b0f459dca3c15339b5c5d4ccc3236edf09412b506454bb5f030aa3229fa4150132e1f9620109d8a204cf3d7038df001e20e0e75d98ee8
diff --git a/app-i18n/libcangjie/libcangjie-1.3.ebuild b/app-i18n/libcangjie/libcangjie-1.3.ebuild
index e7a4e34570b7..eb518ce7b45b 100644
--- a/app-i18n/libcangjie/libcangjie-1.3.ebuild
+++ b/app-i18n/libcangjie/libcangjie-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Library implementing the Cangjie input method"
 HOMEPAGE="http://cangjians.github.io/"
diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
index 6bc36079f5c6..d7c9716eb9a6 100644
--- a/app-i18n/yaskkserv/Manifest
+++ b/app-i18n/yaskkserv/Manifest
@@ -2,8 +2,6 @@ AUX yaskkserv-gentoo.patch 5013 BLAKE2B 5eed1d31e9ded20e2736747afdf7b646daf91825
 AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2ca04bac2dbd034d1a5847476b68844bbd819f6818b8b1a07c52404548d417a8db30737ca7f235eb2 SHA512 dd9c906937814a1e59d92d80427e4ba97b2ff8e0a3d26dc457b882693de30ad5db5aa7941b948f876d7ef90b402bd4c42142eac3caca29f6976197463597a835
 AUX yaskkserv.initd 341 BLAKE2B 1e26304d24ecb6a931936ff06d9f24bb92b4aa01a3ea7d5db0ec7cd12c48c062f5ce664624b51592d87bb971cb82855fbc2220ca82cd6d0f4d55172e7ba2b0f5 SHA512 2fd63604283c811c7f6fe192e3d8f2b5b3542106b54d39707aa8d6116328634ae43421d6a620fcd1555cdbd53985b2444a381bc32e071cac7e040f6a337a3d8e
 AUX yaskkserv.service 277 BLAKE2B 7755728e443ceccdd359864bea9e9e25926c860f13fb3acbecebfdedd919db7fd65ecc1e922f662dc676b2aa90b325a7aaed049abcae9291602f0bb5097b0015 SHA512 8ff4aa6ec41c3df17f560de157a60cd3bf3fcc03a2613c603d533f2891207b7001e2469dd3e9ac8c8cfc7ab5909978467922906e22ba4b4635627b234008ce32
-DIST yaskkserv-1.1.0.tar.xz 75108 BLAKE2B ac567d4715d1767f0690462de934768335eafe4a61010534c16b430876f81ce43ac175dcc0a2546af996dd0bef8fd4c744b475985365abe3d571a4ed3f1c3a4c SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000
 DIST yaskkserv-1.1.1.tar.xz 75136 BLAKE2B b5a26e7d12951d9256e050d543338a48a61e9b6883a0866e4f7a2d367783a5757a5a12cdd810a87e84ade5bfebdc9c24eb093c09081e1d9099ce848d435eb45e SHA512 5f421ef684011aed716e929b90ab98fb1703abe707928847d79a34815750d59df59f4dec8bef6e8ce399340aedb32688d6dd8a5d02ba9372a935ec8f1adffc29
-EBUILD yaskkserv-1.1.0.ebuild 1579 BLAKE2B 7e490c06545e15ed6884d9b4f43eeb02e4445a5cf2728ad94a90afac8b4aeccd2b4e577f1fc6cbe10db81bbf6db51f2e68cfc6676ce5d10d05ead6e27feb2124 SHA512 6e3ae4f95f14765307ec861065d7e6f818b09f812b7a437ead85fe12f91a592f923460c963578e351214f07aa01e5d79b3c6fb53b4fb5fb2a221566239342600
-EBUILD yaskkserv-1.1.1.ebuild 1581 BLAKE2B 2e86f01a8244d264e941558858d017530d1474419246a9450429878a86b60c4e2c3c132c0a2e2c7fc916431e91a7ef66c655d29803ab5d39b20235c19f184cc9 SHA512 86c2ffe07cbb754059744700670034b543cabf01c67d8fbf0dd1847c253703b611a70da184b2163ee62efbf3ab8667b651029286354cab2a2f048bece0286251
+EBUILD yaskkserv-1.1.1.ebuild 1579 BLAKE2B 0fcaf8d05bcd0ae3fb9807c23f9db9c429fe96e5fb0f56db84649ebc443120e219e99a60574c47008a8f4e77d5b53bb8ee4644b632591dc53a55632cd0fbad7f SHA512 098b2396e1598d0f5cef00a4bc442de517f35edc3a2e0ec6bba45192babe50dd8ba7165c9f68681e5116d643fdc2ebee47bdec6040c6473d39bbffeae37be3a2
 MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
deleted file mode 100644
index 2724f1e528e5..000000000000
--- a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Yet Another SKK server"
-HOMEPAGE="http://umiushi.org/~wac/yaskkserv/"
-SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnutls libressl systemd"
-
-RDEPEND="app-i18n/skk-jisyo
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( virtual/udev[systemd] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-HTML_DOCS=( documentation/. )
-
-src_configure() {
-	econf \
-		$(use_enable gnutls) \
-		$(use_enable systemd) \
-		--compiler="${tc_getCXX}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_all
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit examples/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-yaskkserv_update() {
-	local f
-	for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
-		case ${f} in
-		*.cdb)
-			;;
-		*.${PN})
-			[[ -f ${f%.*} ]] || rm -f "${f}"
-			;;
-		*)
-			[[ ${f} -nt ${f}.${PN} ]] && ${PN}_make_dictionary "${f}" "${f}.${PN}"
-			;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	yaskkserv_update
-
-	elog "You need to run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog "after updating app-i18n/skk-jisyo from next time."
-}
-
-pkg_postrm() {
-	rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
-	rmdir "${ROOT}"/usr/share/skk 2>/dev/null
-}
-
-pkg_config() {
-	yaskkserv_update
-}
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
index 8faf1afe8655..aa86f7b65fdc 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.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"
@@ -11,7 +11,7 @@ SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls libressl systemd"
 
 RDEPEND="app-i18n/skk-jisyo
@@ -31,7 +31,7 @@ src_configure() {
 	econf \
 		$(use_enable gnutls) \
 		$(use_enable systemd) \
-		--compiler="${tc_getCXX}"
+		--compiler="${tc-getCXX}"
 }
 
 src_install() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ca81c37784db..fee7305e5a6d 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
index 6bfce9b0d14d..4bf0e089ad76 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1,5 +1,3 @@
-DIST evemu-2.6.0.tar.xz 507032 BLAKE2B 189507f984e2ebfdf9ff7474d5854ed02f29cd2105684700e1cc2c5ae3c1e888bebd7e8e04e3a5003506bb9571d61785712d08fd90d6e828f2ba5e2ea763a064 SHA512 8dd3be18abc6e36a79b91e6099116048e4fd45a96531a5c2773c84618d6ba7089ee8734b51b9309462c393dc7c3a83d87438bcbdcd5876803165a4ea439aff83
 DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
-EBUILD evemu-2.6.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
 EBUILD evemu-2.7.0.ebuild 1025 BLAKE2B 87376eb6d0054d4388b5a14dabd889bf45e8229442440fa3afeb25628a7a09ba2b565c0d5b08a2ad5ba27d5ee69fd8603668fa72794bdb31efed3cd709fd3bf6 SHA512 fac7eb84ca96af58db527d6b9c99b764caf2e76ba59480c755f3a17ba4630bc3cb44a5f8f4cca23416f31ff3e45bb0b48b4d1117756f5d23bef5ad81ea9536d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/evemu/evemu-2.6.0.ebuild b/app-misc/evemu/evemu-2.6.0.ebuild
deleted file mode 100644
index 8ac8d69567ec..000000000000
--- a/app-misc/evemu/evemu-2.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
-HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/libevdev-1.2.99.902"
-DEPEND="app-arch/xz-utils
-	${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable python python-bindings)
-}
-
-src_test() {
-	if use python ; then
-		if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
-			ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
-		else
-			emake check
-		fi
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index fb03a5e47d62..e16f1df8a50f 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -4,5 +4,5 @@ AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1cc
 AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
 EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
-EBUILD golly-3.3-r3.ebuild 1357 BLAKE2B b54590a3c3a6102149a4981b091a4369999ee93980fca1ea2d21e5ade7edb2762db935c542734493e1e21fca30594617c0985e8b1cf6bcda917c2baaf4baa9d2 SHA512 9b970c06e4fa0bdcb65de218bf4c4778e63ab2dfa4dd7efaa923063a64daf42c580c0984cb68e451cfc0672b5439d2d8943feabdc00d7c0e0c49d1f2a9fb007c
+EBUILD golly-3.3-r3.ebuild 1351 BLAKE2B e176f0a5c1600a94db150e21898eae88860238ad0772e4726c49e276d76f33e228651628c9ff5aad85d7336054ee6c241d1a4fc5a1a1e0682eb6e0979b68cbc9 SHA512 1b92334aefb1dec07a49a96df2491a391459840b2ce28f0fcccd8d5e215c7142c706dea95c6c5c39341ab446a814ecd931bc9621657b125176a31b10b32d46ad
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3-r3.ebuild b/app-misc/golly/golly-3.3-r3.ebuild
index 10240aa63d7d..f499453a8339 100644
--- a/app-misc/golly/golly-3.3-r3.ebuild
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools desktop python-single-r1 wxwidgets xdg-utils
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index cf7f142d595b..ada02be9fa5f 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +1,3 @@
 DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
-EBUILD pax-utils-1.2.6.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
+EBUILD pax-utils-1.2.6.ebuild 1745 BLAKE2B 3382b5d2f4881fa869b077efba0a2dc54895db721237445cc64e9d75a3648ebc39cdebb4fb81383f52c3762c7e1a8fe43cbfb44bda605ff456160958f715ba7e SHA512 1f7e7a13ede8a40013d1b4d777d5a65e361937fa2a79ed1ad79352e43c1a51dc5f3792fa739691e16d9d42dd78f7998723019877e491adcba6b30c530e029f7e
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index 00767ccb7d09..c4762dabcb79 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit eutils python-single-r1 toolchain-funcs unpacker
+inherit eutils python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
@@ -25,10 +25,11 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 		')
 	)
 	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	caps? ( virtual/pkgconfig )
 	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 _emake() {
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 115cbceb42b9..1497031bfb4f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -5,6 +5,6 @@ DIST tmux-3.1b.tar.gz 561152 BLAKE2B f5ff0c68999f9d82c26ab8c781b9f2bab5650157359
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-2.9a.ebuild 2199 BLAKE2B 39a72e6d5e23a9f58a86ac6116a4576b0e9c89be8422c63bc0c3e8a0a7b9ee9d373a58e0a234eff7d03537bcebf41cf060145126aaa7c41b4d7bf6e215ca20d5 SHA512 02d96e880b2d5c2bfb9003a2e3120f7a5c349e7b65f97f76612b5a7469e4cbe26696770e04e5a8e5cde25038bb356e3793de11e1fcaf3ae21e124c138bed8cff
 EBUILD tmux-3.0a.ebuild 2218 BLAKE2B f0b7f6f6fcbba2548ccb42775f35d9f59b2bbb07a1fd004e83383970fadca0ae61859e24d2fcd11de8995dedc4fff2d54dbafa75bdc8d0a30f5572d6ecbaa7db SHA512 e275057fc5ee6f6ac4923b8cf95f7c4c861a2488153efedab6996f6f19b63ab890b58c9db1e403f2bd2893c6e41773413152543567d8c8ffd1d0e5fadd057b0a
-EBUILD tmux-3.1b.ebuild 2212 BLAKE2B a5d80e9a9b25c6a77d5b5cc047c51d61d581e20a9ff35cbc685063e118d34f95489f4d198c101d4149c451976b07024df64cc5acd64cd1f1dab0609cd6be48fe SHA512 8d4bd08e085415a53a58ebbc97827d3da36cfdb58b63f3b95849d85272dc0086138023def4b6158d60dec212dcf26d7fa8925cc3f32700151fefd2b00bf24f13
+EBUILD tmux-3.1b.ebuild 2211 BLAKE2B ed7055afd1b6fa514423a85813b8c026a84fab273496c731a50b6740c123132d68a4d214bfcaf228039613380afce99706428f719bb01e8422f63aa9635e68f6 SHA512 2db0ca70a9623680a69d33c88109caa364c7613c79b3ad3629fa5b5336256b6276bf97b4609323b815bc54bb5a77526ad8b68ce301106469a1d5156bf376f0ce
 EBUILD tmux-9999.ebuild 2227 BLAKE2B 415fec09c9e35b9301869c0bbcd75f0b68f8290e0d513478f6935dc332e35ac8e8557aa3247c84b2fb0dc9942db1fb9eba060f5be48442fba44c5c0f79685744 SHA512 f4024e103a77e20e952e4622e4ca8940d43d72f9d324fd7ca31e00826c23a03e8a8ce07f0552dca8031c8bab5875827d656159b7c6fe7f097508863f4172e29f
 MISC metadata.xml 816 BLAKE2B 57b1d27728b6fb3557e53a27bcd0f116fdcfe88175f3ceee0064beaeb14568852b15275051cd6ec8ea5cc3ce9efa7e1f084d74791b60eab12a5e6c835321deec SHA512 d459641a31d19297ef85b8dddcb487221eebd25e4f3d8d0e88c7c394654e9b60e58a60433c21b32ff24226f5c4d16e9e059b5af6330bd0698367019f0740e2e8
diff --git a/app-misc/tmux/tmux-3.1b.ebuild b/app-misc/tmux/tmux-3.1b.ebuild
index 27e6a1e95794..7fa6ae4bb786 100644
--- a/app-misc/tmux/tmux-3.1b.ebuild
+++ b/app-misc/tmux/tmux-3.1b.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	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"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e72faf3a52f0..389eb5be8496 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 86621e8c2bc6..352a8781e00f 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,5 +2,5 @@ AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a
 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 EBUILD lyx-2.3.3.ebuild 4096 BLAKE2B 2854d008f01580d04ba6bfce00cd92eab9b69795e3d3627c8c763f545a04343525e3b37bf2f11fda31f7f0ff7a894e1edbdb1140c7abac0b9e98df0f02c177f4 SHA512 5749fdb27e9766fba637a88cc5ce6c2c7cf3207b809b2e9c336d4473ebd5fff7511714032bd6a84d985c10631ecca9d9186db0364a990a3966063da8ac5d160e
-EBUILD lyx-2.3.5.2.ebuild 4062 BLAKE2B a9d9817dd1e0a9817e01036f1f8481c5282e46daf68b137515ef8d353d687ab8553a2fbddb94588b690df32ab18ee3bc70e970a763f68a6997ea0c5d7b81ef36 SHA512 f51f208f27b7c014a5ecf14d76ef9aece2838c94d619b07879973ab69ce63db994a40805d39fc12623923e9ddc51cf48c551ea46ad7c5345f49d60419c033431
+EBUILD lyx-2.3.5.2.ebuild 4052 BLAKE2B 0925c05565172fe4c7fdce447529005dd4c5bb724af7556858f2333da2eccff75fc7a6ae0321d67b0c21b1c8ab5a89cee2607220e5339d7af8a59276fa74ff82 SHA512 bd3ae841210af4ba9352899042bb1b6bb14f419050d875ebb70733c6fa66fc40eac2a48fb65b3ef06ff8338e8ea0e8f29e1073c88cae55a4d9697997d82bddfa
 MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e
diff --git a/app-office/lyx/lyx-2.3.5.2.ebuild b/app-office/lyx/lyx-2.3.5.2.ebuild
index 320b81a0f228..a128d6f301cc 100644
--- a/app-office/lyx/lyx-2.3.5.2.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 MY_P="${P/_}"
 inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 52e1e08350d4..6efdb20826c8 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 464bfcc2db0b..8d9e2f65de7b 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,10 +1,6 @@
 DIST cpuid2cpuflags-10.tar.bz2 82756 BLAKE2B 144ccc9ffff9fdafa9d29628963143b3685421c3c96a81ab780d835c7e0d83fdfe02c720744f57f2947c6079af157c2b6d3e61277f5af734fdba08c6fec23b9f SHA512 c34feef1548b9ade349efbdb68880fea303dd9a8d361de017b925688f9b189602cb175e1699dbe7b48f6887f343fafca9ff0ac95b8eb174bf7201c8bb5978c98
 DIST cpuid2cpuflags-11.tar.bz2 83091 BLAKE2B 2225b6031505597050332d50f4cee69aebb263f9def8043fde64b61e7d06bd2b2ab306eab31701434435a5ede1da974004db3d800a9184011595ed5c16422c79 SHA512 0eeff4e6369eaca6ddb516ff95597c649a7619c1ad79b0d73f51ef9f903db55cb7a49c5ccec478c9a923abfcce63e4ee5b6436f08eb9092b0024c898e508750b
-DIST cpuid2cpuflags-9.tar.bz2 82841 BLAKE2B 6f866a29680b53975359c56f54f3ecd8e978fe55297fdfcb84b25f57dc38bb0fb5c2169dde83e29235d13667a43faa11d75fa15e3d8fbef65a86cea2832363c4 SHA512 61a265abfd5b0920e1b3c18d322dceb416a6a353b3d3ef3f01ab1d02aab1b45dd1ec4eed4ccf667eae82c953830f29d22a671dd7d7c2b4d309050033af1fd5b7
-DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
-EBUILD cpuid2cpuflags-1.ebuild 1044 BLAKE2B ed9ea1bd60d8aea784c8d9a44263c17ca5257b10822415346aa21d670c98c07501bc27d44fa03e79b4a51fa5d9408df6f408933f522ba5771c8c68077137e727 SHA512 e20138a528d97615db610a61fbe77e3f4e8cb3c811a635fe4e17220c93548b4ebeb10c05075e3dedd32c79972e7164a5cbad68ebd5253470f308b6bcab6b75f9
 EBUILD cpuid2cpuflags-10.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-11.ebuild 915 BLAKE2B 918ac0f1b1fb676d72a3dd6fd1dba344f25e575f845a2664e23b2ccdd000de06815c4530fe42f8854e764804b5fbd8ca682476e4780ea35728173fc6505ad6f0 SHA512 7ca191eb49f03a315a039358e1a67b3fd83266f8224fc72eeeeedc8b0bbb53510ba9c17d439f1893ef2644cba52fefeb4f9d1642a59c82da4ae3add72a0a9cbf
-EBUILD cpuid2cpuflags-9.ebuild 909 BLAKE2B 129d7bdbb57eb91b0c7f4b828d1afe6f80ca743cc4b853bca4a4bcab03920eae30c687bac7bd7109a5964d0805a8d657b3bb4a8939f28a4b7bd3ad45541f464e SHA512 3e641a5619d24d470365a37371b23cc0d20aefb7bde712d7aee3c78f27462fdd5926524d5d3876e5bacefa1277ed93fb189eafc6653512c65ccd65b786e5491f
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
deleted file mode 100644
index 3ca2f491f50c..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-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=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PN=cpuinfo2cpuflags
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	python_foreach_impl python_newscript "${MY_PN}-x86"{.py,}
-}
-
-pkg_postinst() {
-	if has_version 'sys-apps/portage' \
-		&& ! has_version "sys-apps/portage[${PYTHON_USEDEP}]"
-	then
-		ewarn "Support for matching Python implementations should be enabled"
-		ewarn "on sys-apps/portage as well. Otherwise, cpuinfo2cpuflags won't"
-		ewarn "be able to figure out the correct repository location and will"
-		ewarn "require you to specify it explicitly."
-	fi
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
deleted file mode 100644
index 5914671097eb..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.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
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index b4307a9ed00d..0216367d2e57 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -7,5 +7,5 @@ EBUILD eix-0.33.11.ebuild 2749 BLAKE2B dac326d96f83bb0f386c9ca28a73886d7a15e3b93
 EBUILD eix-0.33.9-r1.ebuild 2749 BLAKE2B dac326d96f83bb0f386c9ca28a73886d7a15e3b933c4237af307ded2e2a630232ea941ca5c4d14ca290fc03bcc317820d4debd3935786520cf9cf1682fcecba8 SHA512 c6eb8819f27226a211edf1dfd063877ea91f83b62cd8cffdc8b96d09cb290f4dabbc261ea0015f5faf4841792c39383ae041d5767299788419db0049c4f0c835
 EBUILD eix-0.34.1.ebuild 2907 BLAKE2B 96547286d1d02a4d5695dba21bdf9af4b247fb3510b5705c9c0c410ab10dcc750f5cebbc3df2306ba5798053c06fa28eae6e8431d521cc8c3e1315e58477d682 SHA512 42d66ce72344aad5ad0d3487b08b0621f4eec0ea3be2e88f4366b095d898ad12e6de3dac34cf68169c753c3f872c7f4b00eeb3ad203a6821c4f110f87235298d
 EBUILD eix-0.34.2.ebuild 2778 BLAKE2B c5c6f469bb658d97e4de9b81c7198af15b79e5c396b11b90ef227cf3b1515ec50dda2c1443809c2ca11a2303ee6ff0255879d9090614cee64a751d950a4cec40 SHA512 9ae426a79a06c44c8575f26fbcfb73b46d856d848986a70c1318814b58bfd5350c3bbf68364de48926f374de1906c431e51e200bfead1e1c6c7dd2c8a6a4e7e7
-EBUILD eix-0.34.4.ebuild 2584 BLAKE2B 54f82a1963ceb1a2722d8f2d0b126446d0fcf62f5daea998a23dcc188495846e35f37739816174ae6d9eb428aceebd3bd76b18ed13e168b89f01c78821a38496 SHA512 ffde3308282d2eb0c5845f82cb21e917b43efe713f0ce1532ce1728a14021115074ba1617da0a71d74657ca90a7cd33dfffda3b40e920dc90feb3dd31ec3b1ce
+EBUILD eix-0.34.4.ebuild 2579 BLAKE2B fe1a2dba130e5cad8b1303d7734918b6fc4ccaa087fd0df3b42cae66758e24d63eaf13d05441fd94b5d199c942ae1149802f7112a6a62cb56acb77cc01cf73d4 SHA512 c2939f80998ed2987734ce865cd6dffcabcc8a66bb4709b4c7db74c87fb98c8902618bd56adc5a77182b37d0e9c50eb9fabd3f0a028496b8948ed58757681ad4
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.4.ebuild b/app-portage/eix/eix-0.34.4.ebuild
index 28fa17ec030c..8b621270415d 100644
--- a/app-portage/eix/eix-0.34.4.ebuild
+++ b/app-portage/eix/eix-0.34.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index ec72dcb35a16..34e28d715746 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,6 +1,4 @@
 AUX elogviewer-3.0-segfault.patch 1145 BLAKE2B 0511df907edb047ce89966d68d0bc3191e3545ca6af372485601afe7446b812573429e4d4ef4df79fb4cd3104207b3b6482a9ec196250147982772b5b1c4c30c SHA512 98f47e20c796384a04606976bd551562c152877c8c3e41268b785feeee45f1021df9f5dda90ab148949e44b17cbc6160a014f4a0b8f831cd9128dfd851ab01da
-DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-EBUILD elogviewer-2.9-r1.ebuild 1763 BLAKE2B 86d38970ae69a6c698e200364048ac7d54c7c459d47a53e3c192efa5e0ed10d169d5a77a388884873d1980dde59c7cc515db4cfa91bf010343499e098614e3da SHA512 33d3557e382233aac8add44b6b4b306cbc36d4e38e13b0370f71ee22055bcf1317b74bbf2d1ba6b3ed2ed0681a88a1e0160bce72fb3f5d1696551fd840976cc5
-EBUILD elogviewer-3.0-r2.ebuild 1827 BLAKE2B 1cd1304da1087a41f182cba52ad49ccbfdd5769635a3919951f370d494ea177336d1e16ca5c9a850c38950d6a0de90e646fa2b105cf71df9e5e6ae1fc15e3006 SHA512 80c5355b63bf08752f795ee24178fb27a2a03a1ace735988f150e3045ac27433a7e6287da12039e5f102697069bccdbabc39ef0165b75f719d08fbb59b4ddbb4
+EBUILD elogviewer-3.0-r2.ebuild 1749 BLAKE2B 81143efacd189a2b8a92e561c468e25d8a09044cc3717df81f084a3fe266db0450695c400259be7f12133872f7d61064abc6e2f8e562fc39d9d724f7d74b461b SHA512 2e83067a40e7ac83846aebef400564b54e3646c65c2137ca9f71f70d30f9205f420481f5d10bef1a93831891072615f1fce1ad022812ddc2a0ca0981060253f0
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-2.9-r1.ebuild b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
deleted file mode 100644
index d4455cc879c6..000000000000
--- a/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
-		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
-	')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index 1ead5942775f..51a7bfb564bf 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -24,7 +24,6 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
 		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
 	')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	$(python_gen_cond_dep '
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 6881c1c992a9..e53a3cdb0d86 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -2,6 +2,8 @@ AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc59
 AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
 AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
 DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
+DIST hackport-0.6.6.tar.gz 2079279 BLAKE2B 6e4084babb3fc036568387845ca2793d47a29ce94c24211259324d3040d0c0e15be028d0a9726ea8512dd518d7e9dd8447aba67725c0916418f523449f2179b4 SHA512 b836bd21e3713796feaab9ca830fdef80f52b9723d0fba6cfb60d802e038eaec2da8492eb025d6ae376aea69734c031e23c0887642675c4f767b1592d82c5523
 EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
+EBUILD hackport-0.6.6.ebuild 1332 BLAKE2B 6e9b69b1e6d21d7d8c496d79b54d0769ac38caa1b51e60ca6e945026f9f70b665b4fd9027ba98528eb92c7ab211eabd992c4bcd8eb94ea5e9c44e079ee82b3ba SHA512 ffedaefcae279cffc883227a345b20c0dd4afef76ec8a71fee2b3a6eba424feaff80a358ff7c52a7c9fd94e476a5acaa75a18cb856cf32970e6947bf5ed8a181
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.6.6.ebuild b/app-portage/hackport/hackport-0.6.6.ebuild
new file mode 100644
index 000000000000..b892779acfd3
--- /dev/null
+++ b/app-portage/hackport/hackport-0.6.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-portage/repoman
+	>=dev-haskell/async-2.0:=
+	>=dev-haskell/base16-bytestring-0.1.1:=
+	>=dev-haskell/base64-bytestring-1.0:=
+	>=dev-haskell/cryptohash-sha256-0.11:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	>=dev-haskell/hashable-1.0:=
+	>=dev-haskell/http-4000.1.5:=
+	>=dev-haskell/lukko-0.1:=
+	>=dev-haskell/mtl-2.1:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	>=dev-haskell/old-locale-1.0:=
+	>=dev-haskell/parsec-3.1.13:=
+	>=dev-haskell/random-1.0:=
+	dev-haskell/split:=
+	>=dev-haskell/stm-2.0:=
+	>=dev-haskell/tar-0.5:=
+	>=dev-haskell/text-1.2.3.0:=
+	>=dev-haskell/xml-1.3.7:=
+	>=dev-haskell/zlib-0.5.3:=
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-2.0
+		>=dev-haskell/quickcheck-2.0 )
+"
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 13d4631a8d2d..f771f6986ddb 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 1b33f7166f4b..1d28bafc2143 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -6,7 +6,7 @@ DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c21
 DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
-EBUILD fish-3.0.2.ebuild 1668 BLAKE2B 4649201b3a71be69f21976a39f6cef0aa84b05ccef44e5254647608e83b736be38c4cb000e9078fa07604bc7fa193530e0c003e4e9e9cf057619985808befbce SHA512 60aeac2a23b9833f8980d0ecb47c28e0a4dafdc0d9779075002097f9a6677effa0aa31129ea723d0fe5d0210485e27b1376ed56ac362ee8e794ec1548a04afe4
+EBUILD fish-3.0.2.ebuild 1667 BLAKE2B 6c0aafa9c02a6e39f23b3887990898a48ed669fe727c5947149911f057c002f4476062ba6b93f6d838a941dd636bba2422112f72d100f6806e52caf2aaf0ba6b SHA512 203cd9ce0a233b1010d990ac006077c15b3f5af5d9478752d4723c1c0aff745109a385ee9ca3ee2a120ec991cbb015f9d3c20c5a3d097006c6a9b36c4829d587
 EBUILD fish-3.1.0.ebuild 1557 BLAKE2B ccd54d16b09cd15983cb58ac4da97170fcdd8493f315968c5709e20ef06b9550192a67f7df82c69637ccb08ef8e07db199f90a1ce960d13fedfd6525852bdc11 SHA512 99fb79a548105a2df3c4c8098a2967ce91e52eee8a6d866e95606ef373a0bae8d23d81a322d3e307344f3ad04ed9d3a6240d3d25b84c1130bc54c2f7fb8a6570
 EBUILD fish-3.1.2.ebuild 1571 BLAKE2B 91cf51764d5969c2d941612b5f74456133de08c4ab101e38d80d2169da6661e5711ce449edf677106bfdb55a75a75549efbea36673dc0b11384a10c137819391 SHA512 b8b956ae839cfec8acfece28ca1b6b9b8cc9875112f27a728ab32f7d3b1a929ea9044f0e3dabf3723683c92309b6e2e56cc04638f1e74741de0da4779b19e68a
 EBUILD fish-9999.ebuild 2057 BLAKE2B 8c6efe43984f467ef77552f189eae1f947334e2a3e1558a5b1a51cb2376e5bf8a7de85cc780d882bfc99e22a04919eb5a9db9795e546e0ab719481d8d27af17b SHA512 915e41d259b8401b4d4bb08152744d3493fea9e326e6923beb43dddd2dc6b9bd1d4105dbb53238788e6ae9b6035461e7bb797bd4d2bb20cd1f5bf1782644a78e
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index bbeeec175a58..4fbf72a7b15c 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/posh/Manifest b/app-shells/posh/Manifest
index 944cc1163029..a048210fe5b6 100644
--- a/app-shells/posh/Manifest
+++ b/app-shells/posh/Manifest
@@ -2,6 +2,6 @@ DIST posh-debian-0.14.1.tar.bz2 208385 BLAKE2B 0670d529f0d2f3b27e212d0efd66b42de
 DIST posh-debian-0.14.tar.bz2 208192 BLAKE2B b2a974fdb55d39260bf21831c2df1518e6ef2e7c982e7a15c70ba470dff9e1eac41ac5b7e6709b630d7dcb2cd2871268328c70f876778fb9196f70dd1702fedf SHA512 8e30245146197f379ae7bccc6f56a1d0d38796d7b5499bf334d0c4375e8caacabaf8293e838bc827e511a57c6ae70701bfb1887c0756bce3bb9a4b69b9fd07ae
 DIST posh_0.13.2.tar.xz 267492 BLAKE2B 44a06528825485ac1c5d899e9b625785ec733fee945241dc0708e51e1f2145a31aae04023477f6b3abb8053ab42714d2ceac6b5a1d776780ea2ab78ca1fd44d5 SHA512 1d0de10e47e66cb654a47c18bb7f8b5361eff2d99e6c0b215ed9a1052134b534276ed58feafd53fe0ee2fbc3e048dc9cf747752568fb361ea47700e02a3478f0
 EBUILD posh-0.13.2.ebuild 481 BLAKE2B 3e0b08947628fed0afbb6d9b0b87893b9cd6cab5c362f1f62a5d11e31800bdf7bf4a82776fac69e53b2518a72a31bb68968ea3ee2101c2dbc269e878492da482 SHA512 62cc5bb9d7a9ef2c3b1d1e714ff8f8a4c265c7c3293aa5a870870f0beec64a4794a6fa716a84640deed97d3cd8a6f7545831b62567f1c31c30bf6a9fc6de6b9d
-EBUILD posh-0.14.1.ebuild 616 BLAKE2B e7dd7a7bad0022e77695edf8fb30f9b690dac46ac87e6c188979070af56e163f10e9659c18ce53f3664b60cbdef6e84dbf1a3d19987ef20c6fe57a99e3cb67d0 SHA512 c10a0cd92ba8f1f2789aa47ea9a6b30a7f1b797cee9a311e2f89e78b33f5103626a11d82f79850dcbf9ac3b26d8f1a4066bf387b716ac956a1a68a3db0c9f045
+EBUILD posh-0.14.1.ebuild 615 BLAKE2B 8498bb0cfb497c105ef2bc920cc3ecb79f0c7bac47d3c4de1ffaed4846f805bf22ed86da1d787f58c8815d4044a013531453c81389d00c326cf581bb609d9ae2 SHA512 6392ae586da6014011dacb47df907c93c04ee9bd3d5cdee69fb2fb130c699a0c8f64b47d0db679a25439f693a44851c9eed103d19a8c4d74dc78f4c40f9a5c35
 EBUILD posh-0.14.ebuild 616 BLAKE2B e7dd7a7bad0022e77695edf8fb30f9b690dac46ac87e6c188979070af56e163f10e9659c18ce53f3664b60cbdef6e84dbf1a3d19987ef20c6fe57a99e3cb67d0 SHA512 c10a0cd92ba8f1f2789aa47ea9a6b30a7f1b797cee9a311e2f89e78b33f5103626a11d82f79850dcbf9ac3b26d8f1a4066bf387b716ac956a1a68a3db0c9f045
 MISC metadata.xml 217 BLAKE2B 2c342b84369a3ba13606f35f163ee0aab11a086c23c83066fb5fd7d0ffcac5282b2cbb228982745c8ae1c1575b7d1605556f3562175ee150de6c701d86e347c8 SHA512 94cad0e7f10d53a2ee488ff9be4c417377f7cc6fed1ea4bad878364978cdbeb648974764477a18d2b222ad9111082ef0e00b14832ec7318646a47b56c58c828e
diff --git a/app-shells/posh/posh-0.14.1.ebuild b/app-shells/posh/posh-0.14.1.ebuild
index 9ebc1b24bbaf..788e7d6d3ed4 100644
--- a/app-shells/posh/posh-0.14.1.ebuild
+++ b/app-shells/posh/posh-0.14.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+ BSD public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7c839484aff5..6f075ac912ff 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 123a5af2ed4a..2cc3aef4d590 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,5 +1,5 @@
 AUX kchmviewer-7.7-force-qtwebkit.patch 960 BLAKE2B da573cf4eb4a2668b7d37356df270f002cda5f1ca54055fbed36dc9f95bd8373934d8befa2b635f23074e0ce69cb9707cfd41cfab223c6254cb68c4fdade8a3b SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549
 AUX kchmviewer-7.7-underlinking.patch 300 BLAKE2B 02d86fad61fe727e5bebdd8b340bd9a70ccde78d04ef65b2dcbc517a76304b5788412d16ba727bc7575087a9c0229c814550c25f80edba6ca6332a9dfd366f8d SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec
 DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
-EBUILD kchmviewer-7.7-r1.ebuild 859 BLAKE2B b4427a44334b82f0e6af50b499199e55e50aecf2b0d1cc81adc85c97fe2c84853a04e09c5b711328e0caee83244965ff77ab84b80ac49bf0b9d463a952692d2c SHA512 bb620cad030ced2ea5584c175212c9901fd219d32c93a53c210ba086f7dba5b8b8ab0e7ffc04f6cdef0046ea60066d8af9dabf5c3f5de288de21f6deecb03a31
+EBUILD kchmviewer-7.7-r1.ebuild 853 BLAKE2B a3446cc96aff7a0ac09e42ac9cead41dc91420e3f18a86b07f7bf709c5b997014b2662ad6006d7f044cecd21cf74ba226f567e0303ffd2450ee22ee4a413d80c SHA512 25fbacdbb184f424140995c2dbdea683be9f35a8cb79c43874df80a59ae7ad399e9028f0ec7c99e9573563e8357016c98dbfe4c36f30ebb0e609ffad878d6f04
 MISC metadata.xml 982 BLAKE2B ed5f9ea7ed6aa8a2b6d743ad2944bbfbe46638f3c0e2b154b8abe250d2b7cf0a56ad48cb4df994fe2c1df1cde7c7a612f3c681107d0b5c1f8652072e15ad5cc8 SHA512 746f5a51bc2e4373f41a24f71e2f19647f70a53439a1f40933f32405b3a9c2fdec6130bbe2ecd2cee0b1901f87a5bae12cfa782ab44a37f5ecce61727a16ae91
diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
index f38835061d77..7864d2f6a305 100644
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-7.7-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
 
-inherit desktop qmake-utils xdg-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Feature rich chm file viewer, based on Qt"
 HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 62c1c5d817b0..f0095bacdfc4 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -5,6 +5,7 @@ DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90
 DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
 DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
 DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
+DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
 EBUILD pandoc-1.12.4.2-r1.ebuild 4142 BLAKE2B aece6deed0d32ab7a30fce9a80bb1b1649054230fa171103c25744d857cfb89d3ce79e017c0cf36dbfc6be362f6727c9ec4b7d4e09ed3d219259899a737daf1b SHA512 33da73a4d5a4bebf453475f97da67927c80671178ba1d79b90f0198719c0feb57b64a1528eec8ef64a21064e412143dd41429a99b87ea9a5393392e547f69800
 EBUILD pandoc-1.13.2.1.ebuild 5034 BLAKE2B c68c245aec5243374c433fe7c6901146e73dbf02e8b13e4d27e01abe92386abe7403adbacd844f35711ae26525eaa7b404c2a3a19239b1f60eda8141170695d4 SHA512 26ca2918ce5c27dfc341dd05b03be05a1a9ed2e8cd1c512d810969041006436d2bc58001d3c2e3bafd9b9b3ac0b9095ab779442342022b5d8ac713ef83ee2062
 EBUILD pandoc-1.14.0.4.ebuild 5333 BLAKE2B 6d76d063b8212c5699f1423ec12487a5cdfded00659797005b4193c9fca1645cc7cbba60c1dfeb6b57062a86f33e9faeed7f559caa726b2bab8ea7c98a8f383e SHA512 98c21b76c045b8a4dad6f583fef63f6ed9a66a20534fdbea4fa14eeebcf305b56929cbb8a827ad7ab49327564c52f4671d05692ded71a80b6201061c009b5563
@@ -12,4 +13,5 @@ EBUILD pandoc-1.15.0.6.ebuild 4920 BLAKE2B 7976bae8f35cbff0ee64cd466e1c3ae0c592a
 EBUILD pandoc-1.18.ebuild 4830 BLAKE2B b0c0c5fbf0df87840f4442d5b4c5a1bfa2d23c3aac4f82588b4d3710aefaf8875651ae47d51e24f6f6ed67f94ed56fb9f42a56b1fb87da6007cb94076097fb2a SHA512 ac324508b6655d446a70d7fcbe28aaa4c1aa3aaf9c8382ed6fe6185c24b94d32eeaf5f365c74b569ffa1e2abae1541892fee32b6eae711295b02ae987a20a25a
 EBUILD pandoc-1.19.2.1-r1.ebuild 4908 BLAKE2B e55010ee0388eb10bbbd49e6b197a40c2d7e09690867a330dd19c3db38b59c858ad5d95db46d33404045b1691054520841b532aa202c645ae3f002d9d28191eb SHA512 e8fbd73e60351c2429fabafa7758b3a5940c3876317fa8f00312706ad04efbd86dfc8fbb73811fa581a0ba11eb10ba46f644a10c347627c89cad4bb724e1c7e9
 EBUILD pandoc-1.19.2.1.ebuild 4780 BLAKE2B 4a969419563723a4d86d4faecd2035dd48d5bc1309861b7a5bf47384d4942800748e26e5fbe116a4cd6510609df897b4b04b65d187adf05715e678c85e9f805c SHA512 8da769f19eb43f0b5fead89f4ef42fc7d8bfb90fae9f056eccfa86cdf1fb933230c8954a0895db101861ae965b450505c88ab4eb2a55730fa3fc10b185231a60
-MISC metadata.xml 1284 BLAKE2B 0ac01c07148aa682d4e6bd074b246d2578a816c76d6110ba3a9506e051b5ef2254f98e3faa8399c5f51200af26155dbabb6d08987bba32dd27f863f7c8183c15 SHA512 ba9a2c3897e5b645c0faa2a1a2f918cf5c30e3cace81343b01de73b25c26c343d95d7a09c50d56bf2aaa18a0a39318a506131e6bcdd7a48ab32197f3ef68be2a
+EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
+MISC metadata.xml 1365 BLAKE2B 77e0d83933980d8cfb0e70b10b0e89e0aab0f3e0359d7d6b1b8dc73918c7fb654d1fbe2e5438f1fa666c11ebcb4c37507896ea9203e5f0f580bb3b35cfb11448 SHA512 0136061dd6f7b791880b46603927c1fd5e18e71fef6e0d109edd40908531475ce9fe7118dff52007fb1d2f5d8363897a0d2ce49bba7791314046b14fef490270
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 837984f412b5..33ba2477472a 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,6 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
+		<flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
 		<flag name="http-conduit">Enable downloading of resources over https.</flag>
 		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
 		<flag name="https">Enable support for downloading of resources over https.</flag>
diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
new file mode 100644
index 000000000000..878536e561c9
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.9.2.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files optimize static trypandoc"
+# test failure: error while loading shared libraries:
+# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
+# cannot open shared object file: No such file or directory
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
+	>=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+	>=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
+	>=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
+	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
+	>=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
+	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
+	>=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+	# optimisations require ~16GB of memory on ghc-8.8.3
+	use optimize || HCFLAGS+=' -O0'
+	cabal_chdeps \
+		'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed_data_files) \
+		$(cabal_flag static static) \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman "${S}/man/${PN}.1"
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 2e55ac5e5e37..18839a4aa569 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
-AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
+AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
+DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
 DIST po4a-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
-DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1608 BLAKE2B 5884ec1ca332c88aaebeaf8518206ac3cb710246d6076987d3a9020d218356753199d3bcbae2c771a6adfd9b4f3277438ad0495fd6d0cc62dd84ecb247f8f675 SHA512 35d044fafaa653bf4451ab01a7ee75d0e1143d56614dc2381a5c31b01b664b19ecf9c5bb70115c3e6973db7bb90535f8c1d9d1cc5f8a5099c4bfe0e6dd170b96
 EBUILD po4a-0.57.ebuild 1267 BLAKE2B 066c64d168e931c61098c860e15def7a08782555f9adb85dcd700aca61d832305938b3d27ce5e7ad1b0d015cecbe8e83f3c3f09432f3f3ab30913adacda09c43 SHA512 8b636a4e7ebe708d3f248f7f89b2ceabfe8a7b6502704a6b8bfaadf9b159338139666871d9e06cfdf8188e760634c6aa8837cba998aef6df09509e06ee1029ce
 EBUILD po4a-0.59.1.ebuild 1317 BLAKE2B 6e623109d6ca483acd58efca136ad68ffd7fcdee505e2fffd98966e0a260f9d5224de0df3e21ae14e84366a5e7c64e198bdb88eba85c10d97895f9bf3707ef2d SHA512 97c3b3e8af00c5834e8ddf1c49e73b986d4b88ad9979f93c9aea9b40cc0998389a420ede0a86a512808f9e48968f1b552230cd90780ff297308d315d1aef9da8
+EBUILD po4a-0.60.ebuild 1320 BLAKE2B 749a40a9f392816f384cbd7e76e92553ccfcca9174c8179987059106da6453be2cd2d817c2fca80696dabaa4f04ee871dc7e3d11742db6900155afcb249f5f8f SHA512 a498934bf3d554cf042506ebd4642509ac5042f8258a220715ece60786e85cb202851f2bd7b177d84eb9f518a4ca5b80f68e4e440758ef9b9b2919b94f44d816
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
deleted file mode 100644
index 226fa0e9b6e2..000000000000
--- a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 13 Jun 2017 21:10:34 +1200
-Subject: [PATCH] Fix broken use of lib '.'
-
-   "'.'" is not "."
-
-Bug: https://bugs.gentoo.org/614122
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index 43c6f80..9ee443b 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl
- 
--use lib q('.');
-+use lib q(.);
- use Po4aBuilder;
- 
- my $build = Po4aBuilder->new
--- 
-2.13.1
-
diff --git a/app-text/po4a/files/po4a-0.60-man.patch b/app-text/po4a/files/po4a-0.60-man.patch
new file mode 100644
index 000000000000..40927dbda818
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.60-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -232,7 +232,6 @@
+         }
+         $parser->parse_from_file ($file, $out);
+ 
+-        system("gzip -9 -f $out") and die;
+         unlink "$file" || die;
+     }
+ 
+@@ -250,7 +249,6 @@
+ 		print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ 		system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ 	    }
+-            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+         }
+         unlink "$file" || die;
+     }
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
deleted file mode 100644
index 6388874ad46d..000000000000
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-PLOCALES_BACKUP="en"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/openjade
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		virtual/tex-base
-	)"
-
-# Running tests in parallel fails
-DIST_TEST="do"
-
-PATCHES=(
-	# Fix bad escaping of '.' in @INC modification
-	"${FILESDIR}"/${PN}-0.45-614122-no-dot-inc.patch
-	"${FILESDIR}"/${PN}-man.patch
-)
-
-src_prepare() {
-	# Check against locale files in ${S}/pod/bin for mismatches
-	# with languages listed in PLOCALES
-	local locales_path="${S}/po/bin"
-	l10n_find_plocales_changes "${locales_path}" "" ".po"
-
-	# Get rid of disabled locales
-	my_get_disabled_locales() {
-		PERL_RM_FILES=( "${PERL_RM_FILES[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
-	}
-
-	l10n_for_each_disabled_locale_do my_get_disabled_locales
-
-	einfo "Your LINGUAS lists the following languages: ${LINGUAS}"
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.60.ebuild b/app-text/po4a/po4a-0.60.ebuild
new file mode 100644
index 000000000000..8807618f22d5
--- /dev/null
+++ b/app-text/po4a/po4a-0.60.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index a3aaa043f6aa..8b8720560109 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,3 +1,3 @@
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20190928.ebuild 4666 BLAKE2B 32407aebd05f6d3953202fcbc7a288d7ad77b12eee19b994aba1b2f7d9203f523a445cd0c876956993e3129b27cc993343d1d6952dee85a619133ae2be11f554 SHA512 7c42ab55e3bd7abc936b7a406edebd78689f180a5b1955c9183be859f489af354019edc32d3744d68f9823a920c37d5c956551bd7b0c49406996af226b00620b
+EBUILD podofo-0.9.6_p20190928.ebuild 4665 BLAKE2B 82b5f6179a54e471a1b8aeab45d87d5499f59fb47a82b9a39302b3053d4f0642a8677e723013a6b307e112a057ae61609940b6298cc43c9b203cefe08153aeee SHA512 ae262d3bef4ff0ef909779620b7c80768158a53ddabcdbf500f034f2f5a988b64a2de7d4f19998618780d888252783add8b2a3f3030124b52685077e268f1ea9
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index 9b782fb66466..a07aaa17adbf 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index d118a0f829d9..5d31e8cef6f1 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1,3 +1,3 @@
 DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
-EBUILD q-text-as-data-2.0.10.ebuild 1112 BLAKE2B 1d1965e6f65978d209a8248165c46f296a3c1fc0f4d9b0668d4b16eb0727b843b95e7b77316f80fafc0eb1c4dd7b34ee1b3f7682d795c6c3857ffe968a77eaa8 SHA512 f778dee4e4177edd6682a64ec56b3afc410a519f4b9d42db3ee5f2e88083b220af418f33ebd7dfed4e94cf5c8615bd6d023b1039a676f91b99e79deb49270f1f
+EBUILD q-text-as-data-2.0.10.ebuild 1099 BLAKE2B 4af69eca1ed9e1499526466f3a972f9be41dbd661c9ce2bc14264f278ee6428dfadeaf7bdaa1de3e7ddca37dd1a236b9b9d791b789b1262924f1b697de45da71 SHA512 4f9ed280f9e8a3f12e68c17a2a14a77ebcd72bdbb3bc17d8250ba58306cd82901d223d885a25323b38ca0ebca8867e434e5af0a336145ca2662670f3d3c39530
 MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
diff --git a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
index f3c988259f1b..28dbf1e7a1ba 100644
--- a/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
+++ b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-r1
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 1ecf1bf3ee03..613615f0da7a 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-1-r3.ebuild 3514 BLAKE2B 564fa8e31695021a3275a9c48d929950843b987c1966d130ecc065f8d9107d752c49b262f8baec5e50c79c8d0a7066f9816e69a86fbf08801b716b554bccfdb1 SHA512 fe3e0cd45f593c377b841f6a2bbaffbe3021a2b0a495e3974d4027f83924514a9644bc146e319a02360c86fed0659bdae8ea4801da79ce478c2bbe204ded1192
-MISC metadata.xml 407 BLAKE2B 2e7caaef50842af8919ebe08a4b5dfb97b6c12d4d805efb78b16c83841413370395cc07572670a0563895f7f37f8b6e48b46507544532082814a0e43755b02d4 SHA512 8b879dbcfc3a3b82f908ba430dfc6fa377aaf9ed2726558586aeeb13f987bde55ac257dff7020bd4999c744713404b27f5795cbe06e54421ef7f313675f506f0
+EBUILD sword-modules-2.ebuild 11990 BLAKE2B 76652edeb8bd995a5bb72d800ad788d7229790e7aeb55d2e80ea6e972580a1ace64f1c4e7414bab99f95a46914ff630b2bf3fd220cda92e1a2422307a6bd91fe SHA512 7cbe14123141f6dae80510b14a530a23b7e1910785224e4bd9d1b561a9b29eb2ecb14e3db212d27b2edf7637d1af7ce2157d4df5d0f6e8ab69d0a73c1576052e
+MISC metadata.xml 361 BLAKE2B 51316035c5e4197a328d336f328b3b3b777bcd14dfea50f11060624e86ec566b5d4e1bca5f755cd8f165aad8100bcb9c9a8aa12f036ad4df52276a9a16fab51f SHA512 61c6526b5fd049d5c13ee6af9bae3eaabc7151fe45de3ba63869a5ef8f2a4b00a4257c5a8d244f245b4e3f92d47a97a54c83ad03bf0742c1dda143efe392a10d
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index 767ef6a4ec2c..f24236186ef2 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -5,8 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
-	<longdescription>
-These are some of the more popular modules for the SWORD Project.
-They provide a large number of tools for personal study.
-	</longdescription>
+	<use>
+		<flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-1-r3.ebuild b/app-text/sword-modules/sword-modules-1-r3.ebuild
deleted file mode 100644
index c1c0e0d55a77..000000000000
--- a/app-text/sword-modules/sword-modules-1-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="https://www.crosswire.org/sword/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-dicts/sword-Abbott
-	app-dicts/sword-ACV
-	app-dicts/sword-Afr1953
-	app-dicts/sword-AKJV
-	app-dicts/sword-Alb
-	app-dicts/sword-Aleppo
-	app-dicts/sword-AmTract
-	app-dicts/sword-AraSVD
-	app-dicts/sword-ArmEastern
-	app-dicts/sword-ArmWestern
-	app-dicts/sword-ASV
-	app-dicts/sword-Barnes
-	app-dicts/sword-BasHautin
-	app-dicts/sword-BBE
-	app-dicts/sword-BulVeren
-	app-dicts/sword-BurJudson
-	app-dicts/sword-Byz
-	app-dicts/sword-CBC
-	app-dicts/sword-Chamorro
-	app-dicts/sword-Clarke
-	app-dicts/sword-Common
-	app-dicts/sword-CroSaric
-	app-dicts/sword-CzeBKR
-	app-dicts/sword-DaOT1931NT1907
-	app-dicts/sword-Daily
-	app-dicts/sword-Darby
-	app-dicts/sword-Diaglott
-	app-dicts/sword-DRC
-	app-dicts/sword-DTN
-	app-dicts/sword-DutKant
-	app-dicts/sword-DutSVV
-	app-dicts/sword-Easton
-	app-dicts/sword-Esperanto
-	app-dicts/sword-FarOPV
-	app-dicts/sword-FinBiblia
-	app-dicts/sword-Finney
-	app-dicts/sword-FinPR
-	app-dicts/sword-FreBBB
-	app-dicts/sword-FreBDM1744
-	app-dicts/sword-FreCrampon
-	app-dicts/sword-FreSegond1910
-	app-dicts/sword-Geneva
-	app-dicts/sword-Geneva1599
-	app-dicts/sword-GerElb1871
-	app-dicts/sword-GerElb1905
-	app-dicts/sword-GerLut1545
-	app-dicts/sword-GerSch
-	app-dicts/sword-GreekHebrew
-	app-dicts/sword-HebrewGreek
-	app-dicts/sword-Heretics
-	app-dicts/sword-Hitchcock
-	app-dicts/sword-HunKar
-	app-dicts/sword-Institutes
-	app-dicts/sword-ISBE
-	app-dicts/sword-ISV
-	app-dicts/sword-ItaDio
-	app-dicts/sword-ItaRive
-	app-dicts/sword-JFB
-	app-dicts/sword-Josephus
-	app-dicts/sword-JPS
-	app-dicts/sword-JST
-	app-dicts/sword-Jubilee2000
-	app-dicts/sword-KJV
-	app-dicts/sword-KJVA
-	app-dicts/sword-KLV
-	app-dicts/sword-KLVen_iklingon
-	app-dicts/sword-KLViklingon_en
-	app-dicts/sword-Lightfoot
-	app-dicts/sword-LITV
-	app-dicts/sword-Luther
-	app-dicts/sword-MAK
-	app-dicts/sword-ManxGaelic
-	app-dicts/sword-MHC
-	app-dicts/sword-MHCC
-	app-dicts/sword-MKJV
-	app-dicts/sword-Montgomery
-	app-dicts/sword-Murdock
-	app-dicts/sword-Nave
-	app-dicts/sword-Norsk
-	app-dicts/sword-Orthodoxy
-	app-dicts/sword-Packard
-	app-dicts/sword-Personal
-	app-dicts/sword-Peshitta
-	app-dicts/sword-Pilgrim
-	app-dicts/sword-PNT
-	app-dicts/sword-Practice
-	app-dicts/sword-RKJNT
-	app-dicts/sword-RNKJV
-	app-dicts/sword-Robinson
-	app-dicts/sword-Rotherham
-	app-dicts/sword-RusMakarij
-	app-dicts/sword-RusSynodal
-	app-dicts/sword-RWebster
-	app-dicts/sword-RWP
-	app-dicts/sword-SAOA
-	app-dicts/sword-Scofield
-	app-dicts/sword-ScotsGaelic
-	app-dicts/sword-SME
-	app-dicts/sword-Smith
-	app-dicts/sword-SpaRV
-	app-dicts/sword-SpaRVG
-	app-dicts/sword-SpaVNT
-	app-dicts/sword-Spurious
-	app-dicts/sword-StrongsGreek
-	app-dicts/sword-StrongsHebrew
-	app-dicts/sword-Swahili
-	app-dicts/sword-Tagalog
-	app-dicts/sword-TCR
-	app-dicts/sword-TDavid
-	app-dicts/sword-TFG
-	app-dicts/sword-Tisch
-	app-dicts/sword-Torrey
-	app-dicts/sword-TR
-	app-dicts/sword-TSK
-	app-dicts/sword-Twenty
-	app-dicts/sword-Tyndale
-	app-dicts/sword-UKJV
-	app-dicts/sword-Ukrainian
-	app-dicts/sword-Uma
-	app-dicts/sword-Vulgate
-	app-dicts/sword-Vulgate_HebPs
-	app-dicts/sword-Webster
-	app-dicts/sword-Webster1913
-	app-dicts/sword-Wesley
-	app-dicts/sword-Weymouth
-	app-dicts/sword-WHNU
-	app-dicts/sword-WLC
-	app-dicts/sword-Wulfila
-	app-dicts/sword-Wycliffe
-	app-dicts/sword-YLT"
diff --git a/app-text/sword-modules/sword-modules-2.ebuild b/app-text/sword-modules/sword-modules-2.ebuild
new file mode 100644
index 000000000000..dc8a112bcfcc
--- /dev/null
+++ b/app-text/sword-modules/sword-modules-2.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
+HOMEPAGE="https://www.crosswire.org/sword/modules/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
+IUSE="-esoteric ${LANGS// / l10n_}"
+
+RDEPEND="
+	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
+	app-dicts/sword-Personal
+	esoteric? (
+		app-dicts/sword-Phaistos
+		app-dicts/sword-Sentiment
+	)
+	l10n_af? (
+		app-dicts/sword-Afr1953
+	)
+	l10n_ar? (
+		app-dicts/sword-AraNAV
+		app-dicts/sword-AraSVD
+		app-dicts/sword-alzat
+	)
+	l10n_az? (
+		app-dicts/sword-Azeri
+		app-dicts/sword-NorthernAzeri
+	)
+	l10n_be? (
+		app-dicts/sword-Bela
+	)
+	l10n_bea? (
+		app-dicts/sword-BeaMRK
+	)
+	l10n_bg? (
+		app-dicts/sword-BulVeren
+	)
+	l10n_bla? (
+		app-dicts/sword-BlaMat
+	)
+	l10n_br? (
+		app-dicts/sword-BretonNT
+		app-dicts/sword-br_en
+	)
+	l10n_ch? (
+		app-dicts/sword-Chamorro
+	)
+	l10n_chr? (
+		app-dicts/sword-Che1860
+	)
+	l10n_ckb? (
+		app-dicts/sword-Sorani
+	)
+	l10n_cop? (
+		app-dicts/sword-CopNT
+		app-dicts/sword-CopSahBible2
+		app-dicts/sword-CopSahHorner
+		app-dicts/sword-CopSahidicMSS
+		app-dicts/sword-CopSahidica
+		app-dicts/sword-SahidicBible
+	)
+	l10n_cs? (
+		app-dicts/sword-CzeB21
+		app-dicts/sword-CzeBKR
+		app-dicts/sword-CzeCEP
+		app-dicts/sword-CzeCSP
+	)
+	l10n_cu? (
+		app-dicts/sword-CSlElizabeth
+	)
+	l10n_cy? (
+		app-dicts/sword-WelBeiblNet
+	)
+	l10n_da? (
+		app-dicts/sword-DaNT1819
+		app-dicts/sword-DaOT1871NT1907
+		app-dicts/sword-DaOT1931NT1907
+	)
+	l10n_de? (
+		app-dicts/sword-GerAlbrecht
+		app-dicts/sword-GerAugustinus
+		app-dicts/sword-GerElb1871
+		app-dicts/sword-GerElb1905
+		app-dicts/sword-GerGruenewald
+		app-dicts/sword-GerHfa2002
+		app-dicts/sword-GerHfaLex2002
+		app-dicts/sword-GerLeoNA28
+		app-dicts/sword-GerLeoRP18
+		app-dicts/sword-GerLut1545
+		app-dicts/sword-GerLutherpredigten
+		app-dicts/sword-GerNeUe
+		app-dicts/sword-GerReinhardt
+		app-dicts/sword-GerSch
+		app-dicts/sword-GerTafel
+		app-dicts/sword-GerTextbibel
+		app-dicts/sword-MAK
+		app-dicts/sword-Rieger
+	)
+	l10n_el? (
+		app-dicts/sword-GreVamvas
+	)
+	l10n_en? (
+		app-dicts/sword-2BabDict
+		app-dicts/sword-AB
+		app-dicts/sword-ABP
+		app-dicts/sword-ABS_Essay_GoodSam_SWB
+		app-dicts/sword-ACV
+		app-dicts/sword-AKJV
+		app-dicts/sword-ASV
+		app-dicts/sword-Abbott
+		app-dicts/sword-AbbottSmith
+		app-dicts/sword-AbbottSmithStrongs
+		app-dicts/sword-AmTract
+		app-dicts/sword-Anderson
+		app-dicts/sword-BBE
+		app-dicts/sword-BDBGlosses_Strongs
+		app-dicts/sword-BWE
+		app-dicts/sword-BaptistConfession1689
+		app-dicts/sword-Barnes
+		app-dicts/sword-Burkitt
+		app-dicts/sword-CBC
+		app-dicts/sword-CPDV
+		app-dicts/sword-Catena
+		app-dicts/sword-Cawdrey
+		app-dicts/sword-Clarke
+		app-dicts/sword-Common
+		app-dicts/sword-Concord
+		app-dicts/sword-DBD
+		app-dicts/sword-DRC
+		app-dicts/sword-DTN
+		app-dicts/sword-Daily
+		app-dicts/sword-Darby
+		app-dicts/sword-DarkNightOfTheSoul
+		app-dicts/sword-Diaglott
+		app-dicts/sword-Dodson
+		app-dicts/sword-EMBReality
+		app-dicts/sword-EMTV
+		app-dicts/sword-Easton
+		app-dicts/sword-Etheridge
+		app-dicts/sword-Family
+		app-dicts/sword-Finney
+		app-dicts/sword-Geneva
+		app-dicts/sword-Geneva1599
+		app-dicts/sword-Godbey
+		app-dicts/sword-GodsWord
+		app-dicts/sword-Heretics
+		app-dicts/sword-Hitchcock
+		app-dicts/sword-ISBE
+		app-dicts/sword-ISV
+		app-dicts/sword-Imitation
+		app-dicts/sword-Institutes
+		app-dicts/sword-JCRHoliness
+		app-dicts/sword-JEAffections
+		app-dicts/sword-JESermons
+		app-dicts/sword-JFB
+		app-dicts/sword-JOChrist
+		app-dicts/sword-JOCommGod
+		app-dicts/sword-JOGlory
+		app-dicts/sword-JOMortSin
+		app-dicts/sword-JPS
+		app-dicts/sword-JST
+		app-dicts/sword-Josephus
+		app-dicts/sword-Jubilee2000
+		app-dicts/sword-KD
+		app-dicts/sword-KJV
+		app-dicts/sword-KJVA
+		app-dicts/sword-KJVPCE
+		app-dicts/sword-LEB
+		app-dicts/sword-LITV
+		app-dicts/sword-LO
+		app-dicts/sword-LawGospel
+		app-dicts/sword-Leeser
+		app-dicts/sword-Lightfoot
+		app-dicts/sword-Luther
+		app-dicts/sword-MHC
+		app-dicts/sword-MHCC
+		app-dicts/sword-MKJV
+		app-dicts/sword-MLStrong
+		app-dicts/sword-MollColossians
+		app-dicts/sword-Montgomery
+		app-dicts/sword-Murdock
+		app-dicts/sword-NETfree
+		app-dicts/sword-NETnotesfree
+		app-dicts/sword-NETtext
+		app-dicts/sword-NHEB
+		app-dicts/sword-NHEBJE
+		app-dicts/sword-NHEBME
+		app-dicts/sword-Nave
+		app-dicts/sword-Noyes
+		app-dicts/sword-OEB
+		app-dicts/sword-OEBcth
+		app-dicts/sword-OSHM
+		app-dicts/sword-OrthJBC
+		app-dicts/sword-Orthodoxy
+		app-dicts/sword-PNT
+		app-dicts/sword-Packard
+		app-dicts/sword-Passion
+		app-dicts/sword-Pilgrim
+		app-dicts/sword-Practice
+		app-dicts/sword-QuotingPassages
+		app-dicts/sword-RKJNT
+		app-dicts/sword-RNKJV
+		app-dicts/sword-RWP
+		app-dicts/sword-RWebster
+		app-dicts/sword-RecVer
+		app-dicts/sword-Robinson
+		app-dicts/sword-Rotherham
+		app-dicts/sword-SAOA
+		app-dicts/sword-SME
+		app-dicts/sword-SPE
+		app-dicts/sword-Scofield
+		app-dicts/sword-Smith
+		app-dicts/sword-Spurious
+		app-dicts/sword-StrongsGreek
+		app-dicts/sword-StrongsHebrew
+		app-dicts/sword-TCR
+		app-dicts/sword-TDavid
+		app-dicts/sword-TFG
+		app-dicts/sword-TSK
+		app-dicts/sword-Torrey
+		app-dicts/sword-Twenty
+		app-dicts/sword-Tyndale
+		app-dicts/sword-UKJV
+		app-dicts/sword-Webster
+		app-dicts/sword-Webster1806
+		app-dicts/sword-Webster1913
+		app-dicts/sword-Wesley
+		app-dicts/sword-Westminster
+		app-dicts/sword-Westminster21
+		app-dicts/sword-Weymouth
+		app-dicts/sword-Worsley
+		app-dicts/sword-Wycliffe
+		app-dicts/sword-YLT
+	)
+	l10n_eo? (
+		app-dicts/sword-Esperanto
+	)
+	l10n_es? (
+		app-dicts/sword-SpaRV
+		app-dicts/sword-SpaRV1865
+		app-dicts/sword-SpaRV1909
+		app-dicts/sword-SpaRVG
+		app-dicts/sword-SpaTDP
+		app-dicts/sword-SpaVNT
+	)
+	l10n_et? (
+		app-dicts/sword-Est
+	)
+	l10n_eu? (
+		app-dicts/sword-BasHautin
+		app-dicts/sword-en_eu
+	)
+	l10n_fa? (
+		app-dicts/sword-FarHezareNoh
+		app-dicts/sword-FarOPV
+		app-dicts/sword-FarTPV
+	)
+	l10n_fi? (
+		app-dicts/sword-FinBiblia
+		app-dicts/sword-FinPR
+		app-dicts/sword-FinPR92
+		app-dicts/sword-FinRK
+		app-dicts/sword-FinSTLK2017
+	)
+	l10n_fr? (
+		app-dicts/sword-FreBBB
+		app-dicts/sword-FreBDM1707
+		app-dicts/sword-FreBDM1744
+		app-dicts/sword-FreBailly
+		app-dicts/sword-FreCJE
+		app-dicts/sword-FreCrampon
+		app-dicts/sword-FreDAW
+		app-dicts/sword-FreGBM
+		app-dicts/sword-FreGeneve1669
+		app-dicts/sword-FreJND
+		app-dicts/sword-FreKhan
+		app-dicts/sword-FreLSN1872
+		app-dicts/sword-FreLXX
+		app-dicts/sword-FreOltramare1874
+		app-dicts/sword-FrePGR
+		app-dicts/sword-FrePilgrim
+		app-dicts/sword-FreSegond1910
+		app-dicts/sword-FreStapfer1889
+		app-dicts/sword-FreSynodale1921
+	)
+	l10n_ga? (
+		app-dicts/sword-IriODomhnuill
+	)
+	l10n_gd? (
+		app-dicts/sword-ScotsGaelic
+	)
+	l10n_gez? (
+		app-dicts/sword-Geez
+	)
+	l10n_got? (
+		app-dicts/sword-Wulfila
+	)
+	l10n_grc? (
+		app-dicts/sword-ABPGRK
+		app-dicts/sword-Antoniades
+		app-dicts/sword-Byz
+		app-dicts/sword-Elzevir
+		app-dicts/sword-GreekHebrew
+		app-dicts/sword-LXX
+		app-dicts/sword-MorphGNT
+		app-dicts/sword-Nestle1904
+		app-dicts/sword-OxfordTR
+		app-dicts/sword-SBLGNT
+		app-dicts/sword-SBLGNTApp
+		app-dicts/sword-TNT
+		app-dicts/sword-TR
+		app-dicts/sword-Tisch
+		app-dicts/sword-VarApp
+		app-dicts/sword-WHNU
+		app-dicts/sword-f35
+	)
+	l10n_gv? (
+		app-dicts/sword-ManxGaelic
+	)
+	l10n_he? (
+		app-dicts/sword-Aleppo
+		app-dicts/sword-HebDelitzsch
+		app-dicts/sword-HebModern
+		app-dicts/sword-HebrewGreek
+		app-dicts/sword-MapM
+		app-dicts/sword-OSHB
+		app-dicts/sword-SP
+		app-dicts/sword-SPDSS
+		app-dicts/sword-SPMT
+		app-dicts/sword-SPVar
+		app-dicts/sword-WLC
+	)
+	l10n_hi? (
+		app-dicts/sword-HinERV
+	)
+	l10n_hr? (
+		app-dicts/sword-CroSaric
+	)
+	l10n_ht? (
+		app-dicts/sword-Haitian
+	)
+	l10n_hu? (
+		app-dicts/sword-HunKar
+		app-dicts/sword-HunUj
+	)
+	l10n_hy? (
+		app-dicts/sword-ArmEastern
+		app-dicts/sword-ArmWestern
+	)
+	l10n_it? (
+		app-dicts/sword-ItDizGreco
+		app-dicts/sword-ItNomiBibbia
+		app-dicts/sword-ItaDio
+		app-dicts/sword-ItaRive
+	)
+	l10n_ja? (
+		app-dicts/sword-JapBungo
+		app-dicts/sword-JapDenmo
+		app-dicts/sword-JapKougo
+		app-dicts/sword-JapMeiji
+		app-dicts/sword-JapRaguet
+	)
+	l10n_kek? (
+		app-dicts/sword-Kekchi
+	)
+	l10n_kk? (
+		app-dicts/sword-Kaz
+	)
+	l10n_km? (
+		app-dicts/sword-KhmerNT
+	)
+	l10n_ko? (
+		app-dicts/sword-KorHKJV
+		app-dicts/sword-KorRV
+	)
+	l10n_kpg? (
+		app-dicts/sword-Kapingamarangi
+	)
+	l10n_ktu? (
+		app-dicts/sword-KtuVb
+	)
+	l10n_la? (
+		app-dicts/sword-VulgClementine
+		app-dicts/sword-VulgConte
+		app-dicts/sword-VulgGlossa
+		app-dicts/sword-VulgHetzenauer
+		app-dicts/sword-VulgSistine
+		app-dicts/sword-Vulgate
+		app-dicts/sword-Vulgate_HebPs
+		app-dicts/sword-la_en
+	)
+	l10n_ln? (
+		app-dicts/sword-LinVB
+	)
+	l10n_lt? (
+		app-dicts/sword-LtKBB
+	)
+	l10n_lv? (
+		app-dicts/sword-Latvian
+		app-dicts/sword-LvGluck8
+	)
+	l10n_mg? (
+		app-dicts/sword-Mg1865
+	)
+	l10n_mi? (
+		app-dicts/sword-Maori
+	)
+	l10n_ml? (
+		app-dicts/sword-Mal1910
+	)
+	l10n_mn? (
+		app-dicts/sword-MonKJV
+	)
+	l10n_my? (
+		app-dicts/sword-BurCBCM
+		app-dicts/sword-BurJudson
+	)
+	l10n_nb? (
+		app-dicts/sword-NorBroed
+		app-dicts/sword-Norsk
+	)
+	l10n_nd? (
+		app-dicts/sword-Ndebele
+	)
+	l10n_nl? (
+		app-dicts/sword-DutKant
+		app-dicts/sword-DutSVV
+		app-dicts/sword-NlCanisius1939
+	)
+	l10n_nn? (
+		app-dicts/sword-NorSMB
+	)
+	l10n_pl? (
+		app-dicts/sword-PolGdanska
+		app-dicts/sword-PolUGdanska
+	)
+	l10n_pon? (
+		app-dicts/sword-PohnOld
+		app-dicts/sword-Pohnpeian
+	)
+	l10n_pot? (
+		app-dicts/sword-PotLykins
+	)
+	l10n_ppk? (
+		app-dicts/sword-Uma
+	)
+	l10n_prs? (
+		app-dicts/sword-Dari
+	)
+	l10n_pt? (
+		app-dicts/sword-PorAR
+		app-dicts/sword-PorAlmeida1911
+		app-dicts/sword-PorBLivre
+		app-dicts/sword-PorBLivreTR
+		app-dicts/sword-PorCap
+		app-dicts/sword-PorIBP
+	)
+	l10n_rmq? (
+		app-dicts/sword-Calo
+	)
+	l10n_ro? (
+		app-dicts/sword-RomCor
+	)
+	l10n_ru? (
+		app-dicts/sword-RusCARS
+		app-dicts/sword-RusCARSA
+		app-dicts/sword-RusCARSADICT
+		app-dicts/sword-RusCARSDict
+		app-dicts/sword-RusCARST
+		app-dicts/sword-RusCARSTDICT
+		app-dicts/sword-RusMakarij
+		app-dicts/sword-RusSynodal
+		app-dicts/sword-RusSynodalLIO
+		app-dicts/sword-RusVZh
+	)
+	l10n_sl? (
+		app-dicts/sword-SloKJV
+		app-dicts/sword-SloKJVA
+		app-dicts/sword-SloOjacano
+		app-dicts/sword-SloStritar
+	)
+	l10n_sml? (
+		app-dicts/sword-sml_BL_2008
+	)
+	l10n_sn? (
+		app-dicts/sword-Shona
+	)
+	l10n_so? (
+		app-dicts/sword-SomKQA
+	)
+	l10n_sq? (
+		app-dicts/sword-Alb
+	)
+	l10n_sr? (
+		app-dicts/sword-SrKDEkavski
+		app-dicts/sword-SrKDIjekav
+	)
+	l10n_sv? (
+		app-dicts/sword-Swe1917
+		app-dicts/sword-Swe1917Of
+		app-dicts/sword-SweFolk1998
+		app-dicts/sword-SweKarlXII
+		app-dicts/sword-SweKarlXII1873
+	)
+	l10n_sw? (
+		app-dicts/sword-Swahili
+	)
+	l10n_syr? (
+		app-dicts/sword-Peshitta
+	)
+	l10n_th? (
+		app-dicts/sword-ThaiKJV
+	)
+	l10n_tl? (
+		app-dicts/sword-TagAngBiblia
+		app-dicts/sword-Tagalog
+	)
+	l10n_tlh? (
+		app-dicts/sword-KLV
+		app-dicts/sword-KLVen_iklingon
+		app-dicts/sword-KLViklingon_en
+	)
+	l10n_tr? (
+		app-dicts/sword-TurHADI
+		app-dicts/sword-TurNTB
+	)
+	l10n_tsg? (
+		app-dicts/sword-Tausug
+	)
+	l10n_ug? (
+		app-dicts/sword-UyCyr
+	)
+	l10n_uk? (
+		app-dicts/sword-UkrKulish
+		app-dicts/sword-Ukrainian
+	)
+	l10n_ur? (
+		app-dicts/sword-UrduGeo
+		app-dicts/sword-UrduGeoDeva
+		app-dicts/sword-UrduGeoRoman
+	)
+	l10n_vi? (
+		app-dicts/sword-FVDPVietAnh
+		app-dicts/sword-Viet
+		app-dicts/sword-VietLCCMN
+		app-dicts/sword-VietLCCMNCT
+		app-dicts/sword-VietNVB
+	)
+	l10n_vls? (
+		app-dicts/sword-vlsJoNT
+	)
+	l10n_zh? (
+		app-dicts/sword-ChiNCVs
+		app-dicts/sword-ChiNCVt
+		app-dicts/sword-ChiUn
+		app-dicts/sword-ChiUnL
+		app-dicts/sword-ChiUns
+		app-dicts/sword-ZhEnglish
+		app-dicts/sword-ZhHanzi
+		app-dicts/sword-ZhPinyin
+	)
+"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 526645c5b8de..8211535a74cd 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +1,6 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-core-patches-2020-4.tar.xz 12188 BLAKE2B 7162ef9e3d22367f76a9759a5ed3995f7bd5cb5ac7961778216eaf57e81611483481c72a45ec76666cf9fdc0bb05a2b5b33f3de8270efc96640847f8c6f1a9fd SHA512 13b3ca5d86dead6af53774ad5c4c74a6f1c63805fe6f3ba10ada07e081a5d3d47e06e398c139e015eeee2c5110c295de4f366f1e4bb4fb6b72d99a2a2fadeef9
+DIST texlive-core-patches-2020-5.tar.xz 13132 BLAKE2B 2117b0b44078cc4af26337c6407441ee660848e29bc190340b36be80fe2d52998da2d8799f0f7943670c29f33968c06464d92c2bce6fb238170be72d6acb2337 SHA512 65063f212732c801926bc97d639a9b71389f30b247b0299decb3d1d8a4c9770d314f348c50b9dde1d455f2531e1b8a8513eaf5fc0c35455d5dd87f3b3374d5e3
 DIST texlive-tlpdb-2020.tar.xz 1261796 BLAKE2B b070f09024a8a12ffc73f8ef6e82026b0d1cc963e50fb0b4c1226043f642db90cf18cd888b3bd4a1b559080b4a55b78b29b44d3456f39b7b9ce09e8edc29a166 SHA512 587433bada2333df2462b4adc012278f4f5f01cf85243fb0c2e46bfffa46e1ec7b34abfb8a0415eb071acd87f4abaa509b1f1c7b2500f3cdb6e127b89a1a58ab
 DIST tl-a2ping-2020.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
 DIST tl-a2ping.doc-2020.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
@@ -185,4 +186,5 @@ DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
 EBUILD texlive-core-2020-r5.ebuild 12031 BLAKE2B bc1c31021f1e673d97b7225b2e88303af791cfdf54ed1fb697405b0dd781a0bcd899a8653fee6b70951cafebda97bea495caa13953cfa0b073fcea0379fdeb42 SHA512 ae3e8885b2c4bddb166ed274750d5c45bef0e3ec5fe47db38664e97aa33fe15ea36e08dcf1d83cbe57ab652b31774a637f414e9952226e50004b7ac8a9694daf
+EBUILD texlive-core-2020-r6.ebuild 12039 BLAKE2B ab9da50e7881014ebc016b5698c12e6f2d2f8cfc175e4ace12f4b8b429963ac68e6ceb40f10f19e82488a7a7f0266a0be93c0e5ef062b55f1627470131d0b312 SHA512 8fefeff72045679b0c1117bf2868c9f2d042e6d6adceaa2d6de2b7c689e2c74886f7278cd4040de98efc7c95d935868ef37998e09bd6cc9384a71b32bd1328f9
 MISC metadata.xml 747 BLAKE2B 86f6b1dbfe55c17e841ed5cf89a20e3da7bcf895b0481a7460ee2577dd1927548b6dc7f7c618c3bc08bac73a8a33ac20632391a9533cade342d78f2ef92caedf SHA512 96e9763e09319a9f49ba9b62f09497ed422ad5d1111c3c850351f5cd13537bdeedd2cb0539aeafe09fd3cbab6dc87db7366de3994189f2123fbfc2b8090ed98d
diff --git a/app-text/texlive-core/texlive-core-2020-r6.ebuild b/app-text/texlive-core/texlive-core-2020-r6.ebuild
new file mode 100644
index 000000000000..77d159687075
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2020-r6.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20200406
+
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=5
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
+
+# We ship binextra collection alongside
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
+	clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
+	dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
+	fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
+	latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
+	listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop
+	pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
+	seetexk srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
+	texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
+	texware tie tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
+	ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
+	dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
+	dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
+	ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
+	latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
+	texloganalyser.doc texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc
+	texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source texplate.source
+"
+# Macros that are not a part of texlive-sources or collection-binextra but still needed
+# for other packages during installation
+TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/xindy
+	!~dev-texlive/texlive-basic-2019
+	!~dev-texlive/texlive-fontutils-2019
+	sys-libs/zlib
+	>=media-libs/harfbuzz-1.4.5[icu,graphite]
+	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
+	media-gfx/graphite2
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	xetex? (
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+	)
+	xindy? ( dev-lisp/clisp:= )
+	media-libs/freetype:2
+	>=dev-libs/icu-50:=
+	>=dev-libs/kpathsea-6.3.2
+	cjk? ( >=dev-libs/ptexenc-1.3.8 )
+	>=app-text/poppler-0.87.0:="
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	dev-perl/File-HomeDir
+	dev-perl/Log-Dispatch
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+	# From texlive-module.eclass.
+	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+		sort -u |
+		xargs mkdir -p || die
+	local i
+	while read i; do
+		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+	done < "${T}/reloclist"
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	eapply "${WORKDIR}"/patches
+
+	default
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-gd \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		--disable-xindy-docs \
+		--disable-xindy-rules \
+		--with-banner-add=" Gentoo Linux" \
+		$(use_enable luajittex) \
+		$(use_enable luajittex luajithbtex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x) \
+		$(use_enable xindy)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index b5cb76e4c9b7..7813200f2850 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,3 @@
-DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
-EBUILD xmldiff-1.1.1.ebuild 621 BLAKE2B 7e0be4595a818a7ffa00105ab7bec4554795ab8369ec27fd27520de6c2aa640104804c51cc52a598fa03d919b1a7e9f36d39895011292d0dc47b95ca140cf106 SHA512 1233cd14bd38ecbb28619cf381306f2f40faecfca36a2d9c7cb59453b406f70815bf9b27c3f18f7a2ac5e8c795427ed8004929056f57876c207a6c2f3490c011
-EBUILD xmldiff-2.3.ebuild 637 BLAKE2B 908df70842ed43f600cfa4e54f17fc2b030625ca658834a68c09394ed333e5ef291995abe987b1708773af32d1f559e42b6a2cfb14946a426cea2b5c8133ea11 SHA512 7dd9509c4d88024bca2b9d5f58a127b2358ac4fc303e4c2af9a455280ae491acee9d371fb991183e5b834ae0170db0c94521e0d4982d97866c548bc0d5c2808d
+EBUILD xmldiff-2.3.ebuild 636 BLAKE2B 2624f1ede10d236dd47d79c9a1773001d5246ea5363271d1b6823ad49ce7836fa2f117877c45c1ab8f5799422b27376d6906ff5fc900eef501395ff29c0ea9f0 SHA512 31e29d00d330a3c198e7a0daab2ddae51d0604352df01e350bcec40eb4b0e0b1bd6d7bf39b7937229012fc3d9850b0f14b93e74408eca616f1575bcf3994c510
 MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
deleted file mode 100644
index 8f2480fc7ffb..000000000000
--- a/app-text/xmldiff/xmldiff-1.1.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=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future
-	dev-python/lxml
-	dev-python/six"
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst TODO.rst )
diff --git a/app-text/xmldiff/xmldiff-2.3.ebuild b/app-text/xmldiff/xmldiff-2.3.ebuild
index 002b81caa48a..7508d2f18506 100644
--- a/app-text/xmldiff/xmldiff-2.3.ebuild
+++ b/app-text/xmldiff/xmldiff-2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index e262d9f318d2..0d6ebf84927d 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index b5ad045b5535..920dc66ab572 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -2,5 +2,5 @@ AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb8
 DIST aunit-2019-20190429-18B77-src.tar.gz 624683 BLAKE2B 455c3566ed46138116f258b175e883a59102dc334b41040cd6a332175fc4138d7ccdab1357c5b8886f14e551e3a6f4f4aa73eb755ade4a7a1663ac2d999973ca SHA512 9b1834ebacb9dbaa7a01f702455a44921a26a8d8d00f55ecc2fc8ddf2d884ef2ef2bba0f62551421f5a47d558d0fba88cbd57671459bba0c9f90c6310d714b19
 DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
 EBUILD aunit-2019-r1.ebuild 1114 BLAKE2B e3e407ab3a5d1ba65b3c66c974f3b5e9f465db9016a5e1b6fba6f32d0c03e6f8e6c0a3e180080746900fe02564ba4b051bff770c88413bd68c401563530c44c1 SHA512 a157a9e1dddc297fdb1f5e40174316775f8ea9fde182b255afa5d843b76646076060c5c1ceb32467eb63869b69aea5a6b9140136ccd49a0f24461d1e90315627
-EBUILD aunit-2020.ebuild 1161 BLAKE2B 628b06634f15cf20bb0e81c42b1346e92f83e385f7588fb78a9fcee6415f90fae94661207a877053baff88993cd385417c543f5261fe728d1249cd8645d9683e SHA512 9d0e8a40be1f0066d311500d860ec10365cbe4bfee9e34c6581efa6e2bc0db50a4fd1f30fa3eeeab2d50b5499a15f37f0ee5ed06e1c2f15366d93a70b012d336
+EBUILD aunit-2020.ebuild 1159 BLAKE2B 508c9dc4af733a86a118bae00f85f76beeef60d6ce5b57e5293fbc4b239848c907aeb2994b70afdcd12160d9df71d0d03c8d195730df1c4024598eab05e81deb SHA512 79e7176120513541ca6850a6dc94787b83591ce7acca6702f670ade16567753b1cf058eac10b08a29964ecc8213a8506a6013eb5a9b1efc916ded73f3565a207
 MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9
diff --git a/dev-ada/aunit/aunit-2020.ebuild b/dev-ada/aunit/aunit-2020.ebuild
index c2cfc06360d6..f1426b1a3cfd 100644
--- a/dev-ada/aunit/aunit-2020.ebuild
+++ b/dev-ada/aunit/aunit-2020.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44b
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 1b4b3541a94b..69f7b8f4ce26 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -6,5 +6,5 @@ DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33e
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
 EBUILD aws-2018-r2.ebuild 935 BLAKE2B 008b7dfdac6b1ab61b64c9d9d63aef6349ba5d74c8872fb387a9544f6caf78b33e14e82b3872f83088d4dc4b741fe5746fcc6b79c3cc0ed31dd72090339b13fe SHA512 3e1d24cae29ad40fd31368cedfa8a63e86366aae45e4e2aa79bacbb883277ea74e71130dc6e801fd623657a50f8150fb4ae2a9469ad7c4a33899165c26743357
 EBUILD aws-2019-r1.ebuild 892 BLAKE2B a364986dd0a40544fb4915ce6484d517f62437468a55c01189751b3d9c0818acea43df3db2ff29de97736fc045da9c3346bbeff77ccf73e146cf80e68c433c7a SHA512 c394e76af5ba613cb8d817b563947f8d12a988f1e2d024ea31c95bd0f361a342ddf30a769bf77a8dc9c001d404e65afb609997130f3a08cdf63940497e0f3603
-EBUILD aws-2020.ebuild 931 BLAKE2B 9c8c153f54348dbb91aee21b3e0204cb47da3e2cc7238ee405b0666d8bc8a213819b3d1cf40fde3aaaeebd965f97231da24e118c7c6be8bf35025a36967bd670 SHA512 f48bc0f229c8d11b4236a49e17290b384431e87270e23b744c4b9324a64064d7c99590494c53612dd152bd4ba0ae973370ab68f60abb3b2e62f1d0509dcfca2b
+EBUILD aws-2020.ebuild 929 BLAKE2B a93e4cdf292eb49684af50ee21bde6e98fe41c3b31ff69aaf7b75e1da5bd7a75f9503bab35f557e08803505cac16f63814bd91752c73f2dccf416e23b2510cd6 SHA512 e63eb249375c7648477d0337d1a47111b5f21e746884380d4d13a91121811d4b6c19e2b31a0602ed3aafaf15f951d51a05ead51a1e718ce0666c89260d3c34d8
 MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2020.ebuild b/dev-ada/aws/aws-2020.ebuild
index 9efa0313e567..d33c830bc500 100644
--- a/dev-ada/aws/aws-2020.ebuild
+++ b/dev-ada/aws/aws-2020.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65a
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index f37db6ae6a31..3560974dfa07 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
 DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
 EBUILD gnatcoll-bindings-2019-r1.ebuild 2183 BLAKE2B 0406c1a302581dacd187b74cdf44ae71623ffc41426ad8bf15373bc84ac854be225490ababea7bdf5f22055ba94398fde7b9af5e3de552500f29f23d09de0e2a SHA512 da2e5688800c07c427918cdb67b0fb3f531751eae2d1f65c7a7e82c228184f7bab5d50af3d39937cf43cd8921c20099bc7bb834883fa0c849e2c5d73047e3405
-EBUILD gnatcoll-bindings-2020.ebuild 2255 BLAKE2B 6baa307af1ea2e0ab3016765abb0d9bc8291ea0df175167bb1d42271d01386b9d39e6d7d11ba7de56e6fa58633538171a33b0348bb1a59c95591ccace98f6dd7 SHA512 c409abc18f53bae4079a4c108ef1fc7327b6afdf12f162ea564e371ca7e46bbfaccf8d4ff49a70d9b8e5b7fe17a5f7ee5015f77314dee9de0b28b26e8a1f6b07
+EBUILD gnatcoll-bindings-2020.ebuild 2253 BLAKE2B 00ec0729f977a952d5c604c40478a44ed72584b84e6451274f12ecb5f8e17149dd69f2c47acf6237c842f4639255555adcc4214a361126cfb9a61da81c3465be SHA512 f46488f353a16f20b2a011da201bef22e7c7b6e17fee7e92e5bc5dbb985778c2a39f1148b230d21ab9f871eba036e0cd1a19d552f0bcab7188cfae560c3ce832
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
index e5c1fdd5914b..0f52f08c86cb 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 0310b11b0eab..9a7669af2769 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -2,5 +2,5 @@ AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d40059953
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
 DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
 EBUILD gnatcoll-core-2019-r1.ebuild 1521 BLAKE2B c968eba624a3c5a1c2fda36f63e90a8f02c6f8aa072925447cac7051202165a5dd461b0aab0276b879a259322753d9dd2f54dffe07df211195581ac9c1149879 SHA512 373dde5f1ceee4264137f8ba60c2288754610f5609cbe3be0f45cb0182673377434dd3ad136e23bd261e6822bb7482d5847bb552471dab98219712fc243d8b9b
-EBUILD gnatcoll-core-2020.ebuild 1575 BLAKE2B da5fdf4f52a5e1a3d84eb06656029d35ce3dae46a3f190bdb9f75d549a8e9cbded54fd0654477c332b5a52411d778467cb7d8f8e4967e2bf3edd0d714967d6ac SHA512 1810eb0b48439de97165b2c9a5f683336116e554a7e06c9609b149e1ef7f483cb86041c4d38954e9db87b1fd17f0ef9ea4154f7944dfa458453cbf5b26463a82
+EBUILD gnatcoll-core-2020.ebuild 1573 BLAKE2B d7593e3a7c2ac7a5abbed1ad802872029f6cb374cb12ec5d04bd42c8d2efb5fb91a72b37b70d79a28f81e5f859e07ea273917ac5a317aef741e696fc7ed41339 SHA512 05f9861d9177680df0a5ad5994346e3c7890c45ca4f8ca2d4adc027281f3952a0929b4a8d782d10c2e4d5bf7c5b94a218dc74debe15851bce426cc385a8591bc
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index 5eedcf63d7e7..40b7c90fb6f8 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 119426443180..9e826eb3c045 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -10,5 +10,5 @@ DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c95
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 EBUILD gprbuild-2017-r2.ebuild 2003 BLAKE2B 38de852e3e89d34fb0392f13b81aa1a615551874a49a0a825ff4884c4e3efd9d1252bed78a83c175c65547571b6c565bad155fd153e219313e0a069e570cd63a SHA512 629b7a22ff13c049bcdf7e6413f0059d9c223958f41861aa8ee15a639fd8553de9011936fb328a98c5dd1b33ff9eb9b2f62cee76c35f69886d66457932ad2761
 EBUILD gprbuild-2019-r1.ebuild 1868 BLAKE2B 0da947626ada0499ad24a66f696556242e9be465b728636704a2c7319996620fdf57a8d196b51be6b6ecd0c24b461f9a53d561d8f679b202de429b2e2ad81275 SHA512 570882f4afca2d40885c505a5b1fc60f34692b931068d273e582804168059ccd57998db2603743fc647a8aec27401140e3b64182554e76fedfa4793c86aed241
-EBUILD gprbuild-2020.ebuild 1987 BLAKE2B 1b62dd96f7caa37a1dab074574206bd66c2b98d1fd684a372eef45c390b3941460bf864dd6d1374ec998abc11b8b3bc05ae07f82b03f2979e1ff619d3b986a07 SHA512 ff4dd748cd44549567a2bc3e3888ba28200159a469feb47d21d176574f8f3caf7f7eaceeb653c9cb4c659b655a4c44739aa86ba4d3fb57777945eaab8ebf21fc
+EBUILD gprbuild-2020.ebuild 1985 BLAKE2B 0a287f601a6ca3ebc4c50b361b8adb9e4aa5dd0e69423fb5021823b8465bca6d584c20ca50669bdafe4374c2e1f2e4e5b6c09bdf2400ee92b5521fed5e4bae8b SHA512 a70327ac3083fc432c74f3297c001f5e9c7425a9eefbfc54cd46aca16b8ddd704f73ac8d1c819dadd3a2412972a35c839c9a8b04b8530a7ef0b362e6c7c48da7
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild
index c633f202b550..9d14bd49683a 100644
--- a/dev-ada/gprbuild/gprbuild-2020.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2020.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 		-> ${XMLADA}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="${ADA_DEPS}"
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index a481d71a3c85..4067a63f024c 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,5 +3,5 @@ AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c43
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 EBUILD libgpr-2019-r1.ebuild 1407 BLAKE2B b3f88bd6116977c382ba3c8164ada748af412c48a51333b7a0a510bdfe4e0ac08b72cb2045ac976a67eef6847cdf84308bcec3dd6430c7a6e5aa74f334e99182 SHA512 a182e1dba2020ad168bd1711afbd55fd8382039f3a23bb09b54afdd3b77c4ff0c5893c064020044354e2148c9b6ca82217f1ee7fccb9f93240c4d0d5e022c630
-EBUILD libgpr-2020.ebuild 1451 BLAKE2B a99cc8becc87532c738062ca95aa94cdd45b40b17ffb727f7dd70137a9d7ca171ca325c2a15a968bec4a4ff4b769d55d4afc10404c1d9a99f8f3736114b4b171 SHA512 c51f63795df992d71c392515bbdda6672222153fa1a50d065b863ef1445559635b7d111d3a53f4470d0fcfbdf64220c43c54e2b53272b7fb398114ae7c9a70c3
+EBUILD libgpr-2020.ebuild 1449 BLAKE2B ad317edefd6fa4cb5ac69b6b18d8ffb7e84abe8efd8813a7a5c8e67434d0a9f8d1ba7091a71650bf1014a1c62aa7b02b7bcd25e51b5942b23664a37708e2e984 SHA512 a825b5fff9a81411da1790faef490f103aebc728c03e8892b284cfe71b17494393ed47a145e79a3fb246a816cabfd45ecc29a72f3e69cbd7c8689e468069ac59
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
index df18b03f3959..8c5317a4755a 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1
 		-> ${MYP}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 22d42e7ea335..598fca89bbc1 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -2,5 +2,5 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 EBUILD xmlada-2019-r1.ebuild 1755 BLAKE2B c99e364b968451b1264622ee0aad3212966aeb8ca6875736f55127f7e997ed301e5df3ddbb4d748d63c70e0e42d7a2742124f0cf06bec503b50d49ee958a9113 SHA512 894a656bf01a4a45554b9c3babea6e9f0ec042bc460a8efda31a53b8456d61d284dd05fdf601aecf396d4bda4aced610382394282f4af781298d0108eb4c378b
-EBUILD xmlada-2020.ebuild 2036 BLAKE2B 5d863890ea765b70ad947c86c33e5fe08887e4716f765cab76383f99e7de978f94e08f4500ecfe594c0781be6f0633dd88940911e76382fbe1a7a9319b668844 SHA512 f71734e9300492633a0524a27142da1404d0ae20e09c7b5221b54196466ec30026fce98f8de68bacabb17e46a112b1875c8804e33713556f902bf0f31aa93697
+EBUILD xmlada-2020.ebuild 2034 BLAKE2B 807fbf7d7da746f5fbd11d9a1ff5b6405f4d2360caffb2d1322c21d1634c442b4185d6db449a64fe36bc32f0489e7727b4fbc997ad6a42b79aac5bcb3cd0ced5 SHA512 421e18b834a4211b61a40839660e6767d665c6042ac0eba2e163cf8d5e10024f187ebc1acbfcf4f880c7a3efc2f9fec67d16ea0f7b3bfe9b038ff70cbb3a28ac
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index 50ecc0beceda..4fe97505e826 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f62
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c7134faf0b97..7d86f101e26e 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 53a8785d2fda..d99777d484b5 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -17,6 +17,6 @@ DIST redis-5.0.8.tar.gz 1985757 BLAKE2B e46af2133e066ccb91a8eb2c2fbfefe3747e1cfa
 DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 DIST redis-6.0.6.tar.gz 2228781 BLAKE2B 42396f464611cd5d83a79a97d2e4f74c0adabf9338802ec748c24f6ea46d42c6e51fedecc5cd26c7cff6b2a3c7a26bbbf79db7a54a6cbeff388587d186268796 SHA512 bb60aff6e495b201fed814eb134e6ce2825429ef6bd52215c7369eec941318ba460d60ad7b0cef3684b3f992823d465869177dc1d0eb16886bfed598dff74f65
 EBUILD redis-5.0.8.ebuild 4669 BLAKE2B 79265c316a1ecb3a7ce5bf5b0af70c68ba9cf4f0439f67a190cdd19dc16158ee40b7379e088de990b122d21157a6aaa415f4f70e1e237861fb5c268dc8e60175 SHA512 340ec29034e795225dc54a2ccb120046bbd8ea3d241988b6ef10d249f3070e17857098d2d3c742e6737205b3adf5b0fbafd79ec53d0fe0ec8caf6abfcd2e7f78
-EBUILD redis-5.0.9-r1.ebuild 4742 BLAKE2B fb214bf48a925cd55376da7024f90526a2fa3b54b04d00a3b58ee7cc691dfc898610a0b506a0d452e33b5f5fadd48f0bc455973a87dc9c2fd9bb9ff6ff70e4e7 SHA512 fc3ab0d0d1ef1cc4e711cb7185b37f9e149472ccf5352a46caa5d26a80e5678c40dcea7dcb73d839d9b292b497d034b45f960099775696e87c7c88ab530bb5cc
+EBUILD redis-5.0.9-r1.ebuild 4740 BLAKE2B 31bacb413bda5324df87af4b38e1392752a77f71e6ee0d8b9d7b0391c876e8bb6dd086bc89fff0dacf826e5443b5c888d6f9c34a913321278c04fdd7df180215 SHA512 4e0bafc6da5e16897271ad29ac3da694061b12973dd25e3fa2189860229a98a28dc979482806c270fa168879762c772b5a7f109474de020f7c0b050d903c3f09
 EBUILD redis-6.0.6.ebuild 4705 BLAKE2B f7082975e525a81280bbbfef7ca72e662cdcde23391f033cd7851c8ec780d3239cba21b71a0808a721d28356233590ec41eb6160f7e9c4b82664ceb7ae33e9bc SHA512 47cf629bf66800b00a545fff07aecc6889bd28c526e666763254d8598e9ad8dd567c08c73f3c006843f161f369278bca27e3b62a3927ac1af1ba18177545d6c9
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-5.0.9-r1.ebuild b/dev-db/redis/redis-5.0.9-r1.ebuild
index be46373df0f0..93a792860f43 100644
--- a/dev-db/redis/redis-5.0.9-r1.ebuild
+++ b/dev-db/redis/redis-5.0.9-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 arm ~arm64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 584fa1679d9b..1b79ec67e61a 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/adjunctions/Manifest b/dev-haskell/adjunctions/Manifest
index a8e1acfe4535..ed064bc70dd9 100644
--- a/dev-haskell/adjunctions/Manifest
+++ b/dev-haskell/adjunctions/Manifest
@@ -1,5 +1,7 @@
 DIST adjunctions-4.2.2.tar.gz 15442 BLAKE2B 8e8a7405aa4e2d0e17acae9c22220b9dea7b1cdf27aa7969143998c1f81710cc22e85d8f896b1c981e0b1d2557c2e84dff891c48fee1a7738020d1b34813a544 SHA512 039fd506839a1955d89e7c4ae3cb6c824e30a85b2f2e59de341b8b6f54bf2f363f047902a619dc35d6f86e5e71c1f1741181f1d2b86a233557d37b9f873cffdf
 DIST adjunctions-4.3.tar.gz 15651 BLAKE2B c63a84d01d50db942d6f6f58e8244322ee135eeee22f4816d01d7aeec314151a2f0a0fde2958d5c6707bfb59d008d5c6bdbab3a97da06ca442b12c76a538add8 SHA512 8045848e84627f4458b7784c5f50d81e6482daa9a9fea58eec32630cca825fc9a616474992b1ff74bb16f1ae4aeb464fa0ee1906d0e613f341138b39cda8ffa7
+DIST adjunctions-4.4.tar.gz 19891 BLAKE2B 6057f990bbcea406e2c12253828c1defac8b7b1eeeff4b89054b528fcea94b80df9bc8672cfd13783aaab6864acc708d0c1428dd72800c695db5f29e7954a96e SHA512 30f4fb8a30d8428e032d322a9a627e7ebc44b2c737e87670907134a5aa6019145f2c3e6b2e7f8e00d5ffbe1ce4b4a5c812c3ee976257419d7d429b19db28918c
 EBUILD adjunctions-4.2.2.ebuild 1391 BLAKE2B e7282d3e484def270107fb43888114baf1a931f1352444ced538353ff0dce4c0754068f56214abf92269f4de2d50e763b33795d88bb94dbbe82cbc054b7b0267 SHA512 41841578dafa5528d31914b133f0d4b5fcf2d260a61d69b870a7974fbd0dc8dca135d427641d9c3a27022d5ad5e45b8cb5187cf5c7c8f3484bab1f305e06ba6b
 EBUILD adjunctions-4.3.ebuild 1489 BLAKE2B b8c17870f16aabbf6b010cab6fbb6de8ab5252afb4117c97daef4f9a27f6a654de850e845349dda04702339625be7fc80f7d87643b785bf0880d670ce82713fd SHA512 8c30b72c736aa7960deba4622da0802621925cb5be449ca004549cf974c202f87c6f49fff46d38180d900b10b0044f0badf3ffc8bd16a0b09adfe5d3a1510894
+EBUILD adjunctions-4.4.ebuild 1663 BLAKE2B 566ad3d1d0eac6271ba89f106c66c26bf17abe441e0af6ccec0b4788e6492888f2a91a238c44d2d87ba042cf4fa739110b04dbbd0c727314e7d815b413ce2c89 SHA512 4ea5b34c8f2eb53be908ae79241abddaf17d13d201a6f73ab35d88b9de9583ddf5991ded7e861272f0e16217d494d6249776c9d35c9af06c40a360eb9e19f7cf
 MISC metadata.xml 385 BLAKE2B 3c25c4215d88413d47e1b859f2c80d9caa7f0c822f022582dcdb8e6444754c65bb15a80327772c1a405ef6ddc38ef08abda615e174dd2d6e642268b906e7f6e4 SHA512 04b10eb6db339f470d8a50fa5288fb6bbc1d783497c788177cfa005b9ca3076b4fbf3d3897d18e3fcca910d08694b114e3cc0f480f3bbf64489251c9a9ec79c3
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
new file mode 100644
index 000000000000..fb56b2288d83
--- /dev/null
+++ b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Adjunctions and representable functors"
+HOMEPAGE="https://github.com/ekmett/adjunctions/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'containers          >= 0.3     && < 0.6' 'containers          >= 0.3'
+}
diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
index ed0c045a702e..0b2c9f3303b5 100644
--- a/dev-haskell/aeson-compat/Manifest
+++ b/dev-haskell/aeson-compat/Manifest
@@ -1,3 +1,5 @@
 DIST aeson-compat-0.3.6.tar.gz 8956 BLAKE2B 82a201543c2719e2bffbca1682e4181980ea5a26b7f0df782b5a5db7f99cbd60c477988d011ef8149f9f93fe8740935ef1fd174881cff62431d830b82da08708 SHA512 2d2bd172a1335886894df73fbb999ce5b8ae5ff710866560278b4bcf27a5ef4a2ff025a0a97cc4f764e85819bf6a9771bdaf7acbd830f1baee5f3133ff5c185d
+DIST aeson-compat-0.3.9.tar.gz 7441 BLAKE2B c370023ca56ddcd1f60cd4ee57e29299178bb04f9fad274e3109424df926c357faeab4e22416938b71f5f3109cf90ed8b3282fe14250ac17c872ea887998a8bc SHA512 84da7cbace32527d0e20d32415ba770d14417ad4dd9ca0f86e8b5f100449af8a51a7b32c7dfdd7b3557764bd7dfc9ae4aa0a95999bc34b074f49d243a4f4bc46
 EBUILD aeson-compat-0.3.6.ebuild 2117 BLAKE2B 7bff5d6e8ccf25eae9541c2031e4d7a7594a33a785480ff2999fa6dd3c897a0c6e6d8af0174b9af8584f146f03c3f306d84fff37bde510226eaab2e99ac49569 SHA512 bb6e1730791b3f42c9eceb1cffbf48a711790d5afeb52a5ec1a445ed865f3ea5f01eb25ac3c926ff14475326d7387e757f360b984aaa0f0323e5d68c4b3460ec
+EBUILD aeson-compat-0.3.9-r2.ebuild 2633 BLAKE2B fef286f819dde479ecff9f2607c5ead6d5815e29759ea00943e354a944a8831028747505395222aaa3f3555956d2d1003699f1a19803e6eef6b27a33c93fda49 SHA512 1c71693bc6fa9fb10b02b4e912769659dd16c55f25c6e13d382181a386e012d5d442c16a99ef8b80358a50498052e9da654c80df2943e9bf3647fea69eabe982
 MISC metadata.xml 406 BLAKE2B 1c0f6ca620c1db4eccc6f1cc9f681e86ec441b2319b1f634b6c4d6317da0446820e5aa7a3ba51b7e9d3068286f1af8eea8df1c78517a514870b9bbb66666dc55 SHA512 9e9212d62d26253da1ea61274f831d6e799d32b0d888be0b341df2dbda4edac71023beba570ac3b58f244359736ec51f9e20053962e6995696f824a247fe5283
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
new file mode 100644
index 000000000000..afeccade5caf
--- /dev/null
+++ b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility layer for aeson"
+HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
+	>=dev-haskell/base-compat-0.6.0:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/quickcheck-2.10
+		>=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                     >=4.6  && <4.13' 'base                     >=4.6' \
+		'base-compat              >=0.6.0 && <0.11' 'base-compat              >=0.6.0' \
+		'hashable                 >=1.2  && <1.3' 'hashable                 >=1.2' \
+		'semigroups               >=0.18.5 && <0.19' 'semigroups               >=0.18.5' \
+		'time                     >=1.4.0.1 && <1.9' 'time                     >=1.4.0.1' \
+		'tasty                 >=0.10 && <1.2' 'tasty                 >=0.10' \
+		'QuickCheck            >=2.10 && <2.13' 'QuickCheck            >=2.10'
+}
diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest
new file mode 100644
index 000000000000..5e63526a1e5c
--- /dev/null
+++ b/dev-haskell/aeson-diff/Manifest
@@ -0,0 +1,3 @@
+DIST aeson-diff-1.1.0.8.tar.gz 16521 BLAKE2B fb72ea03dc4b35791f151f22c4fab3f9cafecd604c520137c79af5e4c71772399516d0120bd01e2335fbf7747525babedf5603e5e8d3ba244a9907c81c9f1ea8 SHA512 5a5f703dec592c0cfd825eb1899006350649c52bf810ff1aaaf4134ebfbc11f5fbe9e7f158a8c3a21dbef4902b1f9e94148bc116e27418b2b786f6d31c7561fb
+EBUILD aeson-diff-1.1.0.8.ebuild 1228 BLAKE2B 1a600f0846782dca0e39d857924ca263d2a7f15e061ca1b8aaa9f492a4adee06f8662bad77199f5a4d10eaee208857be915ec1c66effec3c98b80ae5c746b44f SHA512 7e410a2f69a139d87a4f43694e5feb069ff58c53463f0a680a81d76b8ed25d77e3ebff4eb210360a80aa37f6ba581f26bffb245ab72ca587586a5b959a219afe
+MISC metadata.xml 500 BLAKE2B 469c9336ee00e6fb94f366be1b5d1cc261a190b6359cfd4dd213045b9ce1b2f98e3f18dcb239cff1018698713e5fb70691cf15aaa4926dbef2084bfffc98b535 SHA512 8f041437e868502b07c4dbfb7c958c5a7f7acbb7ab8a9bb6ab271bbbea995f59f6ab181d3cf1352a9ef5b40fe5a00b5560b1be73384dace26459c791c19388e4
diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
new file mode 100644
index 000000000000..d44881aa49be
--- /dev/null
+++ b/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extract and apply patches to JSON documents"
+HOMEPAGE="https://github.com/thsutton/aeson-diff"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Ambiguous module name ‘Data.Vector’: found in multiple packages: AC-Vector-Fancy-2.4.0 vector-0.12.0.2
+RESTRICT=test
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/edit-distance-vector:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/doctest-0.9
+		dev-haskell/glob
+		dev-haskell/hlint
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.9 && <4.14' 'base >=4.9'
+}
diff --git a/dev-haskell/aeson-diff/metadata.xml b/dev-haskell/aeson-diff/metadata.xml
new file mode 100644
index 000000000000..e984d020b504
--- /dev/null
+++ b/dev-haskell/aeson-diff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		This is a small library for working with changes to JSON documents. It
+		includes a library and two command-line executables in the style of the
+		diff(1) and patch(1) commands available on many systems.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index cc271b6e9347..e089afdab32d 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -3,9 +3,11 @@ DIST aeson-0.7.0.6.tar.gz 141565 BLAKE2B cad9f7826ee36241414341a50ad3bc5f2540412
 DIST aeson-0.8.0.2.tar.gz 143850 BLAKE2B 23c8167d29d9ce82b43ca07904ba21bb6e6c8fba8a0bd2cc4a94bdc6869b338f728238d5a824425b2438515b39f0aedcf3d105d0a37315bf955c0f1cd623ea0f SHA512 fb5a976302b1422c11b0d20848dfa6b9f596874e59dd325868269fd61f4b2ee2b4bf12683c3758d7f24566564cfddb6426e64fb1f159bb8feb2eb35fb223caf0
 DIST aeson-0.9.0.1.tar.gz 154482 BLAKE2B 4ad5b665b1659279f5788c8a665916adc487bbd74138886b0dbf71eecfeba47d65734173e54062bcbee051f41bd7a536cd331c5f8b57c64a2b3aa4881f314df3 SHA512 04de524b10843fb12f8d51e72560d67a94e761edb515c472d891a61b56ab867c8fd8ed26d5fd7b2dc637a9b7ac1705e764a104e9253342984b755bb0f0e9128c
 DIST aeson-1.0.2.1.tar.gz 241837 BLAKE2B a8a4e0c9315c0e3b1a35ea9f87945200a324383e0cdcaf941809fbfb55f4c5d9e94206059d1457a3e825c2a52fdad16544e0b3aba09c35957829a15b28972199 SHA512 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e
+DIST aeson-1.4.7.1.tar.gz 277911 BLAKE2B bffac6e82e7220f270fce44055859b27a97740b6f012f4e51d0970acd38a7bcd40d9bc3c4f1ba1df0df4d3d38dac0b8731dfdfe1f902b07a38efeaea842587d2 SHA512 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705
 EBUILD aeson-0.6.2.1.ebuild 1114 BLAKE2B f8d22044d1160ef1f7bb77b0fc559acf766b8fe285dfe30bb15393923f76a0f35086ee9ef8bc26c516630a1532d56766a5a5b36e69ce19cc273905794ce59464 SHA512 350d826aa92e6767998bf997bb9d7b39166cf153eb4e075416451e38dff0778bf652ae353b6c1004e97ff33e9db4616473a3c44d68ee79e4ca73890103d7ec4f
 EBUILD aeson-0.7.0.6.ebuild 1385 BLAKE2B 756b7db8ebf3bc596e0ba0297049c2d709ba092c55f4e9ec689d52e5d9eb496aa4e2c9a0be150dc32f67277baf49fd3fc32f0906b5be70d3408df1c4d24d3a1c SHA512 76f7e13df2819569b4c0efef85956ddfa1f33f483d7d0479d7689e49d456db2feaf4a344b5245908c6b754773caae983c075367af299e1e4f356c5052c441299
 EBUILD aeson-0.8.0.2.ebuild 1242 BLAKE2B 027f008fddcb0ac697639bd5199fe5eaa41d811ba8f85a4a18f7d7983c02da4d34b2bcd6b31b224acd6afed6e25a07df2393451bf26e8c23d9cf62a701b5a210 SHA512 3ed770a19261043fc044fe86b1486014a2957129c875f7d46a5ed58e21268264415cd038da10c5449b2511945ab8ba9498f0221a71ff0aa4de0a082cf4efedd2
 EBUILD aeson-0.9.0.1.ebuild 1316 BLAKE2B 5341afe4664de7330cd810cbf1c6951284ea5e24acdba2abe554d67959d35e36bcbe21ca381001ce168b6754bdfed6140882e13940089ebb6dfff43c9f3c067d SHA512 fc9545bfa6aadaeb6c10e621406895115f919cdc55f41fa43d63770f4b2d35e1c78f62117e422e90a33fce44a81444f915b4eff67de4b73cfc59e3350a2b2a56
 EBUILD aeson-1.0.2.1.ebuild 2054 BLAKE2B b397e7d0f41615308fce5ae011d7384080c48a5047d940f41a9f46c67dd56178df713d77eb5d6ecde815ad126bcab7c98e76130f927da9b33a21908f2eb47abe SHA512 1d1082708aafe189d84f17ffbacc4ce6f27cdb5b86c0b89df27a620842c2bd045fd6f12432f4d4991ded9bd7b568dce47bf6eba2076bb7b799ffe71fea69b761
-MISC metadata.xml 2376 BLAKE2B 287afc42dbc1f2e4bb1797968830fa1098d07d573f700eed42c06d5ba1b78e9cd578dc343ed753684316bd2168fd61c1428eea9c249db530b9741f65db95f698 SHA512 413b1102c88c193a86c563e1a74a9a6320a312037b5992d862ffd889d345917a8c9d406f49e2c05e8eb95d436676d4e69cce4fa0a267d33b772ecadb45a70e2e
+EBUILD aeson-1.4.7.1.ebuild 3016 BLAKE2B cca901c7d0e1e3892d8f6feeec1f6466fb4b3383b29e47b4f7c39cc7a139b5dede445f2de99190ba4666be57bceb58b640a6c0da9f422b4d1b2380bd97091447 SHA512 65c1366c1d7548654a1ff11d6975cc7536ef2ef3a62fc70e63e451140d6f8ca8f2511d27d8e2eb5cef3b31e37284c0c1fd20e856c4272dacab18111f7dc957ec
+MISC metadata.xml 2436 BLAKE2B 87b05446d30b70594247fd2bd04a9773236556816386c2fa4fd091640d83db60b816ec6fd44cb214fc6641d6063275f276507c07d0650f49f804d99032e1b165 SHA512 a59e16e85998fdcc3de3445928901365682af5af422a3b38f5470a67ae41a33a386532b66ac153383c978cedee1735fd98f1d385cf3f4d56041dbd5a805bc01d
diff --git a/dev-haskell/aeson/aeson-1.4.7.1.ebuild b/dev-haskell/aeson/aeson-1.4.7.1.ebuild
new file mode 100644
index 000000000000..cbb99b44a856
--- /dev/null
+++ b/dev-haskell/aeson/aeson-1.4.7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -developer,-bytestring-builder
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast JSON parsing and encoding"
+HOMEPAGE="https://github.com/bos/aeson"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="cffi fast"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
+	>=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
+		dev-haskell/base16-bytestring
+		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.14
+		>=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
+		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
+		>=dev-haskell/quickcheck-2.10.0.1 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		$(cabal_flag cffi cffi) \
+		--flag=-developer \
+		$(cabal_flag fast fast)
+}
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
index 343bb16f130d..057fca61d1ca 100644
--- a/dev-haskell/aeson/metadata.xml
+++ b/dev-haskell/aeson/metadata.xml
@@ -8,66 +8,67 @@
 	<longdescription>
 		A JSON parsing and encoding library optimized for ease of use
 		and high performance.
-		
+
 		/Note/: if you use GHCi or Template Haskell, please see the
 		@README@ file for important details about building this package,
 		and other packages that depend on it:
 		&lt;https://github.com/mailrank/aeson#readme&gt;
-		
+
 		Parsing performance on a late 2010 MacBook Pro (2.66GHz Core i7),
 		for mostly-English tweets from Twitter's JSON search API:
-		
+
 		* 0.8 KB, 32-bit GHC 6.12.3: 30538 msg\/sec (24.9 MB\/sec)
-		
+
 		* 0.8 KB, 64-bit GHC 7.0.3: 31204 msg\/sec (25.4 MB\/sec)
-		
+
 		* 6.4 KB, 32-bit GHC 6.12.3: 6731 msg\/sec (42.3 MB\/sec)
-		
+
 		* 6.4 KB, 64-bit GHC 7.0.3: 6627 msg\/sec (41.7 MB\/sec)
-		
+
 		* 11.8 KB, 32-bit GHC 6.12.3: 3751 msg\/sec (43.2 MB\/sec)
-		
+
 		* 11.8 KB, 64-bit GHC 7.0.3: 3381 msg\/sec (38.9 MB\/sec)
-		
+
 		* 31.2 KB, 32-bit GHC 6.12.3: 1306 msg\/sec (39.8 MB\/sec)
-		
+
 		* 31.2 KB, 64-bit GHC 7.0.3: 1132 msg\/sec (34.5 MB\/sec)
-		
+
 		* 61.5 KB, 32-bit GHC 6.12.3: 616 msg\/sec (37.0 MB\/sec)
-		
+
 		* 61.5 KB, 64-bit GHC 7.0.3: 534 msg\/sec (32.1 MB\/sec)
-		
+
 		Handling heavily-escaped text is a little more work.  Here is
 		parsing performance with Japanese tweets, where much of the text
 		is entirely Unicode-escaped.
-		
+
 		* 14.6 KB, 32-bit GHC 6.12.3: 2315 msg\/sec (33.1 MB\/sec)
-		
+
 		* 14.6 KB, 64-bit GHC 7.0.3: 1986 msg\/sec (28.4 MB\/sec)
-		
+
 		* 44.1 KB, 32-bit GHC 6.12.3: 712 msg\/sec (30.7 MB\/sec)
-		
+
 		* 44.1 KB, 64-bit GHC 7.0.3: 634 msg\/sec (27.3 MB\/sec)
-		
+
 		* 82.9 KB, 32-bit GHC 6.12.3: 377 msg\/sec (30.5 MB\/sec)
-		
+
 		* 82.9 KB, 64-bit GHC 7.0.3: 332 msg\/sec (26.9 MB\/sec)
-		
+
 		Encoding performance on the same machine and data:
-		
+
 		* English, 854 bytes: 43439 msg\/sec (35.4 MB/sec)
-		
+
 		* English, 6.4 KB: 7127 msg\/sec (44.8 MB/sec)
-		
+
 		* Engish, 61.5 KB: 765 msg\/sec (46.0 MB/sec)
-		
+
 		* Japanese, 14.6 KB: 4727 msg\/sec (67.5 MB/sec)
-		
+
 		* Japanese, 44.1 KB: 1505 msg\/sec (64.8 MB/sec)
-		
+
 		(A note on naming: in Greek mythology, Aeson was the father of Jason.)
 	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/aeson</remote-id>
-	</upstream>
+	<use>
+		<flag name="cffi">Controls whether to include c-ffi bits or pure haskell. Default to False for security.</flag>
+		<flag name="fast">compile without optimizations</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 43abccd02a02..a4c15e85ec2f 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -2,8 +2,10 @@ DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac1416490359
 DIST alex-3.1.7.tar.gz 103624 BLAKE2B c7ca36113bf5951621906dffc47481e8e4a2cb2007773de7480b63379d648ca2b2b2c73d835eb981d1f46087a8adeec1887898e6d1c5205c8e1c7308bab7ec90 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1
 DIST alex-3.2.1.tar.gz 111167 BLAKE2B efad30da0e26303d08d74b762a83ad3ddc0ec8069942b0e5ae170e480dde6b65771f5cb4fedfd27e9379719c2eebbaef68d33328a87be49dc60a0e7b86861619 SHA512 97e2e1677efcde5ec04a393f8b768f97a291ff63a3411cc0a0aef18b75e6825307d22d9c379eb7775dde519ebf60378e07c9181ea1a8bf9ea2ef631d7071c2e7
 DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f1dd8b7247f847fe577e0ba1297f442a4f533f5b55ee1f7963167d9818149807b46fb400818d163cc18a939 SHA512 e9e99caef4bc985aa37bd42488121f9b83c4f3026c9745ad12f50b5896e9f7c07f48a753c647c30ff16be804529d2478f8d90fa38e352f1d8861e610651c871a
+DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
 EBUILD alex-3.1.3.ebuild 1383 BLAKE2B 980e6bb0012597701cea0e312b0e9f9a9915bd4a43fba13b428710d9cc87e215612ac088ab80ccfa81c9107a4146d0baa6f95c98ee6e2672b6f248842a34eeee SHA512 a0a89c1932e530a1d5a2ffc3fc03fd91befb02f1b4d82348f283dc81282102d6b6d46b71a86e1f937ce21bb4fc8f6fec9c59a7bdb17fb6fa4636c8b6ff450f5e
 EBUILD alex-3.1.7.ebuild 1544 BLAKE2B 378b74cf0862967397e60df57279fc6a389ce7818948298fc47b34f3099adf92aa4286a94ff0c33d2a34bd74c2d691d04945d6bb347e04d70c89e8dbee4a7442 SHA512 680b81d989de9f818166522115225ad003e3577d5ea3ad1eb4f6592f854da34c924e8ed3fac9519a02e4d31aa4b7af03e5be2a38b65e45dfb667995e78da01a7
 EBUILD alex-3.2.1.ebuild 1572 BLAKE2B 4502a884eb42e1d663646f129f09cf2818b092e57b48c1e1aba03b33f3ba70af3c23c030494e5c1b597a1c90488a18e3300168c512650f3a5a981ead9bcca0a9 SHA512 2a640ef1793584f5e67a5f4a7ce0494612b2f2d8408279023993341a16a8b3f8fe2aa6caf1306155fe3e09ad10a7af08b51cf654b2c86e14634af269e71a8b02
 EBUILD alex-3.2.4.ebuild 1445 BLAKE2B 6670d5a7c40aa2026cedfddd1655ccf149ef4e4a7948df83e7cf62a1aaaa582ae0a551f9f13c30a72f9719673283edbcbc9f1bb2e33aea8e69d93758ee187d71 SHA512 0f8d43ba4764c7bc8feaaec5ab63f9d2cff79cfd3f3c464fca72ed4356d961957991de18a1e351aa831b05178b3970a6c61171d000302edb5189766c8170e43d
+EBUILD alex-3.2.5.ebuild 1458 BLAKE2B 710cdb2c5b4887d9441d08d7600cb9cbab43bb792c6ffa10bf1d06b15d44bdfee067ba0a8fba7454f391cc6fa69400d04b8e0da62e70f5842dc07f370a9496ce SHA512 31bb0a06937feb71fb55bfe67b7bdf141bff6c4e31bf25b6e72ea8304b2c3ee56c3a27451e96ff6e612780f70b8af2bb9dbb0a77102f8e1c748ba854c8dd17aa
 MISC metadata.xml 349 BLAKE2B 0e0922a706cc99af24707269cbe80a8969df912d02317294a007d43a81263b232a3f2b199b4f981a023143a765427851335493a10235feb627ff8adf85497c62 SHA512 9c41217241498cd036d00fce456cea108f675c71c12bab05305dcfbdbd5d55d5c7db8163e5315eef12f9ca8467276b6fad9038d47da729f448338655691a9ff8
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.5.ebuild
new file mode 100644
index 000000000000..7688f8c487bc
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="http://www.haskell.org/alex/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:="
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	doc? ( ~app-text/docbook-xml-dtd-4.2
+		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2 )
+"
+
+src_prepare() {
+	default
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf
+	fi
+}
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false \
+		--flag=small_base
+
+	if use doc; then
+		cd "${S}/doc/"
+		econf
+	fi
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_test() {
+	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+	# 2. use freshly built ALEX= binary and datadir path
+	alex_datadir="${S}"/data \
+	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		docinto html
+		dodoc -r "${S}/doc/alex/"
+	fi
+}
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index 8ba610e53346..864e9b551b23 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1,5 +1,7 @@
+DIST ansi-terminal-0.10.3.tar.gz 35863 BLAKE2B 8535a0dcfbf4287abee8c52cd951d155c30b8a2de73a4799ad51e093ff4651fd2bcc771a61627c143f2f48b7cc66e9bb125166be1b13d2d51bcdf1d1666450ee SHA512 231dfaaef2e7b1fb40a0e63bcdce984f914dd0c17af90bc2415c127d503dc438d1952dadfbb524f9ae83d872b30a353d875dda74eb492536cf8953c1e4224187
 DIST ansi-terminal-0.6.2.1.tar.gz 14652 BLAKE2B ae068a4e0a1c4f17c01d4e5aa7c1daa350ea5b5b18e8dfadebb2f4be5891076f2c78e82a829bc8638bfd69cce2e847c0910a56a18661b764e2fc9f785d375386 SHA512 6a38f6ec13ca2c2669c707eeab1749fa7ca1805fa162cc024867cf0cabb5746c8844bc2188680de3f9dd748cfcb72917b88ac9122ff6b86459c80aa061f2adbf
 DIST ansi-terminal-0.6.2.3.tar.gz 21964 BLAKE2B 3c3fdb0cd5808978e474602df9f722a4a349162975618e0144aa9b863039b0b8dc73d106c441481b8755f338fe252a9c0effc269a468b55f51fb9c025c648b75 SHA512 3d2999d0dcd45950240731ae9bbf5b65fbd5b00660b4f6387afa2e3db89f2f1a6690ea72311348cddd8e27fa31c447f282795c2ae1b76a5306aade785eb3448d
+EBUILD ansi-terminal-0.10.3.ebuild 688 BLAKE2B 86b9c3de6e61e37023646599e63018890e43fc2968fc35d76533fe4d40edd9b8cd2ca2f116c1bd39c48f188e10d9849b3c4a04cf0cb912e07aa7f9b32138906f SHA512 a033f6540162c0f11659e80ddcb5afd5a5ae94575d58db1e5a2a97b3b7d32bef1569c10feab7e585c605a97ab60a2704de6d5ea1c6971e8755241f03671f3a9a
 EBUILD ansi-terminal-0.6.2.1.ebuild 664 BLAKE2B 2dce2c960cba745f1e445497c3bc8b0578232322b6932a06d3340fb97e18d5ce01652c51cd8bf7ab95b743bd9332d7f03aa4e6a729ec3e7e9eb3f4b437e20df7 SHA512 976e5e549247f65d209ba9adfb393c03666f38136a37bfed97327257bff77d09d22ef13477c536f1a5b7063174c43918484e4ee5155c93605e98431cecc7e8d9
 EBUILD ansi-terminal-0.6.2.3.ebuild 669 BLAKE2B 6c163a613e2069332c0e356ff4ee5da966eb55e189845e19f804279f6514ca76da3a41bb3dc23b7fb990fbd566a03abb58226aac23e9a58cd2b00ce7acee0e70 SHA512 8ccb8ea97901ec34cc9e824499690a3db6db6dc67507437ea07be30d08eb5475cc80a1c771a736cdbeaf9fc07e6f89cd1c11a83430303c822aadfbfe11d0eb53
 MISC metadata.xml 702 BLAKE2B 405eb8c2075636879af2db86ada502ff241f976f3a34c20e4e45aeefde968456ebadd1d01b4470f20b377c6a665623ce69884644c0a15b98d757f9823a2a51eb SHA512 ca4f14bf1a7508e8d6496752d11583b331a02512fd073f7c2d24a125d6e99901ff24c36fbbb9b745e74c05f93ba0b43573463841b56d0ae0e181b2a2ba1d6a4b
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
new file mode 100644
index 000000000000..98a4b995a5ea
--- /dev/null
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
+HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="example"
+
+RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag example example)
+}
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index e7469d6b2fa1..f33081dacc0e 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1,7 +1,9 @@
 DIST async-2.0.1.4.tar.gz 8349 BLAKE2B 3323c08beddd482a3d0442fd64afebabb01cd8307dae2650ee27687ca247c73eaf0ce45f953180ecf4f706705041933cd0387699ca1592d72b63761932b47790 SHA512 8b170644ce92f9788e22771239542e46ee14b9898404744f6a97b955ef22ae4b3fa280ea759f228cb22f2083b5ee007f39c61063f82e5cce8f6bf1c6df789a71
 DIST async-2.0.2.tar.gz 8565 BLAKE2B 8bda599c7a5bd30b67d73de87f136eae3535619e3eb274b928f6536cc2c4f6f03d73ff31e619f8681449fdf501aa08b83c2324e1121ffcfeaa69d732df7675d7 SHA512 beac3452aca98f9c41fb86b1b9e105a324df5a05e10c7d616927bb94888d6d2ed5385e0ec901fdfa050a43e991f5089757d3941ce97db98c148a159893bddc1e
 DIST async-2.1.1.tar.gz 10565 BLAKE2B a379efe6df6c58d1962d820b0f1370c87af487b61f7c3ed32fb22398d77be8265a9577d44793624fd8b0d41c930c2f94106511d816df9600e7b7a17b897641bc SHA512 85a878389f019df0038f7b0ea82e8619f30eed97cc5c53438dbcaef128c08cdf5658afa203605434a2e1eb885fc28515a30c83341cb1b77331362205d521972b
+DIST async-2.2.2.tar.gz 12927 BLAKE2B a0fa95525153e1065888072d4c7590a6184fbbedd957d0a7867235414681c9959be385a75007160d50fb3a9e015c83651175c4399f24b7a0d981cfbe0f8bf250 SHA512 6984c74b76dc1db73363ca2e360d2be6f2e7b4de5c7de452c4df7ee996b2256790a8cecb532af6d7d675541315a16f8e4ce566c5f79e4102e4a857f057e2d811
 EBUILD async-2.0.1.4.ebuild 819 BLAKE2B ef172279ee56f36b9342694e4f1329b8be5bc34fab9bde1ea52e98aad9197a2831c040c97649f5398321ebbf93b8524e164522ded645aa09c33f6019a78e99db SHA512 38f14436bae1e33dd0dc12266b38a2c663989f4d8dac774f6623cd1f5a09c313ddb9afb73057abb233ebb5b09f73edf73885a595279a46d52dd0aa13e3a5a33b
 EBUILD async-2.0.2.ebuild 740 BLAKE2B c4b2c888b7b7232b6caf920576a4ccc4194b2075b15631d9fcb29d5a2ccee1c6efda30c599b7d34a6bd144483e2ab1e736b81f0cd28ad16877b14e1cd9f98813 SHA512 73351fbffc3b414ff99a70bf1090f73d7a0a058853e39d69e9e400e9667e304e5b53cc91e9bf375211ec6d606c16a4679c3c17cda9226b712d255741d7d77300
 EBUILD async-2.1.1.ebuild 765 BLAKE2B 91fd0209f2c0cd33c45010f84e6cd800d2100ff28a66adc7010537d9f6a1a5314944aa73b97d45bf9e94b37d1b6bf7a104c7ab310a4111c39578b8ee1d47a4c1 SHA512 0fb6fb4b893688143458bef5e59c1737260366856e30533f44b01992e4d08aeacdf692532f777bf2a58b354f9c2b7584991271985f757a07cdec8098c0c743d6
+EBUILD async-2.2.2.ebuild 1001 BLAKE2B 7af0ab367031ce7ab981fe70963eddf3f73e849d4b5fa0962133de390abaf4d26d8675eef8f3387709de6e1ea5b24ea9309b530b24962918a28f181f9de6e393 SHA512 710795a926bfbe551b11e665dcffc5cc9c19137fc3a43d3242e00897ca45f0f63f4d6cb1121f466bd7adc32c629300671f68fcd7a99d2de68f153c2c47bb26a4
 MISC metadata.xml 1591 BLAKE2B e513dd2e93240046dadb6412fa548d7a7390700a80d241a4fc00a8204220541fec695e82fdd64a122dcf923f6ec91c8ba67c627c6997386cc09b24956364d3f3 SHA512 9fb7bd1b705dc30c1e8bfeedf6cb4f3ce0391b60dc0eb362536615e7e693cfff0917fa74c1fc725811db1017d186782994b3aeb106059fca5852c1232f48080e
diff --git a/dev-haskell/async/async-2.2.2.ebuild b/dev-haskell/async/async-2.2.2.ebuild
new file mode 100644
index 000000000000..0cb76d0dce09
--- /dev/null
+++ b/dev-haskell/async/async-2.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -bench
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/simonmar/async"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3 && < 4.14' 'base >= 4.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bench
+}
diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest
new file mode 100644
index 000000000000..dbd62b487252
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -0,0 +1,3 @@
+DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
+EBUILD attoparsec-iso8601-1.0.1.0-r1.ebuild 966 BLAKE2B a5b0084c588bc12afa37487f5046731c93516460ddeeccf4273f6ec3652680878ef9a23bf4616171882fd2c5c55f5a9ba728d2a86c6983f28f2ede0e3b8a80cc SHA512 b8ac894b08f2a8e693ef81e5c650181e28aac09f6f88a90444119dcbee6fc39fb3209aa575dced5048daabd29261223dda56f28f8a77041393a920fc03f5f16b
+MISC metadata.xml 379 BLAKE2B 1d4f2df0518fc153823c42249b1601bdb7d119b172473e7f3c93c13c093871aafadc4d1a065f9a1908e5f0bf0d128286cda5919fe885eab58f5127e069093a71 SHA512 59426f8d90eb0a7d5265ee9cacf0788d763a5f968ed0101aa849c10be03531448f1e681b5080baaba4dfbd4ed46267c06ac0e5009f4613c08a28be20a745e808
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
new file mode 100644
index 000000000000..e7b5c6dd1290
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -developer -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
+HOMEPAGE="https://github.com/bos/aeson"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="developer fast"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
+	>=dev-haskell/base-compat-0.9.1:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base-compat >= 0.9.1 && < 0.11' 'base-compat >= 0.9.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag developer developer) \
+		--flag=-developer -fast \
+		$(cabal_flag fast fast)
+}
diff --git a/dev-haskell/attoparsec-iso8601/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml
new file mode 100644
index 000000000000..3aa55903869c
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/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="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="developer">operate in developer mode</flag>
+		<flag name="fast">compile without optimizations</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/authenticate-oauth/Manifest b/dev-haskell/authenticate-oauth/Manifest
new file mode 100644
index 000000000000..4bd770880ada
--- /dev/null
+++ b/dev-haskell/authenticate-oauth/Manifest
@@ -0,0 +1,3 @@
+DIST authenticate-oauth-1.6.0.1.tar.gz 9470 BLAKE2B 9326a4dfeeaede4d9b69e7f92be66b7d3f4d74fab30fdeb3e63e7741f33d5ec68f287b35a4c7a424084aa693881c9e23b78fd2f7ebb1c1a32073cef7e23d7078 SHA512 b2a6310097a6edc5bd3c38052a2eca73d3f398c0b9ff4b8f1d43a1f4dc83b7297df12f3fc0bfdecfce17e600f90b13c4c9e3f31c02b17d7fec0134a34c093fd6
+EBUILD authenticate-oauth-1.6.0.1.ebuild 1149 BLAKE2B d7468f2635898f03000902e5be7b51ca29122a103907a824eade3bc5924f91aaa4afdab131ef05af4ce5094dd73a33f2e2c8e412e52b1bb88d04dda5c5f3dfcc SHA512 9f9f882984453a5bf1a7dc7f6874c043cf93bb59b5860fbb0c81302783371679ea577441c89876d9d9a365133db172f724a2a585bd8f16010e357fbfe98c7d11
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild b/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
new file mode 100644
index 000000000000..4494268101f2
--- /dev/null
+++ b/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Library to authenticate with OAuth for Haskell web applications"
+HOMEPAGE="https://github.com/yesodweb/authenticate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/http-client-0.3:=[profile?]
+	>=dev-haskell/http-types-0.6:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?]
+	>=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/virtual/python-futures/metadata.xml b/dev-haskell/authenticate-oauth/metadata.xml
similarity index 73%
rename from virtual/python-futures/metadata.xml
rename to dev-haskell/authenticate-oauth/metadata.xml
index 7f4f33c6dbc9..b7878815d80d 100644
--- a/virtual/python-futures/metadata.xml
+++ b/dev-haskell/authenticate-oauth/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/authenticate/Manifest b/dev-haskell/authenticate/Manifest
index ad09a7d5e09e..c3e2761df338 100644
--- a/dev-haskell/authenticate/Manifest
+++ b/dev-haskell/authenticate/Manifest
@@ -1,7 +1,9 @@
 DIST authenticate-1.3.2.11.tar.gz 8728 BLAKE2B 5c2a319ed40dc4b5cacfb7f5824e240cc9f60b95db6aca45b5ebfc6974f6bdd228386b889bf7eba65850dca88ef0c0d00e67e17aa75bc6308838a446e256c8bc SHA512 8e1358bd6dd62f10b372fd5df6bd2b50f1c161ade466316efa9e036c17be97e7c561eab968a2e17d28cc12988db454618bf11b8c9bc5e9a20d864423756eccb5
 DIST authenticate-1.3.3.1.tar.gz 8703 BLAKE2B cfeb564029efa9ffceac72dcf9f506feeefe5cdf4c133785f55d71659ff398248f1ce286db8585c93039f6b03c291892e8df8fb110db5a5c8f5d2424acb45332 SHA512 e2caa227dfc4a4878ac7011d79d98c539320cb2fe5d9e260a9c71951486ba8af396fbcd0ccf3cb80205063881c7922f3d1a62d693ff8e1529b88e3cfc2e3c5c8
 DIST authenticate-1.3.3.2.tar.gz 8785 BLAKE2B 43307b9551e9894805a26bced9aeeda87464bfd9e92666a329a3c424afdf6bae74e03262316d98a97b45bfda74369287e8b9e766e9b4f8dc9919294fd3b7a811 SHA512 98fd1e5fde51c9e2db10c9d22429d8c51914f28ec8493457a77afa5a9dc41a8e9920b27583d5aac9752a3b39561713f87489043c552396d132c75139a8e46927
+DIST authenticate-1.3.5.tar.gz 8817 BLAKE2B cfd9a4e9f8a6d4f76cb3c3e1e496c8eafbc5b675cc14b38463bb4175d3bcab86d1561a3434f6638062905e9bf3543f689cae5b4510283bb4da3c513a56014510 SHA512 12962fcf71c732a7e709e7069d46691917b9ee9f2af6aab5556b76a4556b6ffc39e52082a4fcdbe501c2cbc7cc496b1164b6a9f2c3883597fcdd0a8298d4ac1a
 EBUILD authenticate-1.3.2.11.ebuild 1348 BLAKE2B 32cc4942b12baddddea00b1de4a432186a9465b202e9f9f88e9dec66cf873e62b6e0220bcb4be3c8c3760b960ddea54c46c3834d1249b9d8ae4811b6fe611611 SHA512 db5c6364f934a913027ad42ee82767f602b845157029ebc37a9a810d67c915bde892f89db232021d6e5a6c4e25e7427823b6c4d87ca12e53727c9bdfc36ad336
 EBUILD authenticate-1.3.3.1.ebuild 1348 BLAKE2B 40205afd0575a7b82fabe5c8e057789281044ffe0c78cc727815af6f659fdd12794e5178499c88683548484d0bac4f80bd54c028e06a3f1893456597fa268baa SHA512 8b410d14452831e3d2b234daa5a2c86a12fdd88b51239199e7163e8aa48d86a7804d48e50de7d2af487f45a25ed39875bacdff1ea673c4a26c5ec4bf7ef31f14
 EBUILD authenticate-1.3.3.2.ebuild 1346 BLAKE2B 78ead227d2806fe3178839bbc57785761cd7c653c93b45fb3d2c481c9225e1b49e0e56cde80be01b26cfa4787c42ca33ff509757958b541d64ad7017950a38d8 SHA512 691ba4d1ebb3d52468d5b73cd1e6e1735ed3ce68b88bdb98e4815820363d111a937c461494742137c64e3bb9f86c22d7eb70483299c367d681c89da03da8dafb
+EBUILD authenticate-1.3.5.ebuild 1258 BLAKE2B 7533b5be6bcc07097a0d9b4f5f1dc595c432bb8dd0da35ac68d4a4bceef7e27909b8230c9b5bd04d3f1a9e2f1e0f5fe17faf583747b068ffece388e87da25b63 SHA512 9d4865f941e7f2321b41ce04389901b01f0c38e2fd0c3b7b1b4c12860b7f21c775bc74f2d9079f5c490a5b8091f2c2ac8b7a2d1aa90b96621d7a9e3aa3fe4575
 MISC metadata.xml 548 BLAKE2B ce9aef6698cafad38765c272819ddc56882413e1f2cf575f0d7a02edf7365ab837d7014d20fc1455c9771f1d9a5c66bdc6fadd819fe0681c01c49aefe000c690 SHA512 dadbf9c551c9776e77f449e2651bc7e7c7f106a509bd5ef120a8f0ed9b113ef8a33b6dd6c808e40d2f65dcd54dcc5dea02ce6a6745aafe858d6c8673c3f46e73
diff --git a/dev-haskell/authenticate/authenticate-1.3.5.ebuild b/dev-haskell/authenticate/authenticate-1.3.5.ebuild
new file mode 100644
index 000000000000..5f168e7885e2
--- /dev/null
+++ b/dev-haskell/authenticate/authenticate-1.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Authentication methods for Haskell web applications"
+HOMEPAGE="https://github.com/yesodweb/authenticate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/conduit-0.5:=[profile?]
+	>=dev-haskell/html-conduit-1.3:=[profile?]
+	>=dev-haskell/http-conduit-1.5:=[profile?]
+	>=dev-haskell/http-types-0.6:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index ca99a978f29d..a6bdc6832d4e 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -2,7 +2,9 @@ AUX aws-0.11.3-ghc-7.10.patch 975 BLAKE2B 0e5e21abc586c434da612c0ad29c5b8285da3f
 DIST aws-0.11.3.tar.gz 90102 BLAKE2B 4a22b5fe3cabdaeda68229ac9bd653221242a17c259245c650a9e92fed87ee8d58ed3cef4cbc732d0c5f8e92481b42d4a3be4a5b3ecb5c183e52e9e922941938 SHA512 0343d8ef17ad06525c7c131eb97408d3298c46f4dd472604bd4b3a20c2bb1e880e12f9a0e345ee2fe9bfe56b684fd653e9a99b7919e8d97fce4ca0cdd720afb5
 DIST aws-0.12.1.tar.gz 90763 BLAKE2B ef33803420a163c51386165e3d3b94efb61d1e8d4983ab7c23e6c94b09b4f8638e2663657587a1b1ed381446e01a9bc120ca4a3ef9057114698ab870332961e2 SHA512 8c89a982196b654ad4f001d30cb415a9272aacb582c8879173babc4183ca4eb21c025399f1bb5e2624a77a1c38da9b4637bf1dfa0a5bbccb888808a5e654bbf9
 DIST aws-0.14.1.tar.gz 95017 BLAKE2B eab2eccdfc160b16ccd35e6028854e8bcaebf3309269199be752a240a2757a69be496eae0e6d757a814d1d0f6b30f0d3f6cd87954a95a5aaf2d8347245956b29 SHA512 0616d085291748d3ec1ef24d7914562f85fde0577f8100b0dd7f8bc2c817fffb4945372fb80aad98dce652fbf1f063a55afe3ba7aff89ddd5bcd2ba43047ad8c
+DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
 EBUILD aws-0.11.3-r1.ebuild 3607 BLAKE2B 8fb51fb466e36bb765d01b2b31961961d873e31a2487d33713e7769daf3f202dccaea2b032643f94576b3d38601774a8b829d1a3a90955b2a27ec24284471a3b SHA512 d0b0e537eb1943709ea1515a821e6a54365994b40e4ca3b98229bdb42608504bd9c77ac2fcba9fb1c43364ee68deb2ba64bb09ec59d10db0b524f885d69f8821
 EBUILD aws-0.12.1.ebuild 3478 BLAKE2B 4bd214fed7366424ea5715a6c45b1b7dfc3523a1f99f09ced4ec7cbbf089d5318477b8cd3a232ac44946f3c88e9236af4afc58bcbfd43bcc06186cda3a641778 SHA512 79aec8aad7beeee9535fe436cfce7c393c83f8869883f216b09f0d462f6809cc00494b9d9991379b86fb16474903dfdbb3b078d4fc8a33181eb839d9a0d73a56
 EBUILD aws-0.14.1.ebuild 3285 BLAKE2B 29c4926111ea63045b5a4e9af9d4989b64ff07f61dce13ea5f7718e20771539b9d69529ffb2881f3b75060037125e6cc22a492dc9233f112378b26dd5aa7de89 SHA512 ed26c0a8c38971efac8b90762fc83d97c8d6c8b62ca67af604f65b5a3ac5e5c08d40add9d1dbab29d8bb32eb19080d3805eda8b43c19b785dc100df68ac0b2ea
-MISC metadata.xml 579 BLAKE2B 994c0d3d2e70a04f4a4bac3981c9e994476cb9fab61d2a135183b547fe4c66adf08e7a5bb76dfffcb6436f867b4b6b813ccf023d1a1bf32ae12afb847f819e1f SHA512 e539e4a84e42065fd427edf1c8c32d8a55aa3df19407bdafa9cf301a9a19ac89d1102e0cd429ed92343e0e7d31a3669993614aff42ef4e643ee88ed3565cc5fd
+EBUILD aws-0.22-r1.ebuild 3742 BLAKE2B 801fcaaab3d293fe5fe9a043b23f6193a13f76ec2819cc4a30f19947d3d1a64aa54c97301c9fa4e4923d63fab36bc28e5fab92b83c89c8ba58dc7b797ef6f091 SHA512 22989ef8e6d7cf9504d0f52cff5260f8d5c65b2ced95e927083b22659cef19da407f761a247bd331dababdaba8c627b7bd14f584c678b56f67091195241201c4
+MISC metadata.xml 640 BLAKE2B f09daee7af7e239659387756b4f561368a358982ea1530133bebe9deeb5c40231b0ea42b307009fc099b82d5a250abc2726a1e96a74304eba5c92582db3176e5 SHA512 de390e781cd303c5fe6da48d5ea0de08e37f05da6c77c67c8d5be2112ce2d7995ee33bd2a0a806cdcfc12aa15a01f2a76bfa17476ca6bb6b1f89b6f64c3a6c42
diff --git a/dev-haskell/aws/aws-0.22-r1.ebuild b/dev-haskell/aws/aws-0.22-r1.ebuild
new file mode 100644
index 000000000000..d5a5b18362a0
--- /dev/null
+++ b/dev-haskell/aws/aws-0.22-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: networkbsd:network-3
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-3 examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+	network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+		>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
+	!network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/aeson-0.7
+		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7
+		>=dev-haskell/lifted-base-0.2
+		>=dev-haskell/mtl-2.1
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.8
+		>=dev-haskell/tasty-hunit-0.8
+		>=dev-haskell/tasty-quickcheck-0.8
+		>=dev-haskell/text-1.1
+		>=dev-haskell/transformers-base-0.4
+		!examples? ( >=dev-haskell/errors-2.0 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples) \
+		$(cabal_flag network-3 networkbsd)
+}
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
index f05125d63240..de6f465da317 100644
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@@ -5,6 +5,9 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="network-3">Use network-3</flag>
+	</use>
 	<longdescription>
 		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
 	</longdescription>
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
new file mode 100644
index 000000000000..d841d2714d03
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -0,0 +1,3 @@
+DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
+EBUILD base-compat-batteries-0.11.1.ebuild 1331 BLAKE2B 652135e6639e1571aade1ec7b53120034150ed98e5e3f6fa90b5a0f55a81fda766d32a730c33627f9334249a42843c5e7a0fa100264316287485df4aca7588c2 SHA512 0644a5dd76eef6cf56e63e7b550d1693b6e2a80fbd5b5ead1ed3e4c27ea47c894322b721c20af6c24ab050c52925c6c87b34d4dc06cebd5aeac3b8c87db7e68c
+MISC metadata.xml 1226 BLAKE2B 9f6544dea3fbf3c8cf7a66a24d26758c4803d51835ca6cc93a2856547860d18c87f399d693bafb5e2e55722729e6175562bd909e0f43f7bbb4d140f4d2eaa5de SHA512 d3d918a8a68f980dee2d5a51001df7a99609bd77720428f4b5b865323305b307dd6024a05b35ba3fa67adacca65b49b634c8c6a29615bc7eb42bf5ddcdc78ae9
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
new file mode 100644
index 000000000000..f4b6f1ce6ff5
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="http://hackage.haskell.org/package/base-compat-batteries"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~dev-haskell/base-compat-0.11.1:=[profile?]
+	>=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+	>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/base-compat-batteries/metadata.xml b/dev-haskell/base-compat-batteries/metadata.xml
new file mode 100644
index 000000000000..012220248aca
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Provides functions available in later versions of @base@ to
+		a wider range of compilers, without requiring you to use CPP
+		pragmas in your code.
+		
+		This package provides the same API as the
+		@&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@
+		library, but depends on compatibility packages
+		(such as @semigroups@) to offer a wider support window than
+		@base-compat@, which has no dependencies. Most of the modules
+		in this library have the same names as in @base-compat@
+		to make it easier to switch between the two. There also exist
+		versions of each module with the suffix @.Repl.Batteries@,
+		which are distinct from anything in @base-compat@, to allow
+		for easier use in GHCi.
+		
+		See
+		@&lt;https://github.com/haskell-compat/base-compat/blob/master/base-compat/README.markdown#dependencies here&gt;@
+		for a more comprehensive list of differences between
+		@base-compat@ and @base-compat-batteries@.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index 9077fa11b3e4..71646ca5e824 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1,8 +1,10 @@
+DIST base-compat-0.11.1.tar.gz 33691 BLAKE2B a598582e1a76b2b83d4168da3fbdf2b0ab34127d60ba46c9803101d075989000bed7f01384d58292d96c1099857964c74d9d7bad092fca94502442b635a82245 SHA512 d92a81e670535b4ca6fd95d51800972bbc52008ef21ccc22119341974c45bec66ed725c795da8d94c8ef824dfaa7f9c03a173b643daf339a4759c49453cfcec8
 DIST base-compat-0.2.1.tar.gz 9158 BLAKE2B 642c7f5f5b2a91cd6e38a6643cc719e5fa60f261c50bbda708b284daa2ccbbee2a3ae95f13f0c3180baf398b7f5db85d011f6ec944a2dd17b6ab73ec92225dd2 SHA512 959ce234c61211dc62850f656bb8342aa1fe0c849607a32d43f23d121eb1cb4c3f25a8b669042d9e76aa2f634708219e1a15a4a9afa89e3a3e1a4276b73c0214
 DIST base-compat-0.4.2.tar.gz 4094 BLAKE2B 3b17f5a74b14e4eac0b7269edac3b457bfa55d45584a31117fb847f8dd340a9df613e1686369262a55772b8364527b98100bbee66312e63ccf4468c3a499984c SHA512 5f55b68d59b22a2cd6f197a3f783ad3d088afaadb27ad9810c66b9407d0e43c938901ac1a53eba54edae4cf519b2625e19a4934b09702cd9e32b9815fdc8305d
 DIST base-compat-0.5.0.tar.gz 4342 BLAKE2B 8e1c16683be353d7eb949c1bf9893f7e0f02fc5ec46c88abfd388fed62da06851cc74ec26c866651b14ad111ee4fbdf008d50957f5e008c7f31a275f6dc341b1 SHA512 d591c96922720fd42ca01744f289b4ef2e228704bd2cb4b7aac5bf5a0de3b5ad5eaf46fe5f2a56e903e3a94ecf228ed494896f8a491173f9077be35c834a0377
 DIST base-compat-0.8.2.tar.gz 16053 BLAKE2B 93f3ef7773c78001a155866698c51c66917a80ee61c82a5c51217b09969a781dfc03a6428d9dfa39a3b2a984dfce57b621a682f099cbe94b9776fde86aeb25b7 SHA512 3942ba0f03a2ee979130d185321f6f48fc3e71a610fb0e65d0b4cfa1ff0112776670a4322d141e9b6465060b44c2d5cf4acff3928648800927b90ce36c2b3760
 DIST base-compat-0.9.1.tar.gz 26251 BLAKE2B 06d204cb6cc904cbaf3cc66d01356c18eb1440ddfe6fbf787f0bf547263a83b80c3a4740231888b68ffd419ad6bf2ddb840aea344d70c11b295e9e4d3cba8fc2 SHA512 e79cb17f96c6abb170cfb836c1ff5a6cb2916dee46f00e3701a8fe264eb06bc4b0f0b825f40e2a151f18b5ee67d98ef713877ee22253d862e175185909c8eeba
+EBUILD base-compat-0.11.1.ebuild 535 BLAKE2B 85c2bec6f31d2097521728b92cd8d88c178aa0e24ca29a3940f5bb72e7dc68068effbd1a8a89fa56d57ab5c4ab2c746d9a07d5abe6280512e5e1dc2b6db08847 SHA512 c992c8c7b738c1a1cf9986a89778d277fa6e475ac16c6f5fc947a15da944612223a4ae482a8d88621a63735dd13c8ca9461d16e09ef0ee5101e4852561d7fd22
 EBUILD base-compat-0.2.1.ebuild 612 BLAKE2B e5d89a77d8e2c21104f3373a9c3f9d622fb464cf4afdcd6a4ab8a753989a3df9d639474bd39428ab31ca87fae09204867bfbccabd65023dc221635a8d53172d4 SHA512 fcf220425e23eb9c6bb0cde9acc976d5a5876f37c91f7dd8f5d3024ddf2b52046a86a842aee0ee64ef672dbd6b0e8e6edcddb0b83b691330bff8066918c5e9fb
 EBUILD base-compat-0.4.2.ebuild 667 BLAKE2B d80a71dc4a15ebae3a8b8dcdf1883c4a69c84dbdb49e617106e77af8760d302f88a309cff3541ea8e06cfb543ae6f40c43ac1ce1533f0d793d04400403db561f SHA512 5291bda2fd147c70c1923ce10fca69a7a8a732bc26fa744047ed9e52062bf10c2ba9ac1ef0e7e1cdb18e5144b702f26610b4a81cb602bafc3f2cb35095cfa195
 EBUILD base-compat-0.5.0.ebuild 692 BLAKE2B 60a6db507460c274b1f23f8fbc8b4eb63e99a213c46105036de339db0923809167ede6830bd08562e26751b86223ecae65ae87af6de4be6abb4f9f4a5cd50be6 SHA512 be0fd57deedaa4726ae194037804351c30d98e2ac98d773cd6c383ac31a220be4fcdf81f8957beddcb8397f08ac90140daffa9caec4d7c0bd5cf36c57d04bc6a
diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
new file mode 100644
index 000000000000..402e34980302
--- /dev/null
+++ b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A compatibility layer for base"
+HOMEPAGE="http://hackage.haskell.org/package/base-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/base-noprelude/Manifest b/dev-haskell/base-noprelude/Manifest
new file mode 100644
index 000000000000..ea5e6aed7bf9
--- /dev/null
+++ b/dev-haskell/base-noprelude/Manifest
@@ -0,0 +1,3 @@
+DIST base-noprelude-4.13.0.0.tar.gz 2864 BLAKE2B 25d13ae8a2cbee524d46cfe351abbe77321b61dd118bc26b8d275179fdaa5d429450c3e99a12518646bfaa13258a5ffaa9eaf0cb0bd7bb84a93187ae175f6d36 SHA512 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf
+EBUILD base-noprelude-4.13.0.0.ebuild 670 BLAKE2B 94f594ddff49c786e2581b33c1819797bd6eac3200c19fb66c47028b6a280ac0628c419557aa22ea35f1925941ff07a6523d33b1359c8464b2a8abc3c437ae68 SHA512 232b73d52a0bd6c1e9a3bbceb071d472aa1de4b4492a389b46b221b38bcb3334c9770c68bbd455c578a31ed057914fd906f1237295ad7d2873db25dc2ec7ae5a
+MISC metadata.xml 1165 BLAKE2B c1314fff9237099c8e2a846b36635ab8ead6563ae3002830547d610f3c9a3a50cebc734681bcb035e822a762f206f01b28aa5af420c92caf30a82e8479e5ee92 SHA512 addd4e0aa14ffef7ef5e01aa3e6f6714812b10f0c2d19b9e9412d5f61ac20b5218c7d691b4b668e899b0deedc4538fe9368a2583e6784afde19267e14f320971
diff --git a/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild b/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
new file mode 100644
index 000000000000..db91878d219a
--- /dev/null
+++ b/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="\"base\" package sans \"Prelude\" module"
+HOMEPAGE="https://github.com/hvr/base-noprelude"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'build-depends:       base ==4.13.0.0' 'build-depends:       base >=4.13.0.0'
+}
diff --git a/dev-haskell/base-noprelude/metadata.xml b/dev-haskell/base-noprelude/metadata.xml
new file mode 100644
index 000000000000..d90faa18c748
--- /dev/null
+++ b/dev-haskell/base-noprelude/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>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package simplifies defining custom &quot;Prelude&quot;s without having
+		to use @-XNoImplicitPrelude@ by re-exporting the full module-hierarchy of
+		the [base-4.13.0.0](https://hackage.haskell.org/package/base-4.13.0.0)
+		package /except/ for the &quot;Prelude&quot; module.
+		
+		An usage example for such a &quot;Prelude&quot;-replacement is available with
+		the [Prelude](http://hackage.haskell.org/package/Prelude) package.
+		
+		Starting with GHC 7.10 &amp; Cabal-1.22 this package makes use of the
+		package-level @reexported-modules@ feature.
+		
+		Each version of @base-noprelude@ depends on a specific
+		@base@-version and thus mirrors @base@&#39;s
+		versioning (with the exception that @base-noprelude@ needs to add an
+		/additional/ 5th version component in case of bug-fix releases).
+		
+		See &lt;https://github.com/hvr/base-noprelude&gt; for more information.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index 6f6366c399c6..daf31e85ad49 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1,5 +1,7 @@
 DIST base-orphans-0.3.2.tar.gz 12608 BLAKE2B c2e14671dc69c083a8910e4debd64d472382ca4f35c781ccb207f9f8be5193321c7d0c2941455175ed9e813d1eb53ac8617b86a2ec2227bd2f1181b1bb8260de SHA512 2c62148c49e123a8e6f95ac65c4b8998c73f3f0d0bfc71e90058f3d75d760b048f8b3f8a0e88ac80c39947ce3d3d42243b66a2370045e44cbacb1f054335303c
 DIST base-orphans-0.5.4.tar.gz 16834 BLAKE2B 3eb1427497c744b64ab1bd122f005f1ba75f2eb9a76c62fda2fe950c77f3a06b0969268eaf15fa759642f16512e707164c8ad2846f30f283c32a99e0df25ed66 SHA512 41338450e2669936ff8bedbd59954b988154f286e9beb37f4ab98983070b5a99bc3340e3b56fe2701c2a7cc3eed0d8dd549241f1b19c252ea4db8600dd5b5fab
+DIST base-orphans-0.8.2.tar.gz 20727 BLAKE2B bf9c46e1d142bfbebb64a74eed6d367c253e16bc7ac5503b71afa0894b9d890773410d2b5542a5e927bdc76f349ecf7cc06156199f98ba8dce1d675873d4104d SHA512 f438d3434fa2f276af3bd23288e4cab2af94dfbb392b0a7eec747af3fed3856cdac2ce5f9476962cbf5ddbb2e48577469155101e84f7603534fc4d097da882e9
 EBUILD base-orphans-0.3.2.ebuild 629 BLAKE2B 7ba0f1f118750a163716c89ffae94e0946137bc9213ffaa3452156f6ed93e2a3cb378eec0b8fd019bcfd74d3f121ecea57a0739303dd2aa7b94b9193fc050d40 SHA512 2bf2e14658ff83332ac1f7c5cf3ead4df2f72e55e43372686486cc98848ee671a455100a7d2eaca65df8efe9387ccacb8518df52a71b5bbcfcca32d95351a024
 EBUILD base-orphans-0.5.4.ebuild 654 BLAKE2B c2ad20662248205de848d02c511649ce2d6b456f5a04979872f0006b8a506ce45553a95ac08b9e8ddf3eaa632bfd91195ac2cfefdd8d1aa040d455f7a51f2b22 SHA512 2fa0025f00ae348ea8207ce7497e66394904e49bc3f688931e7ec0da95691965527769bdc5a8072109194756b53ee982f1f2ec634380f40c1ba9c4c2055aca4a
+EBUILD base-orphans-0.8.2.ebuild 717 BLAKE2B 05ab30a26a4c73c43835f6ed367fa3a8ca89833f45f4cbb460493c25d0823ccfe3b0fb9ec8222ce43124b16c1a9991321562a0d432bca9f97be575f1cff0c92a SHA512 2b3208a240b2b6477a4f73565d09f23dbf0c87f2a08eb4344fdd6acdcc2b7d6e26eb711126bfb62dc75bbb4665b6468553d29d51ebfb60409d79a36536c6276e
 MISC metadata.xml 806 BLAKE2B d4196716e787b1274e91334b61667f00c67ff9ac70153089aa95b93ce2f5730d761be0d62a5cc97a20921573fea9a1153b937f27cc7c2b808f6d7c9e8a22d647 SHA512 68f21e99d939f8b6488595980f717948f9b4eec2c096dde3463d851de8025a461fc465660750a1840bd6157d2787364fa69525002589de5f4fbeca55f7999278
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild
new file mode 100644
index 000000000000..f7b80070c8c4
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->temporary->sxceptions->test-framework->base-orphans
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
index 44da87797d9e..3fb1c8b2c144 100644
--- a/dev-haskell/base-prelude/Manifest
+++ b/dev-haskell/base-prelude/Manifest
@@ -1,3 +1,5 @@
 DIST base-prelude-1.0.1.1.tar.gz 4038 BLAKE2B 11f5a26beb32e8e4d1841d1e98984fee9df9fae92083a06f2e322b2c9054be33fff395ebe6552a2ccfe278cb1d119589269040dd6421b1d58d30c6276ab4b18d SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757
+DIST base-prelude-1.3.tar.gz 4323 BLAKE2B 3d36ddfa5528f16d4323f690c42fe8871f563cbfc926d5e79831ddb0aebe5ca705842bb87d21dc960bbfaa088a298f7f810dd085228877755678b3daa6c67b4c SHA512 de0f500e0d2d962491951445e7409f337bbf5614417cf6dd54cf04e1dad9ad181bc09648c9f7e0201838fde38ca86b2f89eb40805c9d9df7afb9dbaae565eda9
 EBUILD base-prelude-1.0.1.1.ebuild 575 BLAKE2B e398f86a9699570fad316f29eeea9cda3e843e03630e4e72c42e1234b4f513719709276d7941819f995982a6f5b7ef4c8c033cc64fdc5c9b8fa459a9f21d72d4 SHA512 dad6ef458bf8a7fb784494ba6f7cc6eb518edd947a37d5a4bfd42d0648ad68b7d499c75e88d9c1812f07542bd43c60165ad6b08e0cd8dc550859d4715925e276
+EBUILD base-prelude-1.3.ebuild 558 BLAKE2B 516bbb7270235dff215d66e506911731881cf66dae16f83cd9b12441e1cb9779e4cbf8e317d87ceb9866cb9b17d462606906db8a6e2f0d55d917d89ffe6dd972 SHA512 5f552baca5db61281f800548a08a3cc863c1e558a8d202f27cd2cd2007527327ee7a13a4b5e98017836499065174df4230c852a094c3c1484bf019207cc39902
 MISC metadata.xml 945 BLAKE2B a9382f6ecce320a9c3796f042727bb5092acba53826b5160a05f9a89bc4776e229bd42136567c8dcb05f9f02bcd893304610cf4abe04a3f4518ed72fdb4dc542 SHA512 cab916deb37631cc623cdb799d10338f21cafa557879dc3b96ab8627a06f5ee4cf196b1b5b668fed1a838e8d195d63526d3a8587f5134730375af0d2504d439f
diff --git a/dev-haskell/base-prelude/base-prelude-1.3.ebuild b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
new file mode 100644
index 000000000000..153544ef57dc
--- /dev/null
+++ b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The most complete prelude formed solely from the \\"
+HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index 16e32317830f..3392eb3bd875 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1,5 +1,7 @@
 DIST base64-bytestring-1.0.0.1.tar.gz 9080 BLAKE2B 272bd4cd4a87c76d5d85bf0bda4b9659168e9623deaebfdc2cedc7083b833fda9512775d17096e8f01b6ca1a1f73c9d1bfa5059b7564f1f3dc2cd467322cfbc8 SHA512 6936b34955b89a275f5bd71c74bbad2be6ff9e2023ac652bdbc9c5b10dd624e3862fc348849858fdb5c7b8aacc36ab4cda8bc6ea797c129b6b28d7e2e2e610e7
 DIST base64-bytestring-1.0.0.2.tar.gz 9830 BLAKE2B c6f860dd665efd9304225adc4cebc8adadb2972d135b859eaea6fef6b5fa8e8521b45a6fce355538dacebb6bf9eb7573b5eb3ca91333d1a0a115c6cc0c1c1a4b SHA512 8d8880cf806aa3932068e0a6faecde084829e72e73cf0a6b4eac99ae852dffbd85f968918546e18920044dd34c65b67bed1c62b6fe71f48b118bc337d86030e4
+DIST base64-bytestring-1.0.0.3.tar.gz 10104 BLAKE2B 00dca0236c739704f45991d974b99715c2c903d8ee228b7fbe3524d690496248d8b6acc798e8c42c70d4bc382b9c79f4f54bd2a858d3863207bb93fa44478ab6 SHA512 e4e244752491ac279a88afc4ceb0fe4c44b75fc369ff47ec29e3c99996b4be967051034c94f0c659d47a153d6b9e0b65a75ea419fdfd52fd50cdc0da2dca7db6
 EBUILD base64-bytestring-1.0.0.1.ebuild 730 BLAKE2B 8ab61e5d149ce2737990e3f7992a87eb9b99dfed6197944527bba6655d9fe449583a5f2518937b1700d42aff5a16cfc99245a9a83df15ed2ea6847cec99cc393 SHA512 9f593a13109df0fa518b2eadf48d7fad700e8e9ec537d25c84d836473ef6bcb4ad5e7c44906d91e84c2b36a525f540fb378d5545ac22a40b093334cbf03d6fa1
 EBUILD base64-bytestring-1.0.0.2.ebuild 742 BLAKE2B 94ca3dcaf821cd18276777805805a00eefd295cc81205e572a6ac45d63a5b0675f5a61b28318e11047588ae7cd461d369a3b6045a6d341fe5b36121249754ec7 SHA512 b5a22b72e44101b8261bcd3a56692d8a71ab39f312315f9dee54ebaff4534e7a4054eae1a18ac2766c429e6481fd7cd29723ae4725e5cc927a387cbec1393b2b
+EBUILD base64-bytestring-1.0.0.3.ebuild 747 BLAKE2B 8a9b5c54e72fdf691d0dccfe72d9be95889ec4f7e5432837a3819de9dad6f2fe3ae592c47e4df3ddcf70220bc205dabf64bf42b8015692b54f7b6e1a335e01f2 SHA512 4d1b0df33bb05a145a23985405acc5e1a6989908a53237a357674604af364ab6d2cbae05a26eb2a8a3a9df5b0afa5fbff571e1f05186c1dc63b1ffa1e2149ca8
 MISC metadata.xml 427 BLAKE2B 18ffaff4e2a78e35554df1a79485899f0774127364d99346d93568c435b6b6b73552ac25977213adc356f0e4ba69d05b5d0bfdddfab28ee070087102bf94cf00 SHA512 8a018f951503918aba4bf65beff55d11dfe886cb5c78a166bed89e585366b8d836176ed304eb182bdb3b74fe775257f8b0073aa315516a8d16239e6b1a07a35e
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
new file mode 100644
index 000000000000..458d52682faa
--- /dev/null
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base64-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/split
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/bencode/Manifest b/dev-haskell/bencode/Manifest
index 24a2ffd3c6ac..6387eb97ac31 100644
--- a/dev-haskell/bencode/Manifest
+++ b/dev-haskell/bencode/Manifest
@@ -1,5 +1,7 @@
 DIST bencode-0.5.tar.gz 4678 BLAKE2B 11309fa238926733c2bee5d466678e6ea0307e02f30e168c061553f8a6cf1e518413bf34e9a19043706a41531f31e94ffcad4f68a174850934105212de3113fe SHA512 0829d3224684dc6082cc97db854962591df3f343417a5917cf423f41fdeb2fb2f36e71521ce43b7d41d6e436ff2a325024492eeaa0a26cc04876816f8a283987
 DIST bencode-0.6.0.0.tar.gz 4622 BLAKE2B 597e06b7abeebd6dbdbb8b5afa0d978553bf8d9e61b1f3f2e40bf4c2730599518bbeaffb206cad2a6089ab03be5b225e475e1f54d7babc08dce923e2c06a0efb SHA512 be05a5a086d095e8ed79318c7b0a6e5e29f2483f8c9cbfe768c339353d473f8eb5c3060aaed9d60675bdfd13686e02b2261939ca6d34cc9488318daf2cc664d1
+DIST bencode-0.6.1.1.tar.gz 7008 BLAKE2B 9fe866d2588f9feddaa6691ab09c96bfbdb6b91efb79ab48de35fa40d45397f8940423c18b918a4f1289a94574982a8cb96d0c0770f9f346a43193389eec8d09 SHA512 e2f4c312923412a47cbea62caf6e001e30418946165405f2cd9d77f06c13ff2846b352e28ca6cbbfce3bf236fb42f0b108442b17e2b0e8bac702af6d6a114f09
 EBUILD bencode-0.5-r1.ebuild 607 BLAKE2B 87646f6cb224b56b541ebed809040816ef1f087dec59ee3e958184fc6203526a1a1de301fcc018086bc2c21fd1dfa5175c9c90f80e1f8b701abe861013570092 SHA512 5fcabdd8180d509bbffb5924f5289eddbd3a254c1ccc8333d2247d7c7320a391c622bb31e203bb8e09ae722e9fdeb70381555717e63aa04ecfc9d173f8e49449
 EBUILD bencode-0.6.0.0.ebuild 608 BLAKE2B 5823f71e0397e602da4b56396ea4129538be09e4ca1540b9f4b5ac7bc20ad75a410eb4c444a5ccec729e198eaaf102b91548ae4d2e21fb029d0c5490fdff3e81 SHA512 908fd2797feeda273cb4bbeef1d54b8f26b9a1dbbb44c9c40f142e44654122632b6f41be843ad4a7103041a42c070dcd403115eb483d21adc4d4988a0200a3c8
+EBUILD bencode-0.6.1.1.ebuild 690 BLAKE2B 6f59168f5fe383105c73674e8c33d153b3ae8ea7c1da9cfd4a94be62804919a913aaffc52dab2aa3600d8af3f52a5a9723a777aeed7af3476cfea0ab5db542f4 SHA512 1eac46958f851becd2c076deabfcf2996e18d7371546e0f74652fcd974c013d24e21873bfb081c5c4c9a260d5983b1591de9b5210fff9976dc44ca9d67a9d425
 MISC metadata.xml 328 BLAKE2B b10abd5d44da6d8a242d0c03786bdc83385510309bca740fff3a57cb44c07ee4c5df15af5fbc17dbb229500e05e4f5c65e2ae72bb822e12a708d3d63bb370c50 SHA512 38781d6ca54584c312e1d51e817117c6a8b1308e3025fc9a25bf3d29fb836f38e05d512a702d0e5f2777c546774607faf6b040c440b9327291b702db5059704f
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
new file mode 100644
index 000000000000..1800926a4140
--- /dev/null
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser and printer for bencoded data"
+HOMEPAGE="http://hackage.haskell.org/package/bencode"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest
index 2784c0eae24a..ed922c8df9e1 100644
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@@ -2,10 +2,12 @@ DIST bifunctors-3.2.0.1.tar.gz 7332 BLAKE2B 5b72dbb0f14e87bd967eb4a3699a2d7f27e6
 DIST bifunctors-4.1.1.1.tar.gz 10310 BLAKE2B 0f303a34e219e0245abb5cfedbefd8da8c30f5979ad1cd5f1c831d6c36f4732d35bb3871cce669724eb2aa3c1647c6d2922de0438159acba1f069c47ae9aa745 SHA512 9d572f47bd574e7f740b1c2f12ff2c76439ec3b34657f57efba9f23abb5b42e38fdb77b8bfe20e8896f5a8bb2465fee7c02a1adaf7e02ea822b2660d2e7de278
 DIST bifunctors-4.2.1.tar.gz 11494 BLAKE2B f0cbf4c7338239a3d358e0a551552654525941b8f79df72201a28fde192001475fa3782323f145ad14d23d19790baf22ce0304458892a4ebd1586f4aad008012 SHA512 850bf36f6a575e4f1c937f5d65f499a126b813d231a8cbe77aaab0c5f9462f67b25fcad8ff29629f90f95e201c3408d0290e9db4cfaf010a33bd0e7f336a0a05
 DIST bifunctors-5.4.1.tar.gz 39878 BLAKE2B 2e2c4a027e24fc0324be0fcb93ea0d530313c9d31378b540ae0956e734c0dab17a1cb37367fa90d1eb1bb0078cd67029dfddc6e78ca42961865f6a9a53cd4696 SHA512 2b309a8b37b0993159d383ea07b95ca5bb69bc9fd653d0bd0c502c0598a400e11d4e9c8f25c27adbfb5adff209eaa36c242ca9a2618b962cdd9e843b6fbb1a3b
+DIST bifunctors-5.5.6.tar.gz 44721 BLAKE2B 9f0d588ad514b60ac6ac5fc1f5e1c265b111330e008d57340baee4011e6aadbdaa9a7d24b480cd7d568f57e61214821129ce8785a5731763a08306a2c8151b5a SHA512 d78471bdf9c83c77d49825321984964e165c77ee4f02f8c4232ce272246057b0064b68553f8d70a11a930fc771dc55a2991ff63d6d7af89bb749f23737ba6a5b
 DIST bifunctors-5.tar.gz 10562 BLAKE2B 32323e27e86e6a2ded76a8877a118378f8834f5fd64f7459fb53262ce787034e29ca85035f497a34ec02271f7d5af3017e8f87dca3a9b8f3837c06d6675edfca SHA512 5d25764587e8f358687f0cb3b6b831980d267d43c5a67b16611405c9196094d107e05e369a0de55befb9731f8c561fe80859298511fde4f3cefae4a1a2672184
 EBUILD bifunctors-3.2.0.1.ebuild 722 BLAKE2B 53f7c18ae52a6dc00ed99a9563b40da06d4fe6e34420b8ede395cf1ee7e48f76eb39fd5a89a02d50ccc447625c5b17e80381ff77ee8393cb1007112c945d7eee SHA512 8909c58242fceba5c77ba6d4b9d9fbff5204f1b28246b34e8b605ee842965dca122e3c44e72a4b85d2224265ba2ad37656eda86f12d49c0807d500673ec25770
 EBUILD bifunctors-4.1.1.1.ebuild 756 BLAKE2B 600f89e7f0f3973f5d94ad3b4e3e94dd30f368c42fb41ba33eb2f71d64a0cea6d9602296d4dcb1a05af706647d0265bebb08d8eec055f0aebfc55358cc965407 SHA512 4ed7f28b675ac603e5327802248c5f341f971f9240d5090d730c800d9b4be2bc8f7eb84a97a403b37c1cd458c5448ff2aa17b666e298efbbaaceb377d90b3c05
 EBUILD bifunctors-4.2.1.ebuild 796 BLAKE2B 8a8741f85659fc2aff199c165e5d25dc6f5a1ee9a5258518a48d50b6028224ed5c910cfd23689808d788702338612f254390e794a9df09168c2a52e92809048d SHA512 09d24675960463ed7b107d6a1ece73cb9671d9f774ce26c849ef2f61a4a474e0ea1c9c7f483e9e21e774c6b979b222409ba3538d87d5a48273701ab3143acd8a
 EBUILD bifunctors-5.4.1.ebuild 1463 BLAKE2B e1b17c433fc27ea814e67e71c587e411911a6d1894561fb6203fb6766fba76756b483fdd9a20c3458558aeab1db4a1ac6fc8693dde18a63db7fd0ddccd2f4301 SHA512 ffd6bcc51823e7dbab53793ce440d3823643cc3bdb35457cfe2a9e39b951cfc2301677bcb874863469c41573883ab9e513c08bc731cf141fc80ae6db7e924e1b
+EBUILD bifunctors-5.5.6.ebuild 1310 BLAKE2B 222f243706afa77fd74fddd5133d84d169013bf828cd7482e4c15640cdbc695ab9e9afeb27cd92cee356a20940d8717ead37a731b29c954cea571bc544a9ada4 SHA512 e0db382283bbf3c9ed0c235a290f4c07e71269f5e8ba0602299fa8d206cfb051aeee7c833f318c85d232e14b5ee826a67118314def1308098d3f297fcef8cd0e
 EBUILD bifunctors-5.ebuild 881 BLAKE2B 18fdd05ce5b93d42b6b9b67ed6276ee32ee5227c26f065875e840cc607ec49d1405ee82fe952772720f441b68fec47a9af4b9ba49717e9544fc330b4d1ea78ea SHA512 bdf46736a768bbb62e39125b1fa8fdfcac0a044b2cf7edf5cc710326a6afc52f66970df5230b57337abae6d13bfba98248cb4efc2171d58219b51b28a088df62
-MISC metadata.xml 891 BLAKE2B c13343571cc4e4d70526ee4c796971c829c1009166cce406865a1a2325fbe091323384fa3d1d3afe3c51f79a5bc4ed9d22324215e111e610c9076c1f92f80c39 SHA512 742eb245cf98b8c921f3ab3b0f41105303a7f657f16e96e652d80e3adb28722a38eaba4a1fa07afc60dedcc4ed6a0f3cf7dadef7e2a2e6dd6f1756f0b6f647dd
+MISC metadata.xml 828 BLAKE2B 5865e8bebe560f508f20ec98f1872d273a4f66c9cc82d1c6b41d1d1e6c7c8905044cad4edb2b172d11382a79e197a9ad5928d1bcb023d979bfd9c804f7587701 SHA512 b55961e30e4bf0deef3a33e401caf79dd09225d8bce0665c9e02b50a9a2ef59edf55bd62f0a25ac80bcbfa392ace9a5ac52437fe6a8517684d29ada6eb4afc1c
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
new file mode 100644
index 000000000000..0e03032f6a2e
--- /dev/null
+++ b/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 bifunctors package"
+HOMEPAGE="https://github.com/ekmett/bifunctors/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+semigroups +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
index 7c41a8ab499b..a180f7b756c0 100644
--- a/dev-haskell/bifunctors/metadata.xml
+++ b/dev-haskell/bifunctors/metadata.xml
@@ -5,9 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 bifunctors
-	</longdescription>
 	<use>
 		<flag name="semigroups">
 			You can disable the use of the
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 4fd061112f9e..c0b8983e43fd 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -4,10 +4,12 @@ DIST binary-0.7.2.3.tar.gz 47622 BLAKE2B 8d98846d020af95624208ed841b84378ecfd099
 DIST binary-0.7.5.0.tar.gz 45764 BLAKE2B 824e3bc9c910ddb86d2799101bf8c76ad7e10f81911fed0da3d1ea07c5586a4ad645407b1fa53a853adf5e83bc1b77411e9812ebe7d15923e508e3376110e827 SHA512 232e7c3da1c0055f3e9f211a86e81c76bc44ab1b70cabd23c93634dbaa42eed8bd9314fbedc16b9703d3ca92b0bbf232e6c30bb1384687dad0e6e85c9abb8947
 DIST binary-0.7.6.1.tar.gz 47086 BLAKE2B 7d81b9c254902d5ff2bafbef4c31a6f6f0396202d8585690c1ae3b63ae6ed157db7221d65a62e393ee8f6725ffd5d80e51030c0351e954b06004fcb70e5867cd SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2
 DIST binary-0.8.3.0.tar.gz 51900 BLAKE2B 47e7db8a79e19bbe8cfde3f0b5d3c1edd441606ec0d70f5f02cdad3856dbb35a451b667c33beaf26d8fb57497bde5f3a03df704c458337e065776bb98b308135 SHA512 9b16143067fc974d2dbb4bd42833454a4516eea7ead7674079911b969c42547ededb87f95cd5767553f2105e2f9bb5b2ba08b9666714aa30e56143e606711d44
+DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
 EBUILD binary-0.5.1.1.ebuild 681 BLAKE2B ccc15babecdbbda815c68104fcf14334251f7c475eb3569f9ab1f12063fa3a021860a2ea77840030645c11a8da24c91886097fa5e1db84c7044e14e09e6aabb5 SHA512 d97bed87d16f11e2f5b251a90a6aa5083ab9feb175814082709fc07f7fbcb891815ce4c51c550b08e5f1e546aae5fb2be746fa9fc725ccf3ae82a0d6d4d042a3
 EBUILD binary-0.7.1.0.ebuild 1127 BLAKE2B 5cb8d3f792cd6671ed466ebac25e0e39c84a07ab620a5974cce6bacce84c0385559ddded2e5a919b91f4bad823f80590766e3d9978740b1ee9792c057d1f4d2d SHA512 cad878367fa75a74073f1ed370a1d762db6bcae25fef49c41a10e0bdcf7fc90dabdd5810a126dcec2ef043a4c3d949defd4d09227149142286af58772c4bca6b
 EBUILD binary-0.7.2.3.ebuild 862 BLAKE2B ad0d6022203ce435620577a047f2a835310696284fc58646c043e03696737ed22ea157fcc24f4ed15f7e04f6ea5a74e49da750744226a4adcb35408855f27db5 SHA512 2f2f6527bacfe6ae39317e91d66aa1410e337685d66ea89d76de6c17c7993d570eeb3d6d395915f7fcb9c20930b3969250520504843d5a231da33f809a3471a7
 EBUILD binary-0.7.5.0.ebuild 860 BLAKE2B 7e1edd2d82bcdf178b61b2526e5da8e6e8bdcad8f13641aacc8ebf477c87c0856ecc9e4fd03a79ded8110b873df37747ec3ac157b5cbc0aa15292959c11baf69 SHA512 71d470a35aa7d299438455937900f8124a997693b52bfdc9c6d9267a20138c305c134ad19ba653bf5308465622b979320e7953c223fb287094c24f3d855fdded
 EBUILD binary-0.7.6.1.ebuild 745 BLAKE2B fd6bfcf3a8b743cc64013a2ebf28ad415475e1b8f12b2398b984131db7b6114d56f064ed65b25e85b8dbfdaa118e09121b09e1b5a34e24c888e46539bf19d965 SHA512 8c505b551b8d5b1aae97ba4c1aaf96dde4dc055b205aea116efe4885841e14bb61f99531ef8a972530e3245296d146358c501028539f0922eafe8f9daea7f08f
 EBUILD binary-0.8.3.0.ebuild 937 BLAKE2B a766a1284a9208dd34918a85c25a75c750bac5145dba56cc4349269645af52cb522c76912a07da1160aa5b126260d1062820f859a84cf9144c717394e7478916 SHA512 0fda34f172b5dd74a2b67dafa8e76c96fa6343f220f1cb8c746d270935ed9ee55e45be49ba293fc307bcf12fcc318740d4df8dcdc47cc7df74796436c675507b
+EBUILD binary-0.8.7.0.ebuild 1157 BLAKE2B bad4b22ba7fef0efe03e4c82f3b1f115075000ca361c33a9f51df1343c8501e046ddf57595e351dc722af98436d5ed355007b51e0fa42741b4c2081224908a1f SHA512 90be944aaf5d35cd623b04fe0174fcbb3f25caabf59e5ad82da326d598a7b596bf5c90d6b8ea2859b47cc2036b3ba79792f9a442ab099d8bc66e6375498b29ca
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
new file mode 100644
index 000000000000..47206fbe4a64
--- /dev/null
+++ b/dev-haskell/binary/binary-0.8.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="https://github.com/kolmodin/binary"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # binary[test]->test-framework->text->xml->binary
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+# 	test? ( >=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
+# 		dev-haskell/hunit
+# 		>=dev-haskell/quickcheck-2.9
+# 		>=dev-haskell/random-1.0.1.0
+# 		dev-haskell/test-framework
+# 		>=dev-haskell/test-framework-quickcheck2-0.3 )
+# "
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha1 PM:9999"
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
index 811a6ba1bfc5..39464d3ae748 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -2,8 +2,10 @@ DIST blaze-builder-0.3.3.2.tar.gz 67371 BLAKE2B a9982be738d47767f159cd6605d1331b
 DIST blaze-builder-0.3.3.4.tar.gz 67399 BLAKE2B 302edef237e923623b9a38f994d7aa6d8afbffe130572c53c48fabbe444ead90666e8e674a2ae776d65af17d8b9d0983a88e0896a5391a088bb0f1a31e58c727 SHA512 ed01adaa4fd4a95926d34fa785c9a1a127e1094f1891936256ae593fd492fa3a55ade6ad5d62610f3ecd6662f32facddc5053da63e4ab3e5f3c329ae6950bd23
 DIST blaze-builder-0.4.0.1.tar.gz 57113 BLAKE2B 34e3601e6ae41579ab538800a783964cd98209cdd903052a2d733482348bbaeed8501a7e62ea2a6721d66f7ca619ebc82e4b4a1bca707e4a7712e55798c5981f SHA512 876c12d75ede8876c834999a4a69794fbc1f56e888eea3a976cc85707456bb1439ac72bc41dea1c2400c6fe761d20a6b7b9eda61c10fc390fa5c5c0b22aa3ff0
 DIST blaze-builder-0.4.0.2.tar.gz 58681 BLAKE2B 713e932ccb404dadd9d4f7398ef10e26d7d452d1c56c4a617315d5f50ae1ffe18c3bbeba9ab1bf86442c966e0dbbb1056c7942b4e98fb6d1e42a457dde0af83b SHA512 ca0390d1e31d1fb65f5739a15b4604e67d01aa1ba2f98ac6e741b277e64e79e8d65eca581aba405b65136261654f3e116c21ae4b4018d74a784e481c2ee9d3a0
+DIST blaze-builder-0.4.1.0.tar.gz 61365 BLAKE2B 6c6a1c2f7b97a75bb7489471e34674d0502ec1b2871643dc945ef0574d94cc09c2726d03fcc4f38d43f34baadd8629a0e81d5292998153ee8b907d546153488c SHA512 0962634113a19d39fb19a9df895a4e4e3e0fc5b2c17fd0d5c27e1cd9da128fd3af2f01d7b0ce894d3964b5b3bd874aeae205b126e069a6e5d964ad97c753da39
 EBUILD blaze-builder-0.3.3.2.ebuild 605 BLAKE2B b6775c368a18090bde64eb843c0cf6eb3fcd5c48485d5818484330f36306a4432b255e21d999d99aeae1881c3a74ed822f70c1c48016eefb86ab22f5e96e8d3f SHA512 3f598fa0dedc097d28651e8d72ebbd1add5bf2ec1a707e1c1a778dbf6d9b762bcbba63bfae80ccd57a7dae9fd3c0bad9a302e6fef87ec40f6de374befd8b10ee
 EBUILD blaze-builder-0.3.3.4.ebuild 600 BLAKE2B 3f0bc30f32c415b85af1513540b52e1e234fe3b9cb80779ecc5b34e66e8b807bde5d2c6127d30fdfa5e5d6e26a64186daffa617444c2e90a98604c5c9c79ce7f SHA512 cca609f9ea80ee28c2744f0de0a946dfd55f6005fbfdd02170f6339949033b290d1dfa59c12e27817097de43742282243ce01461228bd354ec8975852ee18dd7
 EBUILD blaze-builder-0.4.0.1.ebuild 840 BLAKE2B aa2108fabf7f81f9b92e6f43971f32a8528a34a7b1bfeded72cd8cc7ac90c04dcc5a6fcc7fe13e6b2303cfde8897310fd167aaa9c5ddba31e60268badaad3962 SHA512 728cfa4e68e204107f0f7a861c22f8163fc3417cf4d0694e896d38bc596242fac7d978eedc6ecfeec053d224bb77f9de7c61b5dfe9b6fb00dfde66b6137439d5
 EBUILD blaze-builder-0.4.0.2.ebuild 840 BLAKE2B 0792a3411cb8038fbb769e643ac9b82e1ec8c3c7bc260aba4926af183fc24e8e11488bdca14b2bb0bcc98ea25b95cc79009a1aaa43289861f7724f3f8c389998 SHA512 e0da490c81d9f43fac01cbb4f755404cbb2dd530d24f61bd00aa54f8ac453cf385171ff8226b6fb0fbf6064e19d185eda8570659b041fb26b050c200c35a1e0e
+EBUILD blaze-builder-0.4.1.0.ebuild 924 BLAKE2B 42319d33362621fde57b8cf86324e0fb745dbc9aaaa5323f2ff523512e72d856f8b0437a56c1136b4d6b0e093c3b2065479ecc2a29f7bb419df29ee0292c3a20 SHA512 fd87e81c2064acffeb96777ea7aeffb0b1ebd5eb4c739c1c3c6e729705c004e5780de5f10ee430db4a068e90df16d8212621aa7ccfd99073840f9392c5db3faa
 MISC metadata.xml 869 BLAKE2B 8b303ed458de5f7c737fef499b4a8003eed954c6d88c3c11771211a2434c072aa0c71a60f8b460bc3a7f17346164219755f0742632cf6554cc45e4a9ef76a01e SHA512 12044b2ec31a87d6639aee82ab51439d5360aeb3db7f6ba44281fe5a96900b3c213e664c6c292dbd6252e296cd66f6d3c52b22d6f61ea0e100007889959b514a
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
new file mode 100644
index 000000000000..21371dc7e524
--- /dev/null
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient buffered output"
+HOMEPAGE="https://github.com/lpsmith/blaze-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2
+		dev-haskell/utf8-string )
+"
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
index a8819938ecbb..43a852e93d78 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -3,9 +3,11 @@ DIST blaze-html-0.6.1.3.tar.gz 75658 BLAKE2B d75fcec101f424bde94647cdd314ffac2b6
 DIST blaze-html-0.7.1.0.tar.gz 75872 BLAKE2B b118c4b7b4ae04bc2c02d7396478f971a9e0dff5096ac57851f68b1f62fdfd99745a5cd40dd0f2528b65c7a38b5e44c49cacb9d022ae2cb22a80c1de8847b091 SHA512 efc007089172b57493b0640e1484706f7b206ac9803699b0c8f5f6f74e74482dfc555d4a0e828fc2809d47b6015020268805b38109890f063b51c9f91d521896
 DIST blaze-html-0.8.1.1.tar.gz 76157 BLAKE2B 7bd5eb7d051a045e0dc0a3d48577da961deb90bd73e220c0556799018b178761cda13f636d37092d7f2e53b08a25391272b93862467210e92939b78e2e34d33b SHA512 0af9754c5cfd25757c5f1b8514ee37cecdd77a6397f513f6d4b6be301308c11c64d8649d2cc3e9d7ffb85cc9d9fcf18193a8bdf9e19466a6895243c4c338af91
 DIST blaze-html-0.8.1.2.tar.gz 77898 BLAKE2B 34cacaaaf68b81baa77a30e6a208dcb802071313d2d2ed3adecf2c48fff140426566e115984104c31e6a52faee2de1301022b8acca74951f092264c2b33abb62 SHA512 0b786b6fdec9c9e5c458eaf1a2504c0afb32293a8e1750d5e0413041f863a8c364675278d80075d9423387f4cbd50e1476016c1ab3d46a6cd27aec06d6899ea2
+DIST blaze-html-0.9.1.2.tar.gz 81617 BLAKE2B 36e86647db47ee55a32daf2cf2afa51fd58436c7de7e7dac81b298cc1ea7e1ba1fd470d2a19def3bc6aabc51bd046c8c611300fa4ecb5f0e1cee2286a0b461e6 SHA512 26e5294285033fa453ab9914a5bdb37c42f5b7c3a10400be1ff6dd125a70499d556c106cc8128154dc0c455c8b80b489a883265fcb626e2d4afcd8e4d94374bc
 EBUILD blaze-html-0.6.1.2.ebuild 1274 BLAKE2B 45a2f55435963ab138a2b7d6251f4ff33d88f9efd5ee2f76834e5f86ceb5aa1d4e8db6f55e2cc49e63219e0de8ada9845b304cf5e916de084e7c5704fc71d21c SHA512 1589460d6681f1b53804d493548674b33fe3d9133bc359c96fdc514b3546ec638d00250da051ba32a6b726ecb1d5c2d2a97fe97454c2a1365a6f08e9b531aeac
 EBUILD blaze-html-0.6.1.3.ebuild 1156 BLAKE2B f64615c50f6ddab985cd11bc506caaeb9fe0aef0458e983c0b9a0d5d452319e0848443b9db43c015e2e80864af64ead0bc4c73ba82791baa63a3dd60226d8a54 SHA512 1468506795e2b2d6c63a9a9665333dea6417e3d8cc47db85b6c6780b25e164baf072155f3b86bfd6ff23e6d4c042d2c6077bfbad909d6e5bc72133424c53665f
 EBUILD blaze-html-0.7.1.0.ebuild 1150 BLAKE2B d5a438d8a303d3356243148beba163a0f8c62f88f147abde82d180ca3ef171a9d9a754909863c08d32419d19203d7837f8c0d9d55dd05cbb1c7505a8f621a42a SHA512 9a71383b8c3978b1713ec8b7e78a0dd197227ab537e9a8b1a7d1f8273ffbdceb7ad7c693cc73e62bf9a3fa6c454297be263392427765878be0be54bec274bb5f
 EBUILD blaze-html-0.8.1.1.ebuild 1153 BLAKE2B 2621551335fee98d703b3b956b1bb714446368cfdfc5c346e5601c41f81cd410fbf352dec869f0a347233c33a50473d498fc1354ac82eaede5a82d1c9ab071b2 SHA512 aa07934e5f5c79dce815ebbeddfd91cdd3a506abd8e30388b66dbff8a3fba4903e3ac0a6b679d17084e53269523a53c3a99709081aad9f6100466f71a4c73435
 EBUILD blaze-html-0.8.1.2.ebuild 1152 BLAKE2B 07216fed4f7fb01f4c534ca5467f2c1e9e73f135d10990528a0bfc59dda168acb3c1d8c791bed2713bdb2a0ab4ed3a7667691b8f5fec431a02690611b53716c9 SHA512 2f5e7700bf0751e976d9e9fcf94a19cc21a9cd8b5bff299d44cebbc9691c96da84c0f0c7c76181081136abc49681a939780370104a25e17e830b50bb982ddacc
+EBUILD blaze-html-0.9.1.2.ebuild 1150 BLAKE2B 5ccefd5567aaf060df8753325f80cae06210ba8e053cf3945c3635fa8c9d3d382d0a5fc0a819327f63d4eab36fa8442877a622abf9ba382decfa241aa0f96c2e SHA512 72b497fd831cefb619feff6e9674f0392e2e88230ec2be429ef546b05db9d75b5095c376bc7553d9a1841b20bf9f99ca2a0567445c3fce76576829c7e9690bb9
 MISC metadata.xml 498 BLAKE2B add97de60cd5374c7cd17dcac5aa4bdf0f6433724a4abdbbcdcaaabdc2bf0b8ab1f191079c573b9569076bfb8c773e7a4b6cbe105905f57c101c8d15b1ad10b5 SHA512 73c9c4ea7f0678f756c41ec10ce6161ac4d4dbaaa260dd317da24308f57f70ea5317ffbbad3380724064c21820cfaf278a06129bb1a2dcb3f206b92f2f719a33
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
new file mode 100644
index 000000000000..6949fb57f373
--- /dev/null
+++ b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
+HOMEPAGE="http://jaspervdj.be/blaze"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
index a4a47dc57ccb..73d312c0b548 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -2,8 +2,10 @@ DIST blaze-markup-0.5.2.1.tar.gz 12069 BLAKE2B c67b14c238c20bf96f19387d0f08335c8
 DIST blaze-markup-0.6.3.0.tar.gz 13348 BLAKE2B 5bac4df7cc3e982f1b79245470aca97f00d84e6bfcc9a3ac2e28d3eebde98148f3880a56d2d6f9b615acd56198b823bb8c821f8d2da522d59593b4064cd0b87b SHA512 01ce41593242ddd6effa4ee2edecf461f434992b85fd79e1df8bd766a5879bda545842ea84d30f0513035fc686aeb624373a1de2377d1f5cad52cc1482acc318
 DIST blaze-markup-0.7.0.3.tar.gz 13447 BLAKE2B 6934ab2c2711ec0dddc0068e5b523291d93b03ba9abe81761b9e39f95c9c45978c0c0347b0b5824251e6db0892590cd261af6dbdcbe6b10714452dd20364c02c SHA512 295188911304f32addd19ae8df5f69502cad65a09778c65fede6eb167842508769dae5a0b7eef7451fbcc767d3a0079484a3ed8d2caaa9a841fecc6d5dc4d482
 DIST blaze-markup-0.7.1.0.tar.gz 13548 BLAKE2B b914629cd9df285e6a552fad789aa0179725dba39ae5d0fb13ae669eeecefdb72bb438f4208f92585841c69d39470517794736fac0d3e0969c68f65f5125675b SHA512 42c3c0db1141b0f67f720795fef8d8cd5e4ae6d12851b6048caecbf57062f8422d3101f80264534d70eab21465c823ff29f037bde948da43478c9d9651feda77
+DIST blaze-markup-0.8.2.4.tar.gz 14518 BLAKE2B 43f07bdfeac60e60b55a7a0f8a1bf3c1386597b09511a6df2139246b05d10bc66899ffad7eefbd97cc1c981e7dcc8f7e345ec41675293599f22e1d3849ecd5d9 SHA512 e75fe4162f165975febced4d54460c64a4a4d1ec1db963fcda7d1c1e2cc2c24f8eb565ba0170524aa28da3b3cc1d8057d036a1ab963052436dd550189d5cd263
 EBUILD blaze-markup-0.5.2.1.ebuild 1159 BLAKE2B 5d4f1c08b39bebfc977e9f2ae5206b7ffcf321d64b6584877871d90062ebd4cf5d5b5867e2c63b219ea3e8d38a26717c42724a1bcd30f8d18c163993526d260d SHA512 c60f1553a3f7eee120313a670ce1c44f8825026117e9ec4fe08497610b102693772479fe9e5b2fd4faf9d95a47839184df96c4da65f26b00637734dba156d542
 EBUILD blaze-markup-0.6.3.0.ebuild 1068 BLAKE2B 59d605113b31fa4cb9bd7f0905757f0eadf7a321751eed0a5662435f58a45622182cf90951d7e1bbec094e74ec70676db793a6a8be2d916eecdcaedcbc9fe559 SHA512 93ceb7b029d932f3c8c717edef75bad7cf183509d946324d1ad5d0ff0ab3aac704f678101655def0b500912f94e49822726126b2a6000e28a568e90b32ea7dc8
 EBUILD blaze-markup-0.7.0.3.ebuild 1068 BLAKE2B ff52ba07af4a5b517f7963bf66a4df2738a3d47524abed35bc94dc78fdf654261d087c5f961f28c83f46e2032b782963c1c543edffc0c044bc7233e3fce0cb5e SHA512 b6792af980bd39ffa44617d4300235795794da7abce0ffd53228ef5962ba42fccbedd5114582c6eb52c32ed3adbffa8328bf1e861e8f3c7aca00a28b9b37da09
 EBUILD blaze-markup-0.7.1.0.ebuild 1067 BLAKE2B 797a7f5eec149cf6deb2f4a33f014774a37372eedb74052ce42300b4ca61ce8d17a9861999d52ef887329d3416d4e79c30e795d2a2e869c5d33379255ca361f5 SHA512 266fcf5b77573215297c43d8837fb800cd91e8fe30bef656eb13d8186a6a4e1232a3755fa3b24ead2f989bce39c1f7691991dbd196a5bc77290e4098b0e54fe5
+EBUILD blaze-markup-0.8.2.4.ebuild 1118 BLAKE2B f165cafcb59f31f0f443e9c21668ff8d1bdd945394913e056ede4e17b12c46dfdd338141dbecb86d16957eceba770a4d69a318fa7bcc6502e6f6c6cb3abf051b SHA512 5ec276539afd075eb0514e4250bc2cc79fcfb32aee6b71e42e647996fb3947dfe512b61c6b161a2b752442c85c52003d681ceed1529cbb53305776c00399e5c6
 MISC metadata.xml 516 BLAKE2B 64cd165fc27b6c1570dae7190e0181a92bb43c54038760f7c843fbbbe0d6faeb783f0d3e2d58ab90214b15775dba7bbce88c6b5401cd4f9b165b2bbcdc76a080 SHA512 a3395d76bf164a2cde4217dce26e35e894fc53f0a977134da64959e857a8640d0cb22cb53c33ef0359d782abf68f8527f01b18f5f0ea3278ec9590d9024de1a0
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
new file mode 100644
index 000000000000..4de88dc0c818
--- /dev/null
+++ b/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast markup combinator library for Haskell"
+HOMEPAGE="http://jaspervdj.be/blaze"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base          >= 4    && < 4.14' 'base          >= 4'
+}
diff --git a/dev-haskell/boundedchan/Manifest b/dev-haskell/boundedchan/Manifest
new file mode 100644
index 000000000000..748cbabb25e6
--- /dev/null
+++ b/dev-haskell/boundedchan/Manifest
@@ -0,0 +1,3 @@
+DIST BoundedChan-1.0.3.0.tar.gz 3591 BLAKE2B df6f085ea129efccec006dec7133524fc88332fb6451f8ee63702b985e6481c5741aecc0974c203f43b25f63036dbf0935e44e4a9cabf3f1c3574be9580bdf26 SHA512 4d842d2b499dce265329f81a402fbda2e97e00b7e04d55176225f6a1284d5dafae4712df1ab71effd328e65f218c582440d4db3e62e253033da49339cbfb7055
+EBUILD boundedchan-1.0.3.0.ebuild 615 BLAKE2B b37dbc5d0cc1b414aff81d183f026a53e02f4f9a280e9a6a2c59e79432c33c17594533efe2c6168285f29d0fe6b5639ee07d99f12ffb683bfaf02b498b5b0bcd SHA512 863b35dd90444fee5f3b00b3f47ba29f5129d2524d23d454b26095b48f4bc2a9fff1d0029d5178063995ddd966f7ce889d9a22012206eb5c7f647cacc68a3b0e
+MISC metadata.xml 444 BLAKE2B 7ac8ff997977eca7391b982a47f0c6af68a2c94cfc92d9c0aed80bb2818c6d6a1ec63185539f134bdd0e3b4ea8f60e9f0edb2ed7358a258eae6b216f2bfecc00 SHA512 aeda6f3ee8572a41e1a410131e9956002419d3cfb1b39a78919f34bb503f935b2baf5d8748ffe0db563ba68f04d2bf5fc381f5ced280115017a74a2a36d9c5c9
diff --git a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
new file mode 100644
index 000000000000..41b72027abd9
--- /dev/null
+++ b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="BoundedChan"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementation of bounded channels"
+HOMEPAGE="http://hackage.haskell.org/package/BoundedChan"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boundedchan/metadata.xml b/dev-haskell/boundedchan/metadata.xml
new file mode 100644
index 000000000000..44ffdbacb027
--- /dev/null
+++ b/dev-haskell/boundedchan/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library introduces BoundedChan. BoundedChans differ from
+		Chans in that they are guaranteed to contain no more than a
+		certain number of elements.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/bsb-http-chunked/Manifest b/dev-haskell/bsb-http-chunked/Manifest
new file mode 100644
index 000000000000..8234d427226f
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/Manifest
@@ -0,0 +1,3 @@
+DIST bsb-http-chunked-0.0.0.4.tar.gz 6630 BLAKE2B d16b539f34518aaec4875b7644ceebbf50b94ddcdd9a2bb612dabfcd5eafbaa9753d187a5b137f39126993e0b75c9ffcebafb3772d948b45512e33ff3fae1dd9 SHA512 74c04c2fd372067c42d3631cdfc2ad7093c0c3af1145833ab307c538dbb936d2042492d4e81c520c3adde8634df29ff8558822f06f226c52d16abb4a35ab1a13
+EBUILD bsb-http-chunked-0.0.0.4.ebuild 861 BLAKE2B cb11541db50cb13b8908f1723e1d716c4f19ece90e70d4a03963bd3b64711b750c5b008277b2bd5ccb421963f3e40a368691312a8269b07d447d55b9b4511835 SHA512 79894ff98466f5d78473a3ff290b14cf45f3822310693237f9465c5f1400a1551bf78e9cf7b5dbf2fa4d1f6033768b0b7d73b47038e651ee86378e3a51c1f3ca
+MISC metadata.xml 669 BLAKE2B 3a157eb5f77e8211e0d0a8d0794a8ab8de231549aa9318b0e95b79686c44639c70578abe0bf581209003ee8e162095cf3635baaeb299c8f71adaf01592423d2f SHA512 799a83f15c32d666ac15cdf26ca47470c7af39e0917bfb6223817663305b18066f47975727eec4cda312d19c058531ad249f09d013419c5c5f4a4cf3f3fe93ab
diff --git a/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
new file mode 100644
index 000000000000..007a3169ed00
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Chunked HTTP transfer encoding for bytestring builders"
+HOMEPAGE="https://github.com/sjakobi/bsb-http-chunked"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/attoparsec
+		>=dev-haskell/blaze-builder-0.2.1.4
+		>=dev-haskell/doctest-0.8
+		dev-haskell/hedgehog
+		dev-haskell/tasty
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.8 && < 4.13' 'base >= 4.8'
+}
diff --git a/dev-haskell/bsb-http-chunked/metadata.xml b/dev-haskell/bsb-http-chunked/metadata.xml
new file mode 100644
index 000000000000..4b1a4e670b6e
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library contains functions for encoding [bytestring
+		builders](http://hackage.haskell.org/package/bytestring/docs/Data-ByteString-Builder.html#t:Builder)
+		for [chunked HTTP\/1.1 transfer](https://en.wikipedia.org/wiki/Chunked_transfer_encoding).
+		
+		This functionality was extracted from
+		the [blaze-builder](http://hackage.haskell.org/package/blaze-builder)
+		package.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 551e1c67672f..9e292da47ac5 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -7,6 +7,7 @@ DIST c2hs-0.20.1.tar.gz 184115 BLAKE2B fd55ee28918c41734096cfea50f40e1a5c56d212c
 DIST c2hs-0.25.2.tar.gz 198733 BLAKE2B 853faa19ba91a4536bed691d0eb26969dc96ef6830512441a1d14e193f084e0ae36d846bfdc160abf6d08fda0d7e9706f9c78b9be627e4c2864e3d9d2e098576 SHA512 0f3b2df55277f9f44e39270cdc6a5695dd15e8095874406de5830c2d7d45dd364abcd5eafc9323e2a76eeb6622aa7da39734995be01e7f026d8f2395803c2ef3
 DIST c2hs-0.27.1.tar.gz 205108 BLAKE2B 268ed9f95e77d292626e0fff6e1ac8334204dd1a1b7474e62746f8be444e57b1f3eb22eb2a4e46f0682c687fa01683923f22542d6b7456566f22d8ad7cb0ed81 SHA512 22894e518512a53ed23b2d6e3395918a1fdfb60180a9ec489bb7fcb70d5d870bdb37c66e9a49f07ae5babf3808e57f1d932e13cf80132ab50666c6899d55d62a
 DIST c2hs-0.28.3.tar.gz 253559 BLAKE2B efc0965e955b05456385648750abeda3371cb0417c508bd8590158289d699b019d88454fd17bb7f9e49f450e581ca6367e08d958ccc1ad7ef56f8a354d33deb2 SHA512 17306b6ee41623d1c017581ed7aef6118a66c30a4698fa95d588b30ac625a6571906bb1fffecf7b86296667390d18cfe5ee2ade85098075f2ca982922b358b3a
+DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9
 EBUILD c2hs-0.16.4.ebuild 1030 BLAKE2B 8442d0927c74de95e00a2dc88e111e8f65b8b54043510005b04e8a539f408ddd7c78d6f1256a1d8013260e3a006a24997d093bb1af09a77e1884e5055c8c36c5 SHA512 56e77f9e7a79e14663690e69671030162e42ad3ce9ad4184d7b0dc797af5ccfc49ee15f32b4b5b6ec01ef9cd1bf23b118af3a5901fc1a37b78bd23a94937d035
 EBUILD c2hs-0.16.5.ebuild 924 BLAKE2B 7a181b9e592c4ccea79be23ea2addb873814dfea5f3212f069c3eddfa29f7fcb1f6a3dc0ad2d5e2cdea7341ccf7790079371d95a7be46728022b8fa078b9878f SHA512 cb8a7bd196f4c36a5ab6bc90b0aea520db3a46f52a0d332fde789a1ecf13553fa005efe94f417b30841fbec273554a73bb65a5105af5b77844cd08056bfc9a52
 EBUILD c2hs-0.17.2.ebuild 772 BLAKE2B 8486b9b0a6dee54360afbae3e3d691a336d359ef22cd76a9233d7ad0bc1201ee708e80bdd4d71236186ecbfc411bbbb0b013f385fc329d552495e8d1103284de SHA512 cc9e9112eddf81e8eb34902ce55b9d9191fbdf46757d2b365e7eab62d7a15fa3e1e48bd6f3396ab9493be5ec1ed7bd48d8df989c420c81f8ac6e2be243aa32bd
@@ -14,4 +15,5 @@ EBUILD c2hs-0.20.1.ebuild 796 BLAKE2B 94d2381247cd632a80f6bbd128a32127b05e6f1e6d
 EBUILD c2hs-0.25.2.ebuild 996 BLAKE2B 7ae6c0b2f2990d01bf6884f251ef844077314f2675ff776a6297bb84007642d6f8e67cf0124311d7fc4f1aec2a28c52df88fa689f52f2d22fd573ac2bbd5a608 SHA512 748e3375fe614a821592b57b6863a1e92111b14da4245019ec991d079b8c0a5d0a0e109c25a6ccc6634b725cf0876fa1ef0395eb62bc89ff35c19b3fb76cac45
 EBUILD c2hs-0.27.1.ebuild 996 BLAKE2B 4c20481e4275cb094e5b35a81a310af0ced621bd8b0a28710ad45ddd3242e4999bcf1d4a6be0c520e9f7c0a44003dfc2908c20456b1a3ce2cdb965efb42a98ac SHA512 6e095eb222d6728fad1a636d6363424a0aa98d9b204e0d3348e6e9b89a3b908a33602bc1c3f4c811d654d46902024d44100aa7f357ffc91688bc4f369bab7121
 EBUILD c2hs-0.28.3.ebuild 992 BLAKE2B ff8c67b6130b369dd0e569d404a4e98c14bfc01b9628da0a413a44121af312c5f30e871c0bd98a13e478739f4972511462df591a44251e59752a4d48cf8452aa SHA512 a9088ab44d4ee8e9006e0d024087cf2fbc97f6aa1450a7973063a16be3fb5ab74b7af67079dae3c9357a0965fe5e0162695f0bfd65ba22332e89dfe025cfe442
+EBUILD c2hs-0.28.6.ebuild 977 BLAKE2B f912543b5b0411143f1f1534f1c2e1ee0fdb64d50ee4ed468849eba2fa635c58df0fe1872e5d7c4ee384acaaab4b47f90dddb57d6527a3e24308f72704f51048 SHA512 93b43e383b763d9acae9fbf5f3762f0012b3007dcf4e81c705a10bb7a84b336d2dc1e5275994dda95565c71d5e0e21e0bd8ac6bdc0d01b0111f62921eca4ac12
 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05
diff --git a/dev-haskell/c2hs/c2hs-0.28.6.ebuild b/dev-haskell/c2hs/c2hs-0.28.6.ebuild
new file mode 100644
index 000000000000..9f52b7a66514
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="" # test-suite fails to build: https://github.com/haskell/c2hs/issues/245
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="regression"
+
+RESTRICT=test # broken against shelly-1.9: https://github.com/haskell/c2hs/issues/245
+
+RDEPEND="dev-haskell/dlist:=
+	dev-haskell/fail:=
+	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
+	>=dev-lang/ghc-7.4.1:=
+	regression? ( >=dev-haskell/shelly-1.0:=
+			dev-haskell/text:=
+			>=dev-haskell/yaml-0.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag regression regression)
+}
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 4fbc9298e72d..4e18b15fb0f8 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -4,8 +4,10 @@ DIST cabal-install-1.18.1.0.tar.gz 257577 BLAKE2B ea5d1eb3458657b81f04b2de1bd17b
 DIST cabal-install-1.20.0.3.tar.gz 274779 BLAKE2B 4b46e3722305566e9671677292a3ef64df9ca018dc54c088759a396b04bbbfbe28a72dc058cc98cf8ec552846d47a07d9d792a02a5834aa7808052183b4a93b0 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f
 DIST cabal-install-1.22.7.0.tar.gz 302579 BLAKE2B e8a92bc69f0b00e5fc12145277216652fa52fb1de9ce3458b5fc3d9bc6f89cfe3a95d26dd7585566b55c55c2a9b2d021336baa10694aa39ca442bdb58c6997e7 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766
 DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
+DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
 EBUILD cabal-install-1.18.1.0.ebuild 1416 BLAKE2B 3e87f5ff4f19dcae30eccbfda6b5dfda99508fe37987cd35ef5e96da55a010eece5bfb87b4c29553df8728d5024a5f20f45825f4c32a96bbfd6e131e3c12ef49 SHA512 fb1a19d36fece5093c634bdd3dc519f8583ab548b8179abf357a988638a171e70fa2f457c0999582784207b53d9cd039ba8634f38876636f2cc3fcd4d844c044
 EBUILD cabal-install-1.20.0.3-r2.ebuild 1629 BLAKE2B 6cb1d44d0ccc2f2d632b0da3af327e0896286e654c3949d0ca3084690985974867257a31836dab4e87016a77da9100e9fa1f29ba5eb06e74548cc203001324bd SHA512 5a7ec59f48a7c85c9ce2fa741823b07c6228b6706cb111e58d3c7a386f96cebb74effb1533b2a53e7b74e9744e14278284b52f5f446b2ab2118c00e2f187f66f
 EBUILD cabal-install-1.22.7.0.ebuild 1883 BLAKE2B 736dde7384f9d3a099fd4bb63013d1d3e9cc0ac19452b19e93e8b6c0b62def45488c53917a9a03680a6bd3a1fd799df08f30a9223c51583b7e1177879f1e0c24 SHA512 c30d749043b2e3bc08f7a8715256b507f86b76c3349c851743e14f2005e6a5a7e866de618bb1f60e726b3174cfdf03e7bcc9cadafa998d8659d140582cb6fea8
 EBUILD cabal-install-1.24.0.2.ebuild 2408 BLAKE2B c2b3610a41005997f6ac0fac5e8c950722a9250d3490fb8c07cef67b31b8547579e0fb83467e7aba7b7d87dc44cb7b9dfa27e6298ea72dcfb8d1d649dbf8e795 SHA512 255447d3d772615b66e16cc92276a82d1e898d9e0960c3448c98279719cbd56cdc69c93e6604a91af8dda9a3feb27eeec3e4874b974430702800d0f9f1fbdc2c
-MISC metadata.xml 668 BLAKE2B acbff9d85af49bb29555d6a9d98d0b4342c5617e19bbb087d767bd5d1167df74e804890b4b1cd4d93f06b6565fa73f66e6f3d9b53e2923312fb6ceaa75a494d1 SHA512 fcf0bad8448b59a5019e8cb993952fb1f073ca0a7f78a41d83d403759837099900fcb03ce2a38c800515c4e88ee5fe49fa108b6b8b384eda0d28e08b2d3d2e13
+EBUILD cabal-install-3.0.0.0.ebuild 2473 BLAKE2B 4d648dc0b2c118e574013f63601657f5cf3da3667d3e8625166b087f9b2c30594cf2901c90abbd11faefaba90979c7668d95ae9c33bd2bc7becfc6c9757c0cc8 SHA512 8849d37c06b253f4b3e6927a8d728aa47dfe50cf16d1abc557cea09eeed16b771e5f7fe2ff303994793f3a51e97b178ded109b1d082d2b809776610cc0a179c9
+MISC metadata.xml 773 BLAKE2B 3be3014c36c393086afcfd6723ff532907dc89eba816f512fb05b25966ccbce4cc1726a45284703f8ac9cebd25cc070a9870d592828d8928f22db78e85a21279 SHA512 e6176c36f85f5764e8974654fcc599a1f4c9f840d8761c32d1d5e7103d6e536667618fafb37c0741c57bfd1c0cb9d283cf0cfd0e0084710bec2ed1263f25cb6c
diff --git a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
new file mode 100644
index 000000000000..d2d67c73fd0d
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86"
+IUSE="+native-dns"
+
+RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
+	>=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:=
+	>=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:=
+	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
+	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
+	>=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
+	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
+	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
+	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
+	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-7.10.1:=
+	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.8      && < 4.13' 'base       >= 4.8'
+	#if use noprefs; then
+	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
+	#fi
+
+	# no chance to link to -threaded on ppc64, alpha and others
+	# who use UNREG, not only ARM
+	if ! ghc-supports-threaded-runtime; then
+		cabal_chdeps '-threaded' ' '
+	fi
+	eapply_user
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug-conflict-sets \
+		--flag=-debug-expensive-assertions \
+		--flag=-debug-tracetree \
+		--flag=-monolithic \
+		$(cabal_flag native-dns native-dns) \
+		--flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 31f7b7e26dba..659d87e35f01 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -12,6 +12,7 @@
 	</longdescription>
 	<use>
 		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
+		<flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index b2a1d487544b..370b0f42b5a9 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -7,6 +7,7 @@ DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b40
 DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
 DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
 DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c
+DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
 EBUILD cabal-1.18.1.2.ebuild 1280 BLAKE2B c88010ffd3227926ac83fd4a0e4d69e5f5645a3e4bc6c31972d6e15f7260f34be420d65491cc71b88eeda1b7004d4bc3a96ffe225c5ac709847d1d8ed8acd03b SHA512 6d1b10aa36042185037f82d28957faa02ce23f902a55c0a5c26938a32f4e934edee030212afd1de26a8ecd9a506bb23cbc698aadfcc06c25dd36b4b8edfed423
 EBUILD cabal-1.18.1.3.ebuild 1452 BLAKE2B 2a7745d498316e9a78e5b408eae5475e8ec76cc8caabbc736fe3f8b7fd3178a648a094ff8b2d18e561656a976f433cdd4f2ef9f04c68e97de716ac02409b7521 SHA512 af201d0cae92cbc7ec9cb810402b48e6e784fe3b3da868b2462a8079ec2c90344d62bfc4bec0c7a179505f5cafba0928271fc062c49bc74c7d42b2dd5d6c5a3b
 EBUILD cabal-1.18.1.5.ebuild 1474 BLAKE2B f12d2f69aac3da1cea566d49809a77291cce9eefea902c5bca9fa27c3b7184bc87c2eb18ec72741c23c1acded2584c393aae859af8792549125394d3364bf60d SHA512 77e3147e7010e57d31c38c9bcbfd1c8cb9739acbbbe5a7b44416fb8702796331518c834823c36541bda425d4d73598b9d48956d2b5eef86bf8ff3b5301f416a0
@@ -15,4 +16,5 @@ EBUILD cabal-1.22.8.0.ebuild 1418 BLAKE2B 40b3405a805d0d4d1a78efa4969bc9b1dd1679
 EBUILD cabal-1.24.2.0.ebuild 911 BLAKE2B 676b87e2fc669c74f9d8a8ebfdae661f6e8397cb097b90c95c5657bf99009ac7b52ddd5787783978d9307678cffe9068dee85ab08d9175ad744f6dd945c0e73f SHA512 619dedb1e6143211661d31595812ab9db5147c59aae138d23d27757e0a374dbb0336e7cb7ad0e7a9c5f781e67ae8efcff383883be69ee5495d944cd33d624d30
 EBUILD cabal-2.0.0.2.ebuild 993 BLAKE2B 2a1793800eb8e3f2e11d61f6fb7060a0defad4ee940df373c07088bc82ee68a9f22e249322efeb183946a90c3a0ec35ad1542b20a9a1e143a736fbd21210e624 SHA512 4f23c3d6af175bb67b49c6aacf29165e04abe065ce5c829fc8400ad1f16467f8037909a3228a62f8bf90574c0ec89988600eb639bd6d3564cc439c59479fb324
 EBUILD cabal-2.4.0.1.ebuild 1243 BLAKE2B f11aed04f1da1cbec196d4aa73150c0842de01b7b090969302e5b6b663ec2b7f1ec7e2cb4f9dd2a65ce4057eed2c1c54251576a179d63afc60d2cdda5d7373f9 SHA512 fa24076f44643380cfebea6fc3c49007e69e036d62cb8e02640c60eb5e4eeceb54e5f59adf48fb7532718bf83f403ec6e466547600bcc8ae45e2ab146a3e4695
+EBUILD cabal-3.0.1.0.ebuild 1370 BLAKE2B bd55576eaaca4b460a1ed46ef7a70cf90048f8cb5198a010fee95589aed238bd74256ed5d1fac2d3a193b0c282bb5c9e9ea51c7df6f899d277b4cc2ff97255cf SHA512 5854790fc7ef0e0fd08a89f9d781c2616a1c4a534b472bc9c79df4ba93a6b4abcdb3633fcb0f72cc3d7315c332500c82c1782a955064de65d7a02955d1318acc
 MISC metadata.xml 620 BLAKE2B c506aec421eed73838acb77891628cece6a7e8045069b51325669067f8900bd3028aaa93a784a5c4f0383909ff46ffa4044d09e091518e0bf207eea0f1594c4c SHA512 e52cb4657e879d3a4d384daa3fcb8c109e61278ca2875b3fbc6c55b5e4ff9c98716eb7d740ef425634130d13639f92cdde7b04f88e266f112d393b99ce389b0b
diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
new file mode 100644
index 000000000000..88d667c8f674
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
+CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
+inherit haskell-cabal
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/semigroups-0.18.3:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.2 PM:8.8.3 PM:8.8.4"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-parsec-struct-diff
+}
diff --git a/dev-haskell/call-stack/Manifest b/dev-haskell/call-stack/Manifest
new file mode 100644
index 000000000000..3a514a06b84d
--- /dev/null
+++ b/dev-haskell/call-stack/Manifest
@@ -0,0 +1,5 @@
+DIST call-stack-0.1.0.tar.gz 2473 BLAKE2B 2af9c069e24e0b6b0f876259d391a7a3703bb5154648b9f945f8a40df58d5237b6b150a540e41b661a5efc585296e76cff0092e8776dbae650c793a2abe04503 SHA512 4b8fa206041976948411c7e7babd481b01297c289be72f56dcd56b090bec3b0d3c0a6ef4ce17bb5bd879f08b8059f36ebea664c3c263283457a519e5ce20a0f6
+DIST call-stack-0.2.0.tar.gz 2565 BLAKE2B f9c8440947c5bfad04d57d5865bfc82d9009dfff4b8de11c6281ef8c82a5cdb39c1bf83153f9b3ab58f0dea0b641c348b3096ae08b7368a92bc2ddfa638d2578 SHA512 c22862ca24906b07e258690da8c7f6fadf87f4216023cbe847e8ddf0c87548e5c353b5cd82c4748c6ef09604556884caafe5fdc1996be9d000d2db29aaef1537
+EBUILD call-stack-0.1.0.ebuild 596 BLAKE2B c2d2638b2c765b146099a6f905d74a2a97ee2019f5ced0da9a08352023c3beea3b11bfe6d949aa3372bbea23c35d3d689e0d2d368322dc2fcfaf694d1f1df0e1 SHA512 e82afac311e1b7958c1b35ae0d0eec03a7cfb5c62b95a3ebabaa32912f2da79d78035b821ee3cc6eb0f250fd9b197893beb0d7c037599fc3d1871f791e38b75b
+EBUILD call-stack-0.2.0.ebuild 591 BLAKE2B 507aa5957da7e75365152e4c410cae568ba698f4b5711eaca637138c54723f11278654ff3c1c2e195179c6c8c6ebed59a6b34c76308755dfd019a9ee7343c114 SHA512 12926a1c14ec0b03370d20fc79ea2d6c19a09d70ea25b9f223039e3712adb7a2a66c4ba18f7341ff9c3a3a54cbe1947368715a62e0b578016525c27c2792776a
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/call-stack/call-stack-0.1.0.ebuild b/dev-haskell/call-stack/call-stack-0.1.0.ebuild
new file mode 100644
index 000000000000..70c8b8444936
--- /dev/null
+++ b/dev-haskell/call-stack/call-stack-0.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use GHC call-stacks in a backward compatible way"
+HOMEPAGE="https://github.com/sol/call-stack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/nanospec )
+"
diff --git a/dev-haskell/call-stack/call-stack-0.2.0.ebuild b/dev-haskell/call-stack/call-stack-0.2.0.ebuild
new file mode 100644
index 000000000000..b3441e33b82c
--- /dev/null
+++ b/dev-haskell/call-stack/call-stack-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use GHC call-stacks in a backward compatible way"
+HOMEPAGE="https://github.com/sol/call-stack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( dev-haskell/nanospec )
+"
diff --git a/virtual/python-enum34/metadata.xml b/dev-haskell/call-stack/metadata.xml
similarity index 73%
rename from virtual/python-enum34/metadata.xml
rename to dev-haskell/call-stack/metadata.xml
index 7f4f33c6dbc9..b7878815d80d 100644
--- a/virtual/python-enum34/metadata.xml
+++ b/dev-haskell/call-stack/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/casa-client/Manifest b/dev-haskell/casa-client/Manifest
new file mode 100644
index 000000000000..b16bfe9b0f0d
--- /dev/null
+++ b/dev-haskell/casa-client/Manifest
@@ -0,0 +1,3 @@
+DIST casa-client-0.0.1.tar.gz 3676 BLAKE2B d00b8fd2991863190e5fa12d852e2a0a3f3a87af4bf988d337ee703a5a7d827aa1e2681aa9b3066dd77176cf52b3564b3266b1aa9d542fb58cd0694204668031 SHA512 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa
+EBUILD casa-client-0.0.1.ebuild 1142 BLAKE2B bb31c734a12192df4a4b19353ffaa4ac47c09cc21ea808f49745f63279760609d80ff8b407bd8580b91ea477f221ae961e265d4866d161a53cb1412fce417c47 SHA512 312420bcd4313f07d6e78495596ad06191ab5486d4ea03a43b6cedcf5fcac741062580b1fcc8d0a197551ee282c20f7477fede45fb6487570c676b1bc1d30e85
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/casa-client/casa-client-0.0.1.ebuild b/dev-haskell/casa-client/casa-client-0.0.1.ebuild
new file mode 100644
index 000000000000..35643269c6df
--- /dev/null
+++ b/dev-haskell/casa-client/casa-client-0.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Client for Casa"
+HOMEPAGE="http://hackage.haskell.org/package/casa-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/casa-types:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	dev-haskell/http-conduit:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/virtual/python-ipaddress/metadata.xml b/dev-haskell/casa-client/metadata.xml
similarity index 73%
rename from virtual/python-ipaddress/metadata.xml
rename to dev-haskell/casa-client/metadata.xml
index 7f4f33c6dbc9..b7878815d80d 100644
--- a/virtual/python-ipaddress/metadata.xml
+++ b/dev-haskell/casa-client/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/casa-types/Manifest b/dev-haskell/casa-types/Manifest
new file mode 100644
index 000000000000..d43790ac19cb
--- /dev/null
+++ b/dev-haskell/casa-types/Manifest
@@ -0,0 +1,3 @@
+DIST casa-types-0.0.1.tar.gz 2030 BLAKE2B a1787b35cf8254118287a7415ee625dd8815011a3d444f5ef303ba4af989924e5b40e1c1e5abd43e69c299e5c7ef1cbe7b67a0f019c6d2bfd01e2bee4b1661e6 SHA512 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98
+EBUILD casa-types-0.0.1.ebuild 771 BLAKE2B 50d18b10eb3a22a40a3447f40fe5b516b08042f6048e58a8ca678d4240d98ff2642470204b183e1c7ea847b389525b93a563af04f6726e9478c0fd2c10a39e8f SHA512 410a8147d28ab3ba40aeb058425fd33c4e35cabc2be70d484cf5db98d26f4a2557056f08cbbef69d20363433089a172ed829a700167c259e4834ecfa6f81dd6a
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/casa-types/casa-types-0.0.1.ebuild b/dev-haskell/casa-types/casa-types-0.0.1.ebuild
new file mode 100644
index 000000000000..310ef469a010
--- /dev/null
+++ b/dev-haskell/casa-types/casa-types-0.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Types for Casa"
+HOMEPAGE="http://hackage.haskell.org/package/casa-types"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/path-pieces:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/virtual/python-backports_abc/metadata.xml b/dev-haskell/casa-types/metadata.xml
similarity index 73%
rename from virtual/python-backports_abc/metadata.xml
rename to dev-haskell/casa-types/metadata.xml
index 7f4f33c6dbc9..b7878815d80d 100644
--- a/virtual/python-backports_abc/metadata.xml
+++ b/dev-haskell/casa-types/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
index d9585b4978cc..c08e45969233 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -1,7 +1,9 @@
 DIST cereal-0.3.5.2.tar.gz 22047 BLAKE2B f20de060898d2c5906e46704989d59557258455358e2370d560ccc4a7b7684481ea9faa64cd32f51782d6ee1ad6b71401e766902174821db3bc7ef00a9951847 SHA512 d77b0362757a6dda60d67e762a1509dd925d6c79d6280d73d34e2ce7f60ff0271975003e0c44cb95a4e4d72aade7833c839dad6774ac81439a703b570547bc11
 DIST cereal-0.4.0.1.tar.gz 22305 BLAKE2B 04867fc50e60684f47b609c3fc01a0c8ce4acbd80b3c7fb055ca29e19d2cc34341c287d9835eab7ea001d7273f825a54f23f49a9494a35c7b65497b29d149526 SHA512 9ea997af2cd84ecbd0660b5799a2d1fd4f6e5715ff5191922b69b98eee0664fbc4e5e6f2d67af808517a3f5e85931fdef093360a1d693bb81ea9cb430be6d21f
 DIST cereal-0.4.1.1.tar.gz 22656 BLAKE2B 72f7ffa9c3cbcff11b62a97eb9df5421f6776c09349fbd762a6896403cf89a5ffee6d0e56cc1c4df4894a8c4fda3aace91cc2db5b6cbbf8b8aedd966ac91b8bc SHA512 dcc0604ff78ea2d9e8c5a163d832879d5fad63f9cbc798ab2a785aa6b04f7a6262f42a478f61351cf9fc18f0eadaa83bc83146b614c286316a824787cd70b8a2
+DIST cereal-0.5.8.1.tar.gz 20114 BLAKE2B a71e11b9d138fcc1de7da0cfe573b3c31a263c75f62628bea70fb17af6c911fd9996c32a69fb0a9a4328241072c684dc110134a2b837643dcda2722f37869e9b SHA512 aced40e81301fbc73c6029be2c4045cf63f81d40361d5939713f3d60db196dc25a70e556e9e74e194e6a3b6cac86997d2bfc8b1f91c630676af7d066268a25b4
 EBUILD cereal-0.3.5.2.ebuild 546 BLAKE2B 735567ead0cfda6b7a934134967027b00421216ef09ae8321776c647153273b175f349f321c07bebc194122ffb6f44384eb43df35403693e8c5c575a7af7007d SHA512 129a95ca090f853b56a9af048aac3123dae36f59b24d4e6ed7744ee4879bc2922b3b7a7d51d74bc0552a4461dc4f14dd3d2130aaa632fe8b696dd91c753e35e0
 EBUILD cereal-0.4.0.1.ebuild 553 BLAKE2B 836670c6c0cdeeaa39ecc6bf9ee7715445ea8ac71b4056b379600070ea5f2b6eea4badd6ef2c595134e9181a24dc91f2fff6d2629c4b5d07bc30f67201d99f6b SHA512 ef5e77924a538d5a446a362f7db0ddaed0e117fc18f4a01b0f31f3b837d4a7f48cbda306f7f66b4f37b3a0694357fbb45b68a1ffa1e4df370319afd651a33227
 EBUILD cereal-0.4.1.1.ebuild 942 BLAKE2B 764fcd6c6a082f047b2e23441a0e7f2c3dbc7cbba094b4797a881df0e4a87b71d6c937043e66a8abacf20589b1844466b799a08731a98e0f814f7bd909d965e9 SHA512 91d3d05231213bb597de78a6b232638037189cdb4606bb71280c198c80928154ad6e7128eb833ad7c2d35c131271c0f0137b23f21b51d761c5f4677fc0ef9ed4
+EBUILD cereal-0.5.8.1.ebuild 813 BLAKE2B 96924947a32263de29abc8c090c684ec5317e334a059b6255ecffd4d01fa9adf5d2e26ca34db893f01615152b5ed971bd16e59d827b7834eb0a8a4f9b3347de6 SHA512 cc161abfcbc524933758d8c189afa62e7fb8febc474f75ed44aa9d82384f29ab757e133bc0a1314a5ae93cc305fd4439b014c66bd910b18b9212a1a1b4025919
 MISC metadata.xml 626 BLAKE2B 8b17332c2cb03e9e7da8eaafc943fb0440eae0ed4907e8eb59f0cfb5d835dbf04d0b5405a260e296be197ea7876e031798edd3e9936ccf624378d3fe550aeadc SHA512 482536773d4b76e43a1057fdb5ffc27b8b4b346fa6a6384716d0867076d514ad9cf91b94e1df6b9722d63b1c473ab21267061567413d355e0a9626310c064f3b
diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
new file mode 100644
index 000000000000..c39d43d2bc9c
--- /dev/null
+++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A binary serialization library"
+HOMEPAGE="https://github.com/GaloisInc/cereal"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/charset/Manifest b/dev-haskell/charset/Manifest
new file mode 100644
index 000000000000..1fac021297c9
--- /dev/null
+++ b/dev-haskell/charset/Manifest
@@ -0,0 +1,3 @@
+DIST charset-0.3.7.1.tar.gz 12507 BLAKE2B 1ea4b189dda47e05066b800c26c62e26b92e1482e546acf8606dd98cc1b8156de350c57c3e3df2b956a96ada04a1e564d681bb9af09026d160cc4f3b919a1500 SHA512 594e71a5d6ced52e1491368611775bda106119b82025e84fc97078753358af7d9f6c22b99291dd51a990ff223c4582f913e01d829418f8918652c3c9fc495792
+EBUILD charset-0.3.7.1-r1.ebuild 871 BLAKE2B 6df197dff03c3c97c7274a5075470f08ec89ca29c6e51ddba6658f892eb99d53cd478b95c6a9a43e191202871984ef86a93c960bc26669e8576e86978dd3999c SHA512 55c7b930a401a5bcee2ad960d1b3110348517eb323fcd061c6a1db56e6d009210d4c0873316653069acb81bf9f41a0970304ff401213fe668e32f087a0daca87
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
new file mode 100644
index 000000000000..59c183ec817b
--- /dev/null
+++ b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fast unicode character sets based on complemented PATRICIA tries"
+HOMEPAGE="https://github.com/ekmett/charset"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'containers           >= 0.2     && < 0.6' 'containers           >= 0.2'
+}
diff --git a/dev-haskell/charset/metadata.xml b/dev-haskell/charset/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/charset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/cipher-aes128/Manifest b/dev-haskell/cipher-aes128/Manifest
new file mode 100644
index 000000000000..257211410871
--- /dev/null
+++ b/dev-haskell/cipher-aes128/Manifest
@@ -0,0 +1,4 @@
+AUX cipher-aes128-0.7.0.3-ghc-8.6.patch 1223 BLAKE2B 68d7b1cb6e55dcf00053d2d82c1796e3803bf61512e3d94952d870a11f31329801fb6f9c507a34a509ed42b8c68d4c00c4dec4633ed2d4e40e80f7955ec5f1c3 SHA512 232a654c201a6232e43f2404984a781512d20c0710a6b890776ce9d19b8b15729bd39dba1b54fe938f5a105292d81190d63b15516a461df7eb0540471b0c147f
+DIST cipher-aes128-0.7.0.5.tar.gz 26228 BLAKE2B 8ef1aa343563d7889154b5f0b96b5b457ed21afbcad4f90f82e95a080c19f50d8ad2500ef4b8caa1509ca953aba3ca1941c61656417ed527943858a9d6cfd652 SHA512 8479dec68d6fa35e8d615bcc8c6336459fa537f1962b7af87e63b0c38d544ed26e6d30e980f90bb3585513bd618e01330d3e008e77404dae8d2e27954d7a535a
+EBUILD cipher-aes128-0.7.0.5-r1.ebuild 893 BLAKE2B 0baf8e6ef4b28965af10b8740b44cab6532c16701a0dbe46ae9656a206daf6953496ab97ad1f461a5161a306a5bbde10b47b7d87de2dc65ef68256646ee56105 SHA512 6cf83ec97174cc6fcf64a87fc93259ca434d225227bc52671f2e29bf20bdbe12e45c69f5647b7e4bad5cb6db5a473af82e1bc22504fc4a06885b761c641a1010
+MISC metadata.xml 773 BLAKE2B 86acea4a75f28be460a539238940e93aaa5f3a71f66926691c5725143f91e45a3575ff31e805bbfe787ec82f8ea2c8554708bd71031aba7ff167a1728f77f4a9 SHA512 bd5b1185a8a92e07c79eca9f196589ac391b261c501ad12f45bc64e0771a31e4ea09d4cd5e144154233893e7636b726653c9995ec0e6a5750d7f4057202b1332
diff --git a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild b/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
new file mode 100644
index 000000000000..fea7988f16ec
--- /dev/null
+++ b/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+#hackport: flags: -test,-halvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="AES and common modes using AES-NI when available"
+HOMEPAGE="https://github.com/TomMD/cipher-aes128"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/cereal:=[profile?]
+	>=dev-haskell/crypto-api-0.13:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'Cabal >= 1.10 && < 3.1' 'Cabal >= 1.10 && < 3.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-halvm \
+		--flag=-test
+}
diff --git a/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch b/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch
new file mode 100644
index 000000000000..a5d056e71c94
--- /dev/null
+++ b/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch
@@ -0,0 +1,16 @@
+diff -ru cipher-aes128-0.7.0.3.orig/Setup.hs cipher-aes128-0.7.0.3/Setup.hs
+--- cipher-aes128-0.7.0.3.orig/Setup.hs	2016-08-31 01:58:48.000000000 -0400
++++ cipher-aes128-0.7.0.3/Setup.hs	2018-07-04 22:06:10.880373751 -0400
+@@ -13,10 +13,8 @@
+ main = defaultMainWithHooks hk
+  where
+  hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
+-                                        let ccProg = Program "gcc" undefined undefined undefined
+-                                            hcProg = Program "ghc" undefined undefined undefined
+-                                            mConf  = lookupProgram ccProg (withPrograms lbi)
+-                                            hcConf = lookupProgram hcProg (withPrograms lbi)
++                                        let mConf  = lookupProgram gccProgram (withPrograms lbi)
++                                            hcConf = lookupProgram ghcProgram (withPrograms lbi)
+                                             err = error "Could not determine C compiler"
+                                             _cc  = locationPath . programLocation  . maybe err id $ mConf
+                                             hc  = locationPath . programLocation  . maybe err id $ hcConf
diff --git a/dev-haskell/cipher-aes128/metadata.xml b/dev-haskell/cipher-aes128/metadata.xml
new file mode 100644
index 000000000000..3c77a6d727ea
--- /dev/null
+++ b/dev-haskell/cipher-aes128/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Cipher-aes128 is an implementation of AES and common modes of operation.  It borrows Hanquez's C AES code (see 'cipher-aes') but
+		is unique due to including compile-time detection of
+		NI compiler support, a slightly more functional interface
+		for GCM operations, exposure of 'Ptr' based operations via the .Internal module, and build-in crypto-api support.
+		Cipher-aes128 was originally developed as "'cipher-aes' plus trampolines", which has since been adopted into cipher-aes.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cmark-gfm/Manifest b/dev-haskell/cmark-gfm/Manifest
new file mode 100644
index 000000000000..25ef150f3dec
--- /dev/null
+++ b/dev-haskell/cmark-gfm/Manifest
@@ -0,0 +1,3 @@
+DIST cmark-gfm-0.2.1.tar.gz 200812 BLAKE2B aab0142db460139392fa1922bbf090b0222c039f3795e28c1b91024ca9c159cc977a5be645f91f94a0d147a8713c770e4608a6504b68c10263dfe46f2605b84f SHA512 46c0847608f741df689e5b213ecd023bedc4c79ee9b91bff55eae11ad600b248e5816b7c259d5c862b3c9742c6f5d08b16d1a6cf1b8724f7831e77788d4df70d
+EBUILD cmark-gfm-0.2.1.ebuild 804 BLAKE2B 9c715698a12e058d69ed2804bd3378a018877dee4831e0cf907b12d47a9d0237fd8b5066f82dba7731841f488fd7adc8901161dacc9be4e2d8f946b9a74b1986 SHA512 64221483971e20df20811457667784ae34d70aab7374891382787a4c3fff44a846d71ae429da4415f09606fe36331ca5b4d5fc6a860a9293a628e95676a7c967
+MISC metadata.xml 630 BLAKE2B 2f381ede02069456d0f8ba10ec83720b42adc058190e4e061047e905a827fe0e57f2586e582ac967b1fd884f2282efaecc7eaab3da154b700498c11360cf1978 SHA512 cf7d2d4659d56b71a2602646a6ebe78914ab318ffb691b34deace6d3f72c3857b2a6d2a3ce355f2a97a0d7f6ce9808d04011b299b64829b5e03355db5a49ee99
diff --git a/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild b/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
new file mode 100644
index 000000000000..ee7ace0f10f7
--- /dev/null
+++ b/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -pkgconfig
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, accurate GitHub Flavored Markdown parser and renderer"
+HOMEPAGE="https://github.com/kivikakk/cmark-gfm-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-pkgconfig
+}
diff --git a/dev-haskell/cmark-gfm/metadata.xml b/dev-haskell/cmark-gfm/metadata.xml
new file mode 100644
index 000000000000..9b006da16c9b
--- /dev/null
+++ b/dev-haskell/cmark-gfm/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides Haskell bindings for
+		&lt;https://github.com/github/cmark libcmark-gfm&gt;, the reference
+		parser for &lt;https://github.github.com/gfm/ GitHub Flavored Markdown&gt;, a fully
+		specified variant of Markdown. It includes sources for
+		libcmark-gfm (0.28.0) and does not require prior installation of the
+		C library.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index af68c9a29f60..b5b1d4889074 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -2,10 +2,12 @@ DIST comonad-3.1.tar.gz 7769 BLAKE2B c8ca82834b974209d895ec5e84ec45390325ba0e80c
 DIST comonad-4.0.tar.gz 15014 BLAKE2B 37fed519018f1f5a3444faadab791a0c2f3dd3707626ffad94a3ce2a1b938fa51fa0f2d53078b498bf6aff458e5e9b336001c37c7f4ada18eb06fda053ab5e09 SHA512 2311c6db59dcd7a20190f925ded477412fa093d5cc43adaa1a7d2ca8174c919c73f7b78d53616da13dbe272817337826e168873acb37ff0df8e36655fbb2b47a
 DIST comonad-4.2.7.2.tar.gz 16430 BLAKE2B 0d71e5db8e2c3384e52b5254a2038ab3439dd3372e19192fd818724c51ee3173d459e6c1684f381a57a511c119f940a6abaed0760850d8b0b673d86c6278e703 SHA512 c4d31409f5b77c35628a86f25d3cae273079e1f0cfbd5880058ed29d63802e712a199ce900c38eb4aa2130e4e397c4852bb640f92d745cc3edee57ae515fcfe4
 DIST comonad-5.0.5.tar.gz 17911 BLAKE2B bbd1610cf727a73912e4250d419020f8b862bc45de144d3d568a6314e9f4e47ae6325b77587ce87a24bc76f988f336be3c5cc03ec2bb358559319cf85956df19 SHA512 45c1d65768d229ad936dbb9ed75912985c9e2b821befb3863e4095f8af7d54984ef54a4233693497a3295c2da39eff80988f1d4c775230d7a899791ea5fb3e2f
+DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
 DIST comonad-5.tar.gz 16383 BLAKE2B 110f27389b05817c795144d33282ba6a0b91346c3a52ad7b695027ae290f626caa97be4204eae6987d58381587e7ef91c9a97caedcf60b1adbea639f63db54fa SHA512 1acdee67bc2fd6061228541f417e02ffaa9ac412ac3a84b4b3f5b1e82a5626a63ad01f1a085262293682011b99ee8a3d70f34f75b6ce42bb24b91e167d5f816f
 EBUILD comonad-3.1.ebuild 792 BLAKE2B 4062653078252a517bab1ebd2c7fed45f69cfde76a9c6ece1b55353776cfbd42b66ff4197f9f2db48d3f40fbe3be3363052f2b59ce6de680d07c9f90420203a3 SHA512 c694cce45db4d6344f9ae1e9f7c914b77229b57f51c3a53f1ec6e96e9fe28644c36666a2098889eb70758c25e4f77a8044ebb53a9dd05858f9f0d6e8aa9d4ddf
 EBUILD comonad-4.0.ebuild 1217 BLAKE2B 98af78ca3dc59ae41e4f37fd1e83660a9b4a5587d76fd435fa81ade284303a45b9aa2bc5c9a4a66e5702c15653ab9eebdf365113a5acc829391415fd0c8b6ee3 SHA512 62d8ebbced7a445660f2b3dbcb6eeb733c3923be5558fd435c552bd149f271ccf5fb376cc19419c6eb03ccf028770ace5a76d13d821f49af8a86e2d67e73be7e
 EBUILD comonad-4.2.7.2.ebuild 1460 BLAKE2B e7688fde447503cf50f47c7dbc32ed02dde7ffe57c5a5cf93b47cc956bec8f959843f3d8828674e686ad1879c0e35fbb7ba6cc146d3cd38c542122c27a7e7fe0 SHA512 173e6c74e20d7b8dab0c061dc875ab1dd5e5a3247b0a3c592071b3def120322a2d75a22a36433908b66f8513001cc043fde6b73fd944d601f6a2e510194b21a5
 EBUILD comonad-5.0.5.ebuild 1301 BLAKE2B 8eb5cedb4c70dc0cf5b71ff4af21195bd187edb2dfda64c3e648e56146bea8cd10e3f86931b43a5e822e2bd015c555cc8454e25f81195e59cfab80b6b8bd5891 SHA512 5ec27c0627aee7992ca3b8328f84aa8ef459f1e87bd4c963f6bec50ea60c4b0b4c460f75dc4839d3ef9090e61772cbfdb71fd97bf4eb677d483c3791460083a4
+EBUILD comonad-5.0.6.ebuild 1303 BLAKE2B 0a561e6b58aef3d9c3ad4371a07b61a2de76bc8b4016a28b5f2b921ddcb8933b0eb9be5cfc2d911e5fa424e94a29b360eb1a4143d28d2425a00830f435639ae0 SHA512 c07f01b14525fae0b2678a6a6601e0779c3a14179a2db15b0661566bf4c72ea5618c279149c6aea57b2803cddf9d9428e537f78e1b4fb153ff4d268d86a83794
 EBUILD comonad-5.ebuild 1460 BLAKE2B b086df7c97b4cbf8c4b94b67026a1c8f579b158df1d3c4403359e246de180a3a4116159f9bca65fe4fab8984a9ea2cda5ecc5b0c17d15321749dab13f102dd6f SHA512 9bb2f83f6650189e665eeb5ce42664f89df374df82afa24cd24c4ddfeac299c20e81062a6a3ed54a18f69c837e15e984810ec66d2a4482843c0b92ea88b34095
 MISC metadata.xml 1349 BLAKE2B e965c5d8d4657a8ac01dccc1569bce7cbe5349cb09e1f24d752861b2fa0413494ab80459a69e3282fb031b1feb0f8833bea1fded0ce5c4900d944f1601a37907 SHA512 e1a1bc3b06320550e0d437cf39b71b01a838fa1c3ae122d12b6639a2391474ae53c6313f4f1ea15a3e659feb23e5c43b9d3a3bf1f29810c1be612312eec5c264
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.6.ebuild
new file mode 100644
index 000000000000..553ea56cb38e
--- /dev/null
+++ b/dev-haskell/comonad/comonad-5.0.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 compatible comonads"
+HOMEPAGE="https://github.com/ekmett/comonad/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+containers +distributive +test-doctests"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag containers containers) \
+		$(cabal_flag distributive distributive) \
+		$(cabal_flag test-doctests test-doctests)
+}
diff --git a/dev-haskell/concurrent-output/Manifest b/dev-haskell/concurrent-output/Manifest
index b5187b213e5c..600110893a80 100644
--- a/dev-haskell/concurrent-output/Manifest
+++ b/dev-haskell/concurrent-output/Manifest
@@ -1,7 +1,9 @@
+DIST concurrent-output-1.10.11.tar.gz 22514 BLAKE2B 19b31ed65ac0a553ad8f60d08d9919428e0cb40be151b43e7a91dd2c9d28d61ed79fab75efef43e8a0f44e66ef652ddaff0aa8275bf2884d4db59fa2bfde8e47 SHA512 2ed0415562c37cedc035adac06430e397369bf13ff5375f855c9b3a34c122437b3f92137b593d8fd0384d575822ee5287ca0b2c2b3daab8de95a5c63b991760d
 DIST concurrent-output-1.7.3.tar.gz 21005 BLAKE2B 2d34758f4a2c8e65e84e7fce911b59dd528be41f382f6b3a6801e01ba070e52838a7137c9538ed914df109ae0645dfe1ec91a4e65df83c5d98c390551d9a8bb1 SHA512 0c338d45167bac4d11f760994fa7c5b3d6b3525cc4fbb289e70247affcabec94b44cdc1991519e40ddb71975e5a995f10e116b289de194dd3a91467c6f4df950
 DIST concurrent-output-1.7.6.tar.gz 21143 BLAKE2B 33670c8060eafd6d67d8375515cf8ed6091d3b6205011db2dffe35f5abd33b36fc8aad50564dfdf111ff8f72996ec7bc8f889fa9a5e0ba49b49af492d4ebe780 SHA512 2a5b728ed5017273c89e3dff1b045905071b78eb7cc0dd2a6020170328a593bd7fea12651558598e55e807f197c7177dd6b086081df2a1895a2d172bf558864c
 DIST concurrent-output-1.7.7.tar.gz 21156 BLAKE2B 80c845dfa39bb475fbd6a12fa670d3317c0a333fe46009084333e1481d8c8cac7e2511515888a09f2c33331af7163623c1c9e94380530f01ac640df7cb111794 SHA512 65ddc7917b71e169aa05ad4a16c280e1bd3083c511198ff1a6cf5b6e9bdc0397f842ce7aa99671548c2f97eb6744b54ab097933a508303dfa371ac3cb5bad643
 DIST concurrent-output-1.7.8.tar.gz 21178 BLAKE2B 18b2f8d5a0de656c161487a50cc5c495b2343a7eed15b99ae6d79947717c2f2a00e8100b9384bb8922950c75affcadd5927c0783dede916ef295918cae5f6a69 SHA512 b5f64ff51302a46d1548469fa45b18e10276667bb33994023f6e5f75ed738d63ea666efd7a7e27dfdcde916985c3753141d374f85b43fae3c3cac960567ee01c
+EBUILD concurrent-output-1.10.11.ebuild 1052 BLAKE2B ce60d827ec92b80448ac6cd5ef2dfd3eaf43ca96efc8fc2ca61b0dc62f2afc354f698ae4747ebfa72ac49253a2277175697f1a6201f2e2f1a40a47f9b6c08112 SHA512 e4b736fd6a41c235206d96c319c99d7af8930417082133f26b7bc0051922615551562a245fb507d7f9ab0f0811200c785331b12f0ba8740f11b195905e5f6abd
 EBUILD concurrent-output-1.7.3.ebuild 1147 BLAKE2B d70d7a216c0cea772afb0528c12ff1d17de68e4f8774b1021eb3ad42e06c463540c7c202021687d2ca6eb8a1f54023dfba1353cf5b592bc021e7d62a4dec2ad8 SHA512 8fcfb841bfac6c8e8ecd71386b1bbca2d098fb7c0d0f85073f1ae6a01c8e8e2276de2924f8f75523f8c463e6c640667c9773b8f4b4c2e74da45c480b947e4d0e
 EBUILD concurrent-output-1.7.6.ebuild 1145 BLAKE2B 41a293a87926fd321c2d19b35bf380101f9ca07a25340764a4cc55864ec3df71ef98876912a0a2ef5ffa1344db682c508804b0d420ccafe9336d17f3577971bc SHA512 bc775cc550492515a55a3df3bf6b1d1b428c3d2024481735fdb015ec58ffe304b0017108b83d307697d7f36a8e79dcf58012b9d00ee14c82e39b130a10efd145
 EBUILD concurrent-output-1.7.7.ebuild 1055 BLAKE2B 37eeab6aac7891f02f05c413629cdaf7cf1af4416880b10d12f8f4455e7b2c98b3c8b1cd45cebf57acf3fbcf7b64383fabc8f47b05f53002977611dcf1400e71 SHA512 29f00c95913d019823ed6a3d816e197706a5a148535c3b1b4122468e86544a98fb4be6a90fe677a2a071966b990577f8c04b7683fe8912129fe929335cf7f801
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
new file mode 100644
index 000000000000..5229eed94690
--- /dev/null
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Ungarble output from several threads or commands"
+HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.11.0:=[profile?]
+	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
+	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
diff --git a/dev-haskell/conduit-combinators/Manifest b/dev-haskell/conduit-combinators/Manifest
new file mode 100644
index 000000000000..320041bc0d13
--- /dev/null
+++ b/dev-haskell/conduit-combinators/Manifest
@@ -0,0 +1,3 @@
+DIST conduit-combinators-1.3.0.tar.gz 2204 BLAKE2B 4d3c7783f00a90a45e2e5947c523792a67cf234d12232c3abcf865df4647d0767b27516430704792f2f6393e61fc4c4513346d390774b8b3eeb2d05b494a4d3e SHA512 b994c73f0a9c0d017831125f2dbde406d6ff1b51b0f37079e8292ff1747c9718c28cceba708b3451136a384504db1d1275e01ce0335cf1e726edd69d90a206b7
+EBUILD conduit-combinators-1.3.0.ebuild 688 BLAKE2B 8dcdbe1805d4439919e09ae737009f53d256c2939042238f73aa8af6cc7d3d36e07eb0563553a12bca27d7292e715d6049774b3457308c0f1bfe717a175dd2da SHA512 52605e5cd369244eca1417b4dde2a5b8f97d517cbdc277368b5ec5aade4420f140de495ac5e84709c3b3dafb6bd8c5c792303045f8550fab86905204df31abcb
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
new file mode 100644
index 000000000000..631e8007ca5b
--- /dev/null
+++ b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+#hackport: flags: +monotrav1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Commonly used conduit functions, for both chunked and unchunked data"
+HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=monotrav1
+}
diff --git a/dev-haskell/conduit-combinators/metadata.xml b/dev-haskell/conduit-combinators/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/conduit-combinators/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
index 740e073ad91a..0cc33dad4a12 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -2,8 +2,10 @@ DIST conduit-extra-1.1.13.1.tar.gz 33455 BLAKE2B 3a0dbdd2214f955f54daecf14a0d81b
 DIST conduit-extra-1.1.15.tar.gz 34666 BLAKE2B ba81aa05990a2f67de1c8d8ff9311a012e0f300f97134e8d48ff64fb22e4d7c14644bb0897f3c7e43c73d7864c5209ac885b9b78ff5f5c0acd3e435f17683e31 SHA512 cdf47414e362950d6361a26cb584dbab9648572fa801e2444c5a76723f5f166c3c9d701282c8da06b2db462aa15e195feaed0bc154689bc93a237c1ec21f6cd5
 DIST conduit-extra-1.1.9.1.tar.gz 29571 BLAKE2B 1113b5bcd419a4f11f061dbbb6b21c985ccd647642a7ababb75bbab953fe1ec569eeabc57a79e310c77360f8eff4d29fce01a2480bfe53af62cdf43f2890bb50 SHA512 3e35c303fb9696f99af99db6ada5e59dcde09e0ce3d3559aed2b3354dab1a96d523b7976643239892316a709289e4943aea37152a2935c6c256b24e5b73dc716
 DIST conduit-extra-1.1.9.2.tar.gz 29576 BLAKE2B d16bde0c19cf14bd190875fd3a43fe18551f3f101e1f1c8546f88ec29c686dbfb0d6c81fdfa919f505555ff86a1fa0a1522ce40a73f6c402b81003054ae24799 SHA512 ddc8e99c3b939704421d464c928d8fc2a591cdb4e44942cebb670d5c3e9a4d96fa03c227a1acfd227560d45d3eead7ff6cadde54ec8e78324eb86a861fbb8576
+DIST conduit-extra-1.3.4.tar.gz 33170 BLAKE2B 27d9adc403be4479e06c47737e9770ffa63fa306278ca20374e7fde8005a70553df28a4959bca0148c4607a0317fddcbde693bd1b0a11c45ea1b58f086a66876 SHA512 cd5d6d754871ba9558f495074066cff0d116d71af71a6260c9cfe53244a03513813f93ed985af25c6eb7849f1d4dbb4f6b9a17140c2bf12236206b9e9925efee
 EBUILD conduit-extra-1.1.13.1.ebuild 1243 BLAKE2B c74117290218391ceb2cf1f227c5a84ccba60cdeda6d0d6dc2d8eb5039d8b03acafc9a923954c27f55d0ac3d1c0199a8f614741a5d6e29a7b6d0e7fd10521338 SHA512 52e33da80ca7b5afb0660d18dde5596065c1f106f6385ffd133be6847aed299567d0fe4779076252174d47e905d06908983e2056cfca9357deb147a8a2ffb9bb
 EBUILD conduit-extra-1.1.15.ebuild 1210 BLAKE2B aa5e1b4896c726bd0ce1fd7e8fba31d6742670f2729cd03f8f000f5e43da8b9bab93ac8275bca54ea2d36cdb1114338dbc219d968a9a3ad03962a78c8ba604b0 SHA512 f3d97087ca1f353d3750679e1a56d6ec712b5f46a702ef80b0ad981b5921072cde0a4f14362f137974218d793ed1e2cd36ddab05d6e4ca7bd18576ad036e2cd3
 EBUILD conduit-extra-1.1.9.1.ebuild 1196 BLAKE2B fce90e0d6f62c79384b507004803d2af249799259e076eadc3daa272c58e60f288860e1ae14f833e20698c6d62d8dcaed962872cd424273a409fde2f23931a63 SHA512 ae3c283fa693928f39ac608d778797c5e0e3cc08f14428b03fa817e6e9bfe069ac950cbf180d9b779eb9ccd719ef068cc7791240cf37aa86a1ff9e4996fd0f33
 EBUILD conduit-extra-1.1.9.2.ebuild 1196 BLAKE2B 7e2e05a2040f1bb86dc44e27d36175e65a9b9d323fa1573b94abd9a39eaba232391b5b682f1ac900c342b55d5d2e7aa9674f3543245894e219aecd6f26688727 SHA512 9b8f7d6503b6a42637bb5b5cffd305cb55437f429e38ec488a546b4d3c0e180c935f718cce641a495ffdcec924287145696f159ff0801537e41f3d25bfda6df9
+EBUILD conduit-extra-1.3.4.ebuild 1219 BLAKE2B b59fc120da5608716d6134290d7df1f7422796750c80fdd00504d3809d22d0404d1c3d81805eaac3a4ac4c7d59289927562fec65bfa994c65dfe26a7754f72b1 SHA512 d0abc5ef56a34f638e51d2106cc5438710efa2da8e8f29f6551ced32ff607ffacb301a981fe4d7be0f6a1e4640cc48a44dcf090fc7c6a74e964f2ad82032674a
 MISC metadata.xml 482 BLAKE2B 193f3bc4c7b8b6ba0b5b04e406ce7ae842a265b74c285b0d517e3f2e68fe3f4989f36304efb95a602235ee32ab4e92b19cd712183257cb014ccfb4e21e08b98f SHA512 63d2274b6081bb245d60f266b8f52d1fd29e1e509b1baa88968dd13165baeeb6022356101c73ef526ced87b2bd41343e9ac5647115c07c640aa112b8cb29831e
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
new file mode 100644
index 000000000000..cc3b589f4212
--- /dev/null
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Batteries included conduit: adapters for common libraries"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires network
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/primitive-0.5:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.16:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/typed-process-0.2.6:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/bytestring-builder
+		dev-haskell/exceptions
+		>=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck
+		dev-haskell/transformers-base )
+"
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index a6f84ef14ac4..84d2512599e0 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -4,10 +4,12 @@ DIST conduit-1.2.12.1.tar.gz 50539 BLAKE2B e6128dfb3acccd688a046296e99f1cdce594f
 DIST conduit-1.2.6.1.tar.gz 48531 BLAKE2B a6d5258923ad2777d315f58b552d5d66b0fbc230933eed8e9b7b19095dc57afd3fad96236339694b5bef208f2b6a8ca38721467321ecd300ec103f3131ff30f1 SHA512 fbeb437897a0ae00a5d3f5b12565c0a4f5e3807d8d9fcd6aaeeafa134ed5d0493a2a403dbe86112be9af49f8b7af90c504aafce0505f0a854a05a66a5175a6d2
 DIST conduit-1.2.6.6.tar.gz 48854 BLAKE2B f42a0a78808f29535d058d02a615af5161396096887aa21b87cd0277e8955cf01732e814ec71230f4d0c9dc11b20b93ceb86c081f7f03fbef2db42149951539c SHA512 6b722a70919bff0aa79b6e47c3220f89b019a7a584d31e921e4f7dada3e0b4dba753b65fe61f4da7e6562320dec7d76dc1f487d4e085299c485fdf2f7e0b7efd
 DIST conduit-1.2.8.tar.gz 49406 BLAKE2B ce99d20bc0001b7ebac30a37f7e75e6ec1796b534ed1d1b0595df7b734d8685e8e0d566915a21041e703d8867c35fde380958d3c195c796b0d6fdc02fe3a7712 SHA512 a181bc88291e761921a2be60e21efca47f7cd029fa4026d50131d49be0d91e75ea082e8c009aa621c44707eb61ea6b117af4f588b8e9251a381ba55f26124161
+DIST conduit-1.3.2.tar.gz 87752 BLAKE2B e07ef9dc2d3ae189892ee32ff1a8ff877a93c023309b79ff5af62f971d2a6356c3ebe4bd27122ed4dc510dd5e8222afdccf13d772701f69274cab0c0c1a69bf6 SHA512 d6dcc33156923a1601e9c0c7ae61d1df9dc4ec71c39f4ec0935b13bff502eb66bcdda30901c3c864e44ade9fcc437d3ab2c1af167bac0d89f7f70567d0911f57
 EBUILD conduit-1.0.15.1.ebuild 1344 BLAKE2B c6700779c9f3c25e17dbf283f021c7e3e979ca46ffbe9d412c21839e45adf343617d1415303184bcde2ecb5f6cb4d861d0f58fed6a9bdb8fe0de4ac69a0e507f SHA512 b92fb7fda2831a14c4f1d7cac8739c059d0540bf2b3083135a4d1e616a499a3df38a64a2866f636678bebacbd233591d96bf6bb46ba4054f660ec21a0a4e6f2a
 EBUILD conduit-1.1.6.ebuild 1168 BLAKE2B a6c6ec37792211a0ffad514a5be9fa12375ea2109dee4b7e01ef6bfaac3aff217e8c71c3df863244aaaf4ac49d31f6a53ba47beb97804cb203e1c4665d98ddf6 SHA512 1e637d3e7e4eb6ff5d074e7b5d877e0b031a8b98f81d4385b9bd1abab552fdf9213538779c5b28cc43ab138f2f71e54eac7e608c615bc03ad66e7edda3fd4be0
 EBUILD conduit-1.2.12.1.ebuild 1174 BLAKE2B d84424c5748fb484ef376ae73eda33eea5aa2762f92286b0c7a3282e32667dce1fda30f5de4e61d7c2e3062120b8d62b406e5e73feb9846a2cb2f51039e2f988 SHA512 80faaa87a43b77b5a392b726f3f77bce4ee25d6a4f204b429fc556c79a33ff852051ff4adb556009f81a42db7cb00157e0b9c46fe8a20c8013f7edd5f8f4e0ef
 EBUILD conduit-1.2.6.1.ebuild 1078 BLAKE2B 64a74ced38e6b3453adebcc480807a83aa5a2e4da4601f6dbccdb8cf2f0e682fb4b2e76f553684ed2f57f642033b34f504e6a9aecd710c3a09b19c7ed577100c SHA512 a8754e411da5564f7b1922083b621699923406036558294f32970291d541d243d6e74156cf6c400d245d7b4e39776077ac5d64beabc2832a3ba73f3cad627c48
 EBUILD conduit-1.2.6.6.ebuild 1034 BLAKE2B c9f1fbdfbc3cbe6e67df347b7c8a5c5df8366c0e261a9c6c55e4b67cac72e98dce247eb045dff7f060b886cf2ef3085ae04232c518c57342bbb1c8ad7e20ef58 SHA512 11b1c4828e8831e410cef0bccf495f2c5fe2cb8ec379a47ad9ee9e3cfd88df8069d24128aa9ffd6db71f6f879d7b11b9fd7b68e071aba282eb2ff429c4a1e437
 EBUILD conduit-1.2.8.ebuild 1032 BLAKE2B 77ea22039830205818a47b2540e00c35bc92aed04881b3a4f9662a42033b5d7fe7d153fb80d2a03b90e4376c166d3d79060d9a7e21407c078d87af7bab95d2bb SHA512 5d325429df05614dc0654d8e9ceb601da854bc42f3afb6091d6b231065a7be8b2678252562f1410cf83f22b0f43135e5ece0c90f53099ee32a0262a4c584a70c
+EBUILD conduit-1.3.2.ebuild 1081 BLAKE2B 26ad35fe77f000b4d841de6c5fb517da6276aef60f02428e7b1d228686152b9cc37626f32f8e8a7765762f82ec1a57ae64407e3d9c364dc48bfb0f7df5c3b51e SHA512 4da9d9f8d1da96dfacbad703513cb7eae5845b61e26306cd9c318d68cede4f923e3391490968b2b5a4ee4a29e05667f59c00a17a7bfdb5884f6e415d01fbc91d
 MISC metadata.xml 816 BLAKE2B 8131abf48d7a4d042920d57969535ee3e33459cd33790b4a52d55fc91c2f7391104a505d0a6dd67dba4251c3c093b17b78abe60ebe33b8031bb4c7b924848d5f SHA512 96bfab2b6d9b6738618b298668bdbffeb55ded7c2f98fe7eabfb8ceccea0c7b9d67ce194250576a24566e63cc9f17dbb67bb7d792b7bee0f18ef234f1857f44c
diff --git a/dev-haskell/conduit/conduit-1.3.2.ebuild b/dev-haskell/conduit/conduit-1.3.2.ebuild
new file mode 100644
index 000000000000..416c047448c8
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/mono-traversable-1.0.7:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/exceptions-0.6
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/safe
+		dev-haskell/silently
+		>=dev-haskell/split-0.2.0.0
+		>=dev-haskell/unliftio-0.2.4.0 )
+"
diff --git a/dev-haskell/connection/Manifest b/dev-haskell/connection/Manifest
index aab383b1b4e1..e099d9675b7b 100644
--- a/dev-haskell/connection/Manifest
+++ b/dev-haskell/connection/Manifest
@@ -1,5 +1,7 @@
 DIST connection-0.2.4.tar.gz 11067 BLAKE2B a99a7430093f3bf279ffcc709dd3b52050e1534b50683289f68ae00a86cff9269ff5bafdfd1b2a46fd6b55b32f6b4ca2805083cedaf0e7d86c44943dab827deb SHA512 7a55f5bf8b35a8a03553051b38a01e3791e9c51db3222f5c91e77310cc9d61307e9d934d59e31f82be38804f1b9c60cd8856351b03e007e3b7a3c883abaabb48
 DIST connection-0.2.5.tar.gz 7576 BLAKE2B 312e65c9f25b97d7ba0325baae93ebbcd6b8a212d5fd3f48361982dcc3dccc3ccaeb273a8b74b95482bcdb68269b1f3177037ac4951871d25a97fbe501f2e94b SHA512 02f02bfe48aa2f667986433d11fc7723aed8e87deb38082a6eacf009901334db2acb95c254a2cebd0b6c035bcdb6536f51af6c5dfdcc1ee51a13c1b7383460c4
+DIST connection-0.3.1.tar.gz 9051 BLAKE2B 8758906a266180c9c81969c13b7a5e19bcb01757222ba21e1cd258a50180c52288a1a1e1e2486a3fea6fc3c6fd516ebcf4ade984dde822609ac962edfec4d610 SHA512 06da91d39e0d9a556a78da77a7ca31d520d5e7e8fd65509f82be926ad2c34282ef1f4d03aa6065c5834bc89417cf51b573f3cf4529fe3ead72eb1e80cc6d7a98
 EBUILD connection-0.2.4.ebuild 976 BLAKE2B b104abc9a3136b4ef44b648479d8193af13aa0595956b4acdaa64656177d1034fa27ee76dee51ef6a445e57740afe593f502a94cbe8e24446f78d646f0204d17 SHA512 f1c7ebb79212ffc15d6b2368eaced95b14c822d3fefc1b82b529ba9867110d97c2e5bf7c41d78a03d342310151e7513e49105a4550e704c80dd01a67c943ad28
 EBUILD connection-0.2.5.ebuild 902 BLAKE2B e5f0a7570b5d5c6dd4afeb860f89ede3850259bc0ee46abed3e68dfc84a2398a5bab0a81d0dd9505763bdeadae7ff7e7d9aaf6e3a955b66de0845df4f5158bb3 SHA512 29b4354ee2ee9939554c8ad6030fc3ddc845bc9140e72ba1649bddd5b9bc0bf78e9002483033ce7690c17b4b998e6b6aef10d907984401af310d2aaf61e5e4c1
+EBUILD connection-0.3.1.ebuild 910 BLAKE2B 25f504095b07acb37b359074559410d62ddceb0b3e5331666b8d7f008916abf234966ba514bbe5022270b383dadfb2fee5b2eb8605ea51f3ae583731f490caa1 SHA512 4391ebb4f021416c30f29261d697f40d074c504afed0e9ca12b0ef1631b8a3c1c65fac0bec20a5d8616377879e398a8c030da29af5afe95a237c1743936944c0
 MISC metadata.xml 605 BLAKE2B 93b777894909dca02df5c082ae4eb35417336a8dd306ad8889662df406eda6b1972c6dc20cc6d170ad6f0fa6c3634415b3b0e0e4d4786cb6a958e6afa5727564 SHA512 a04bbc4f237d9c2bb70b18c4559ddb04e04a7f1056c38f5f1d34fcaea97999556f176ff5e7a0704f03b9a2e962334823b1571448a6586dd357ac8a296891db29
diff --git a/dev-haskell/connection/connection-0.3.1.ebuild b/dev-haskell/connection/connection-0.3.1.ebuild
new file mode 100644
index 000000000000..e5e1fa480a86
--- /dev/null
+++ b/dev-haskell/connection/connection-0.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and easy network connections API"
+HOMEPAGE="https://github.com/vincenthz/hs-connection"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/basement:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/network-2.6.3:=[profile?]
+	>=dev-haskell/socks-0.6:=[profile?]
+	>=dev-haskell/tls-1.4:=[profile?]
+	>=dev-haskell/x509-1.5:=[profile?]
+	>=dev-haskell/x509-store-1.5:=[profile?]
+	>=dev-haskell/x509-system-1.5:=[profile?]
+	>=dev-haskell/x509-validation-1.5:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
index bca144b3adb4..0b65699a3deb 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1,6 +1,8 @@
 AUX constraints-0.4.1.3-ghc-8.patch 569 BLAKE2B 778f426a7fe3db9e97615fb1cfefc387bb2b89f60fdf1f410da35427c3a528bd91420cd953f405f9d2ec370d20936d13b20a6927aed899f0d708866bf5c69b67 SHA512 72d9a60d78b679d5beabf4d299a1c8aa2c7c1c260fe7c9a4337b7c3f597f3a71450af2823a148c6cffcb17bc1a68d6a5789ab2626da775d0493e179cda2877c9
+DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed
 DIST constraints-0.4.1.3.tar.gz 7311 BLAKE2B 27d2265324dfbb60da85cc7016c90e1b38ef5d906a0506b35b18e4b4b06050f9ae1f30e9e621466614a1d643949ccdf23cce183b44e52dc5fcfe3acc41226cac SHA512 0478c69be6a719b83d536aef7733d7383f5400a234829f49146597f89339d3aee46455f3f5001dfc213e07c116276699bf970a657051f3dddb8ab2d9f9593836
 DIST constraints-0.8.tar.gz 12348 BLAKE2B 63ddba733601898c8e8a7712c406e34417141f1da0adc7ab6ce4d271b2356eb1ad6e9ee5ab0b77c1c7efdaf6e0ba6c5e639c6c55032cd75cd6850719323a61a6 SHA512 8cd6f16e70657f95f6d9b0824f85e5991d7da85852a1664abf8b99f95ab85456ecda09f3e59577019284358c09b198d298d01ff152acb3086121521ee302e665
+EBUILD constraints-0.11.2.ebuild 985 BLAKE2B 37ecf837e07b0beddc6b988853e78d01eb7394593a42f0c70c49f4bbbddeafe1d51fe756f0ddb9695a07ec8894cc9bbcc3c41bb52e5a941a8782e52ad5ba91f6 SHA512 5cfd130337fd58d874ef6e77b70888335292e4c61db4f6d513e27e098833965f3e8594707a4f46f097212f959f96e58de9eeb6edd6c29b4a271803071b655511
 EBUILD constraints-0.4.1.3.ebuild 660 BLAKE2B 18f94dcbce8edd601df1668287a131533226ae59989d287320e3d01054d6ea6e029990857f5d2be57476eef13a49366e4fe1418c644b7300b76ebb9bf3d066aa SHA512 1e152761ce3864aa4001defba9bedebbfdbbd397ebb9aabfdbf0b46c1692f892c71dcaf7444415c1fe66cc45295999f891d1d30a49b73ac95969b521c2c9fcef
 EBUILD constraints-0.8.ebuild 934 BLAKE2B 361c06fc750a07f0a459e4e808b0b8d87bd76413efb4342275ada779b5bdefca6a3d4475b938e6c4d7496e80a27425e77a42194d3c0d60e2f36dafb587bdbd90 SHA512 554b578d0c99ef9b9edac9d3df560b4fe79c3ea7516c90cc0064486d7a6b086b58ee84b41805bb2c79618a61258897a9a6a02e05ed08266091dcb28bbc59e906
 MISC metadata.xml 397 BLAKE2B 1eee1841d0991b047d107068bc8a14fe69dc3e23bed9ef860729a3b9e0b07da6c4e73e4a770482fed90e907a08791657b7a4722fc940f021fb26b4b4b2808d34 SHA512 f641ba38e2f1e81b5b5552524b77d30607c80096088b48f02b06f68e313a76dcbaffd2972957ff83f14aa4221ac7008f538a962bc9e427832f97067a89fcba9f
diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.11.2.ebuild
new file mode 100644
index 000000000000..3f327d93f4a9
--- /dev/null
+++ b/dev-haskell/constraints/constraints-0.11.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Constraint manipulation"
+HOMEPAGE="https://github.com/ekmett/constraints/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2 )
+"
diff --git a/dev-haskell/contravariant-extras/Manifest b/dev-haskell/contravariant-extras/Manifest
new file mode 100644
index 000000000000..dd78512c7b47
--- /dev/null
+++ b/dev-haskell/contravariant-extras/Manifest
@@ -0,0 +1,3 @@
+DIST contravariant-extras-0.3.5.1.tar.gz 5324 BLAKE2B ea5554629785efe557a9b708a4487aa9096c963f0ef2d60480a4f155a7f6fb7c696d3a763792af209d9af7a3e77107ac7115ff1fe6f1e043119f4ce575f0933d SHA512 871e9545f8e288e6bd89a5fa5ddc93154092f713505e30120db30750bdacea40f55ed52bf9d59984fc8ee936f4e9148c3d1125b8e59fb4ed0c68044158de7917
+EBUILD contravariant-extras-0.3.5.1.ebuild 746 BLAKE2B 2e699c79addee3137db372833f71bc0e1f0a9b8508e2a34b48d77500e07acc21d2b460cb1d934c28aa58c974e614e0f11da6ece46563a254f8d59483952e557e SHA512 eb07e2ea3d3a3719c7b7fe57a73be04b218924dc65ea7afd2ca791f75326ecbc12fecc9e6d0e6f7ebdc56f7b1aff45196482b002ee548a47e1295ca6a92043c4
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
new file mode 100644
index 000000000000..3fe3c978d3fc
--- /dev/null
+++ b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Extras for the \\\\"
+HOMEPAGE="https://github.com/nikita-volkov/contravariant-extras"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/template-haskell-compat-v0208-0.1.2:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
diff --git a/dev-haskell/contravariant-extras/metadata.xml b/dev-haskell/contravariant-extras/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/contravariant-extras/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index 74f746d3547e..d71aefaa957b 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -3,9 +3,11 @@ DIST contravariant-0.6.tar.gz 5489 BLAKE2B edf506ef34205042a12c325f7d0982afaf7a8
 DIST contravariant-1.2.0.1.tar.gz 6640 BLAKE2B ab253ca2051b455650f8a177204c34f584bb2cb5aec0a4f7bf5f33496dd1a51abed08e7331eed2496a037f448ec85b96be66abc3d39e2c7e67098f7c9e53897f SHA512 c5c76c07931bea8381a412ec02e57f9c17d7e44f8eb5dd982a5083b9bbefd1364c9ed264105ef92615dc79b98fc700178f0dc2f03a3069ca542bdb62d7ca3f5a
 DIST contravariant-1.3.3.tar.gz 9923 BLAKE2B 489684ff698e788c2ce3f1b677a8f05970ff369317cb2ad8b0da0bd87d87cce3820d7bf6d91249b946ece5dfba9ac671540496bdccb1a4b9170a76cbcd2ce250 SHA512 38b9db8035a42c9d8bb1572f63b7fce0f94a93d78cde43f1ce9da5284323b51d71e5432d3aecd128946d7b918b264a1e103e04976ebc9feb01c782e1ea2c683f
 DIST contravariant-1.4.tar.gz 11652 BLAKE2B 7a5fb1d8793b13a2e51180ab92900d01f379f235f185ff591086c3329a2397ea7342100700a1dbea15b4775a5bc0b1ceda6cb491b195258b82e85c3098a7d82e SHA512 6d99a8ed4694ad8494e1a705e911f16ade01f31c92cc8fc21cf49f5b03beafd25597781abc304c4ee360a3ba9473470a4c96069604ab563fb8ae194e09cdf56a
+DIST contravariant-1.5.2.tar.gz 16006 BLAKE2B 251d3f8e0d30176eef224000e2c9185d6161ca6de38c7f8737864d72921e75d715ccf286028c4079781ff25f0e2f2de9c01038f13f3052532eae7d7c9fa23836 SHA512 f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410
 EBUILD contravariant-0.4.4.ebuild 793 BLAKE2B 78b730ab2d9b6b721617d7bbcedaca3ce15861631c87650661d0bd7d09e8c899c5da92fc5a3c460c7579ca8e091aae9cd435c521e5be644495dfb1614e536e3f SHA512 e79a39f7e91a1ffe1944956215d0ff5158320285eb9671b2ab97f833faf8acc9bda2f3127501ac33ab6ee8252630c97d680f53284f955cee42956d026de2f148
 EBUILD contravariant-0.6.ebuild 789 BLAKE2B c4f574ef24763dbee5cf1a8d17fb5ebb26f00ad51f690f60276717be330a411ca0baa9af4fff34d9e25e06a29089f0f936015f1bbde963f7bcc7ffbcba2fa993 SHA512 518dc7dfdaea9c42550e25789557a6ddc41f180ec979610d44ee28d04bd945ffb6246bf3a929d20499d3eec5426853bccf03aa69123226f3df6a98d96c2525e9
 EBUILD contravariant-1.2.0.1.ebuild 1036 BLAKE2B 9fe898bd586e9b7514c21a1599eaf73b24563f3a6fd4d9cf75cdec3d8bd60ac6551a5cc68d7dfa7c22b4eceb8ec7baaeba3ccc3189c90d3dd659d198119c8fc7 SHA512 fac74a5e88d62036de8eb802b7f946a506df82a1ee9b46b27ba4389e33439d7bc4657d5194753f0f4817d5aa946e36ae3ab263eafeb01ade138dea78e31b3cc1
 EBUILD contravariant-1.3.3.ebuild 1244 BLAKE2B 369905ba00bd02a0797d4cccafea47d0c74bb4832dbfa567836c4bb3bfa022519649071d25443436d5b5e2be46bc346f57fbe5fd90748ca0613a53a24205b89d SHA512 facfcad0de6a0321a5dbf101866843dd2183b2323d8d2d2fd0283de526ec0714b11b825b667b5c0d6bcb34fcb41c1df287c06923242263c484e84976e71bd140
 EBUILD contravariant-1.4.ebuild 1275 BLAKE2B 134f3ca6352d57d579a41208bea5b0bb5a459b74f590e6dc6dbb91df8546886334d6dfa42107f44ab1a5871aec3b475e3b5be65d4775b03b16684b400154bbd1 SHA512 30350e4d0c77c34920ccfa6b4ad449003883981ccf84a69b377f70858d41b428cf0974da97d7a861aed31cfb3512377341c872f8d8cc94fdfc7ec7896b91062f
+EBUILD contravariant-1.5.2.ebuild 1075 BLAKE2B 416734ebef85cdc70ec2297e4369373749a701ed74faf2de5e516e96eaa811bac0561d8c69d47f3e800d415945007cd227d05eba2f252689abd45eb07b3b6b5b SHA512 6bb36800fd85eeb31a2067471c9b579b9fd2d72501c91c1c0c00d1c70c73d984c9f35cf187b7f2f0950a187c4749823db3f73644af3a3e437b107bdc6cc07c78
 MISC metadata.xml 1296 BLAKE2B 3fe68b72d499093177159f33ccb32c4de3c51f7c7e353b873ec608651bf5909f41d82c76636f9627b6bd3cafc18dd29a43a4f4e8a26b086b5a7588863542e9fc SHA512 69074a4b878538c5b87a1f667b59a69ecf98e8f8b84d4c937c44eb3ea0c69aeaf3bb384d35d1707fd354e20a941654e18957da6978e88868830dda88106feaad
diff --git a/dev-haskell/contravariant/contravariant-1.5.2.ebuild b/dev-haskell/contravariant/contravariant-1.5.2.ebuild
new file mode 100644
index 000000000000..4406606f91bd
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+	statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag statevar statevar) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
new file mode 100644
index 000000000000..bc6d18cba5e5
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -0,0 +1,3 @@
+DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
+EBUILD cryptohash-md5-0.11.100.1.ebuild 1083 BLAKE2B be2d63ace440e88e85cadbeafd7db617971384d0546d860099aa737abd34c16c70f3a7070f0c5f2197e48be9e510d383af083a14f163b4b4fa2736a6cf58321a SHA512 374b04c403a9ed15b4d976d60edd210141c0bfc1ed9752df2a4b8240d98289cb9b66dd99643d561b6d78e97b3e00066e0e19d300e403021897935714ee530fcb
+MISC metadata.xml 1136 BLAKE2B cd448de1b5bef8a190d7c6be94244e85391a031aeba638e9231c5bbe2792885e08781d036ca514b92bb53c18b7ef8569d727991e1fdc0aa0d570a69af8f0a8af SHA512 04098b3b905f5fc89951a0929309ff7dcd77516b8d1087cebad2f2cbbc8edbdb71f6d83175ba5a0423fd7f57496ab2d131d7d1ed868684a602cd8ae8106befc1
diff --git a/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
new file mode 100644
index 000000000000..0da3dff2e031
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical MD5 implementation"
+HOMEPAGE="https://github.com/hvr/cryptohash-md5"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2
+		>=dev-haskell/puremd5-2.1.3 <dev-haskell/puremd5-2.2
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base             >= 4.5   && < 4.10' 'base             >= 4.5' \
+		'tasty             == 0.11.*' 'tasty             >= 0.11' \
+		'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8' \
+		'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	default
+}
diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml
new file mode 100644
index 000000000000..fc0f69d6e24b
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A practical incremental and one-pass, pure API to the
+		&lt;https://en.wikipedia.org/wiki/MD5 MD5 hash algorithm&gt;
+		(including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
+		with performance close to the fastest implementations available in other languages.
+		
+		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
+		
+		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package
+		has been deprecated and so this package continues to satisfy the need for a lightweight package
+		providing the MD5 hash algorithm without any dependencies on packages other than
+		@base@ and @bytestring@.
+		
+		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
+		&quot;Crypto.Hash.MD5&quot; module, though with a clearly smaller footprint.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha1/Manifest b/dev-haskell/cryptohash-sha1/Manifest
new file mode 100644
index 000000000000..59d5c03dce94
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -0,0 +1,3 @@
+DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
+EBUILD cryptohash-sha1-0.11.100.1.ebuild 1078 BLAKE2B 6c359c8410729196b99c25f79c01bc42695431372cc58e5513e4424d1da606a9dae841bc3932085cc5065b76e2787edfda7df61f7ba4f8475a1303063bf12fa8 SHA512 5cdadc922591e86d5cb44a5eeb55046f5c2eba37c9d84d976c6d55f4086b2cfdefa44d680c711203caadada1f4eaad3745af77eb140ba6ed99d708c40c6d0fc7
+MISC metadata.xml 1142 BLAKE2B a76762c6ae8ca60ca6153cb5bf6257c5b2257c9792cf6dc29572f8e979256eabc0fab1578066cd774063bc81042b23deada1d942fb42241b00fca5ddaae7c7f0 SHA512 5fa379d2aeb81a798dfd5dc25d92c1a62b864a7f0a8188f76775e11d0a55c01ef8cb676420afdbebe456ffc213bf165f6e77b6a8e6ae86864270c998104c7659
diff --git a/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
new file mode 100644
index 000000000000..c53c2bcf8aa6
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical SHA-1 implementation"
+HOMEPAGE="https://github.com/hvr/cryptohash-sha1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2
+		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base             >= 4.5   && < 4.10' 'base             >= 4.5' \
+		'tasty             == 0.11.*' 'tasty             >= 0.11' \
+		'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8' \
+		'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	default
+}
diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml
new file mode 100644
index 000000000000..6967df1105e8
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A practical incremental and one-pass, pure API to the
+		&lt;https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash algorithm&gt;
+		(including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
+		with performance close to the fastest implementations available in other languages.
+		
+		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
+		
+		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package has been
+		deprecated and so this package continues to satisfy the need for a lightweight package
+		providing the SHA1 hash algorithm without any dependencies on packages other than
+		@base@ and @bytestring@.
+		
+		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
+		&quot;Crypto.Hash.SHA1&quot; module, though with a clearly smaller footprint.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/cryptohash-sha256/Manifest b/dev-haskell/cryptohash-sha256/Manifest
index c8a178d73b52..d13a0b70e9a1 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1,3 +1,5 @@
 DIST cryptohash-sha256-0.11.100.1.tar.gz 10885 BLAKE2B 09f33b351b72bb9b8892409b5b140bd446f98cb7fdc349f483a3b719753c0a0ca08c0557ccff2bc4bfedb4336b3c5d046d15548cc8e3a404d69efcf2a5c744c2 SHA512 df6a8c7a4796f3b94faf0c1073b552eccf7dfbe6ab1489fef391e6342f34b3cb29991d1313aa5da11a90cb37bcd43c23eea12073ad4c7190926005de952c39e2
+DIST cryptohash-sha256-0.11.101.0.tar.gz 14996 BLAKE2B 9caccc3eea4ad25c6ebbdd507771d86264a853f282d03399917b42a5311dcad0501bd0b4ea6fa00d039f67bcea3f81c116b9ec016d65cb2ed6f086b0448894c0 SHA512 c755f1354fb5f1d6cfb54f73e39692392517954118d98b39ac4be7460e75a9ddc91ad641fed0f17e5fa33b62b7b0734af66526ea757e00716832572bb383c612
 EBUILD cryptohash-sha256-0.11.100.1.ebuild 876 BLAKE2B 89a655f8a9b1271997ebe67f3acbb547e04d271a272626dc64d2992ee421a7a0113fcc7f050ae8d660a8edcfc8d98e161e2066079d5455d0991eec00da849541 SHA512 961b0b262647e0f08d61ebe99509dae51f58cb6bb422df6779fbc3325a9c257c9789a2ab391ff5699db9f5adc21624ff51f5322868944c08329848b1012b3a6d
+EBUILD cryptohash-sha256-0.11.101.0.ebuild 1171 BLAKE2B 30a6259126fd4c7fc15df16042002702dd3c7fa9585146f7f2df4d3415d140ece5452b6548c90f7a516b77796f5f1a0bbbf587e011f3bc1783439a309ee49e0f SHA512 401532bbc5a67b624bb1964a82a28428737baf7266ecf152a32f9a8a7b914d0ee52ced79b00624c75c0f2b35b3ab082d2f2d12d4fb7e4339465a1c7d9e49c05c
 MISC metadata.xml 1142 BLAKE2B 0cad5264e9d4ede629d9ca0ead9b4f523b1fc78f845db2c3ef27198e089499ea09a272e4070ca0212cbcdc983dbcdecff11e13e9e445a46fe5b0d0371e4ffca6 SHA512 992cbdbfeabf1b1b5d70b451ec96adbf782fd2ba4f49dd1acd796d19fabb0d54bc5dcbcf968b0c9d99335f972abe0d0aa4b6f042a3152ca1705396cb5fb4c76a
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
new file mode 100644
index 000000000000..7dea0e17ebb0
--- /dev/null
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+#hackport: flags: -exe
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical SHA-256 implementation"
+HOMEPAGE="https://github.com/hvr/cryptohash-sha256"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2
+		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base             >= 4.5   && < 4.11' 'base             >= 4.5' \
+		'tasty             == 0.11.*' 'tasty             >= 0.11' \
+		'tasty-quickcheck  == 0.8.*' 'tasty-quickcheck  >= 0.8' \
+		'tasty-hunit       == 0.9.*' 'tasty-hunit       >= 0.9'
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-exe
+}
diff --git a/dev-haskell/cryptonite-conduit/Manifest b/dev-haskell/cryptonite-conduit/Manifest
new file mode 100644
index 000000000000..147c9b6ebe1d
--- /dev/null
+++ b/dev-haskell/cryptonite-conduit/Manifest
@@ -0,0 +1,3 @@
+DIST cryptonite-conduit-0.2.2.tar.gz 5405 BLAKE2B a2565d0d15863159dbb001584ec9e87eebe69b617efd6d18ab9c8d2ff81ae9e1fa26488f6e0bdeb07c3247aed8c63d0d4fa1376240b0ddcb54cd4a619d053a4e SHA512 5a313d1ff64992fc8f45ebf06f5f439aa5dfe745ce6f2bfc31b3ee06b489b0a145a9e6b5cf00fb557ddbebf1aa5c226dc0add9c591f62a06bd6f8776cf52dbdf
+EBUILD cryptonite-conduit-0.2.2.ebuild 919 BLAKE2B c8a297af8e13997ac28d1a92a917f58891f0a08fd80bf477d5b3bbf365f2c4cf02daca528cec7ca3278df58bdf6f55d2ad2038c86e86a07681b92df54aa2b4b6 SHA512 a72fbe9b00d1304afacc356556d1d044524110d9f0de62adb11d29955438e3f6dc09c56c5fe817eaf77d5b85b5205aa7ebee5d366151ff21e596d8b8fc173636
+MISC metadata.xml 477 BLAKE2B a30dfdfc4f10a184f23cbd4229949915a82cf1a5417d38295e8b299a8c4e4ad3232ef0ab74d27b6f74e6400905350cf900def85797043559862e107faae3c85f SHA512 9b16f7999d13e536b27151fb10ddad8029914072d68f2e067bfd5d6d4deb9a9632174fa7e606c8583e5c86c11c4d2487bb53b9451690abb946cd09e7ce9da08c
diff --git a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
new file mode 100644
index 000000000000..c0d2408916c8
--- /dev/null
+++ b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="cryptonite conduit"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite-conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # test suite fails to build
+
+RDEPEND="dev-haskell/conduit:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/conduit-combinators
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/cryptonite-conduit/metadata.xml b/dev-haskell/cryptonite-conduit/metadata.xml
new file mode 100644
index 000000000000..1120fdb5ecaa
--- /dev/null
+++ b/dev-haskell/cryptonite-conduit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Conduit bridge for cryptonite
+		
+		For now only provide a conduit version for hash and hmac, but
+		with contribution, this could provide cipher conduits too,
+		and probably other things.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index fa6442eb2602..dda10397bc69 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -4,10 +4,12 @@ DIST DAV-0.6.2.tar.gz 19039 BLAKE2B d00443cdf7e4305ea0b424f292e44b2cbefe5b388b70
 DIST DAV-1.0.7.tar.gz 19768 BLAKE2B 923f1c20db5325527798bfc6c0b02f02aa051e3e7969e90c43bdf6bbc804918e88c0c5784295060afccf29d095e67a73d76a8a3cd3c610af5172caec7c81ca52 SHA512 3f4cdd5c708793a3c9542cb89845cc8de6a456ba55bc564bf7227ca2c3243807e3e85d6995581ad7662c994d65a0a9cde6f3c0d0a7fbe8ac7c8a07e338b039a8
 DIST DAV-1.3.1.tar.gz 20003 BLAKE2B ae4227b845761092a7435dc2c5a82640c3abf547587bc3b0a0ed3af2a2dd3b96498f45ab299abf7e85711b55ef233efc3be0e4e311f9204aa2196048281eb953 SHA512 d9f502e52c6d6de774b6b25426f1231c02e1a522ea2b991266ddb56778fd34c3a2dcafc81fdf55332895df4b9ca717e3df30cdf39b707589224b646f1895a621
 DIST DAV-1.3.3.tar.gz 20524 BLAKE2B 23eeaddac4e9bbc5e969caa978f2b806c025fa8cda7337c81956950644d564d20e37a6ee468baf07ac2ffcffcbc7be8f7165360548753ecede6b876f1d6d012c SHA512 bbc9a4d685e25ac763c05dd8dc72d7db39196dbbb0cd898b66f644abc8333cd82950439fd446770c5aae737fd863afe881129ce551dadf9d0f75ef52df738fae
+DIST DAV-1.3.4.tar.gz 19884 BLAKE2B 84993b24cb4db897c76c964e8600bb3f882523792545e8d22468a7e435d53a2a2f05716595d73df3ec3f05f3e30a9d56c31bb446fc28e00126b5a853486c9206 SHA512 95bb567488bed2fef3813597ea9c080781bbc25117995901ff7264c0f04bf4db1bad6c9c94c4d1fbea968245041752b2b720d4c42b4c23191eda5e3dc0c292b6
 EBUILD dav-0.4.1.ebuild 1187 BLAKE2B 7c9303727be015279330bbb7e1aec42b4a00a6ea3fec78c209f4329908dfd774d48084f3b95d1912d68396b9cf1e53250557b78644ab934d65a91e703a94f45b SHA512 9c932745b5c0ff97c4740cf6693ab66279e4ecc4a32f6c40e29f762628235dae4151ed89b2410a29c3e2c1630daf316ddc59355e8336a877e53c668b2ad72adf
 EBUILD dav-0.5.1.ebuild 1216 BLAKE2B 1bd2ff41970c28ae5f3914504c5061852867bc1d3581ff3182de091ff0c02f524be594bfb098ac6a2cbe07bd05f1d400a31b8057b204a6a9417703b6d60e1535 SHA512 c1616b1a379117ee26dd23e65fbc783e5a1a69c186649811f29c4dbe01d2a44be1fec21cef980cf7a904332ad866cdef6576f028ae0fd0d147ff96bc04fba3a9
 EBUILD dav-0.6.2.ebuild 1340 BLAKE2B 1cd86d146e9cfd301a3a101d8b7d954ec80abf0f1c308d9f053db7772264785b0e7647318932ea13829cc90d636101d754fe7b3b4672a1ccd31e5c08775fe8e3 SHA512 575e91245fc592a7c7a66ed789a11dbfaf1c4349f1a5e6d579db44df70deaa9fc133901e618e70ba517f64919e4911234d32561533b6d71c7ecb7f554022cde3
 EBUILD dav-1.0.7.ebuild 1550 BLAKE2B 658f4b33ee7925ec873a1c13ad47b9ff814b8a8764480d9ba8e4b17b279fd66df316dd1b93d244313d82e9a03e5d2b5fc46686b3aef0c7b7054fbc8ce2dbeb00 SHA512 2c11cc77aeca791519dece66fc10f0c198b2000d4206ba8064605c117ee6c77a4049a07a2e370f149062826e0fe10a13b0dc1f3a3d756b8e68c31f12c2515881
 EBUILD dav-1.3.1.ebuild 1618 BLAKE2B 070c28bfcf97fbbf55fa9f9a15076a095e52e1f67140df8f850f9b58d8f4559f0cbd88478a42932731361c508d79843d5d5e82a6d5a1512ade891c938562a5a0 SHA512 92724303f76f84c5998539ecf4a9d5761ac06ccf620b7c6fd2e4c5be4c87aca8d3136ab5be54463a52f9f209361df496ec66c60ffabd16d05a91005ed2d831b1
 EBUILD dav-1.3.3.ebuild 1574 BLAKE2B cd5f655e788ba3c0d96ecde7b96f350bf91a146cca659dcf25aa0573a3a070e425dc6fcaec4aaeeb838c96c397278e30b40617d644fa34b6f67a26ffdd4ab3f3 SHA512 d2da0a23c267e52562b617d6e28563e3a00cf54dea5112660db86d715f2062c709b53b02f90b53ef40c1f7c07b2b6ca09624e4dd0b88c0b30c40b16d3fcfad7a
+EBUILD dav-1.3.4.ebuild 1407 BLAKE2B a33507ec5994d7bdfeff11072fc14f8cd07b250d446de4f557f316779bc3e0bec79f5ade0bbc7d029ce7f6981d6f8fe2519830ddd0ac9404a866f94b1d8782d1 SHA512 63932672f1e5d77bdb5bdc3ea5ae705b2b2d151f1467c638b2c37bf3f0945af58fb3f6309c9a53e4793998cc37778fb55a9662c025e1827bcf4b4045b2203cfb
 MISC metadata.xml 650 BLAKE2B c387958eada84c6abeb2c338a51d77a6070c9abfe4a30a9b32e0385b0cdbe2019505f8762390ec0d39961ded95f859f8238c7e04d61d4b85c61551fd0d4b948d SHA512 0d4eb14205b9b25fd1821ad4c43f905b5cad5ff376491fe0e9b1e6758dbbb5930cead0552dd9ba0af0a9d35a9d60c015874427e9ee51665913831d217bbfe957
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
new file mode 100644
index 000000000000..9faf65b3f594
--- /dev/null
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+#hackport: flags: -mtl-compat
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="DAV"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="RFC 4918 WebDAV support"
+HOMEPAGE="http://floss.scru.org/hDAV"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/exceptions-0.7:=[profile?]
+	dev-haskell/haskeline:=[profile?]
+	>=dev-haskell/http-client-0.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lens-3.0:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/network-2.6.10:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-haskell/xml-hamlet-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-mtl-compat
+}
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index b4541a3caf23..9ed13cf770ae 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -4,8 +4,10 @@ DIST dbus-0.10.10.tar.gz 73707 BLAKE2B 90903a39d6962fcd3864988215fc74a3f85571509
 DIST dbus-0.10.11.tar.gz 74853 BLAKE2B e72838c14906106b2114d9be9d8580295617c33fd322a3139c8c8245849dd77837cc26587c0289982de32442265b477754196f1b600f630d2f05f1c5312941f1 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff
 DIST dbus-0.10.12.tar.gz 74960 BLAKE2B b0bf015a761e3bcff8b5b40165f475c0ce00320f95a3f21cad65fed2db6955d982c2c4dbee2e9697f9a67f44b680f12e00c892a1dfa5fd45f745167d39307e66 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9
 DIST dbus-0.10.13.tar.gz 75603 BLAKE2B b1acb541505f0f9afe63fd8d9441114fcee3574e109686b16cd5c506aa940674352d32c14e155d2a2ddbc4bab3485ed70f747f59240b572559d6e649aff3a8da SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec
+DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
 EBUILD dbus-0.10.10.ebuild 1325 BLAKE2B 2ab13a855a58a45af782e9e3b7704a7aaad7856974774276d75b94424bf1d58109f662ac0861c03f3c7a805e36bb5204e8deb1561efd6382b0e54aace898520c SHA512 44e2d1dd6e2c88d7a0517068e883906c5edba6c624e94779ad385882f2bfdb88b20f344a1f775bd1bf18cc5f0b266d7c6c60c40a3c93119cd78130329d1705d3
 EBUILD dbus-0.10.11-r1.ebuild 1416 BLAKE2B a78925696b66281bf1ba62b9deceb3f09998da7f752bac1e67ec6285c7dd74237e5bfe797bd44fd5b52b5e90de2b7766f96ea5b2997f6955b3a930609c5bf2bc SHA512 41926486e1e48ff0d3d4779ef7035a238c8b380dd7866bbb10f2d1bd04b1e3ba8aa46d1128388d48f869bf6933570557dc051776f6a53f2e27b4b15b2f89c5e9
 EBUILD dbus-0.10.12.ebuild 1391 BLAKE2B 261259d8000b92af39f73aad5512ca5d884b0b411d80ddf4e5a8432ec8e548947b7f44ea1c4ad9970940f2e88321d9d34a3809eaf0c7ea28c10e281e6ae5949e SHA512 e05b57865df91494e67c7874c3c7afbec321a54986e6062690cf68f84717d8cb1edbad491fff62cc914e0963d561a53308576defac2b6bc62c486b6a3a232f02
 EBUILD dbus-0.10.13.ebuild 979 BLAKE2B 29fc5657c758c3bdac6c8c7647e6a8368e213e4ae655a39d32491d8cf5d0b40d97e908aba2e37c4c6174ce1b85967355df04c038734e5404f3667504ff5d5f2b SHA512 26aa9fb1895c770198275c5c245527ef279ce9d637b5c14b75aaa863512fa44a2963b5bedd5218ff9479789e658966e84d1c2fcaa65400a5f9dff8d5993081fd
+EBUILD dbus-1.2.16.ebuild 1429 BLAKE2B e1a77a159060586c971bd3e89d5fa1024de1a494fa50afa2e36f16782f0cf965e20a5937ccf4fac93010e1c23ed2462e0f64c4ff391888cf54439cc7411cb36c SHA512 5a07bfec67ef2ed706c53fb93ee9c3186f8ccfec7997db6015852e5d811f5e426b27a2f6f3ea3aa3c2bb83da8c2d420692b5fb5b23ec049cc9ab79c37115b90a
 MISC metadata.xml 2059 BLAKE2B 6b4337ace7dfef9da556e9effadbf17714b10926a5f8ac738fa31685fe615b9dddbbf1a4e65550477bd75dd44d46081479faeb67d270218d53bd421cc878e94e SHA512 5fe5ada12b86da78282ff30e5bf0c8218ec81a451988695907c82759aba1dc022539d1d852d078023b37263c1f21a58831edc69a02730caca79487a897065a3b
diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.16.ebuild
new file mode 100644
index 000000000000..978131cedba6
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.2.16.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A client library for the D-Bus IPC system"
+HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires access to dbus
+
+RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	<dev-haskell/exceptions-0.11:=[profile?]
+	<dev-haskell/lens-4.20:=[profile?]
+	>=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	<dev-haskell/parsec-3.2:=[profile?]
+	<dev-haskell/random-1.3:=[profile?]
+	<dev-haskell/split-0.3:=[profile?]
+	<dev-haskell/text-1.3:=[profile?]
+	<dev-haskell/th-lift-0.9:=[profile?]
+	<dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?]
+	<dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( <dev-haskell/extra-1.8
+		<dev-haskell/quickcheck-2.15
+		<dev-haskell/resourcet-1.3
+		<dev-haskell/tasty-1.4
+		<dev-haskell/tasty-hunit-0.11
+		<dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/dec/Manifest b/dev-haskell/dec/Manifest
new file mode 100644
index 000000000000..587aaa0c3155
--- /dev/null
+++ b/dev-haskell/dec/Manifest
@@ -0,0 +1,3 @@
+DIST dec-0.0.3.tar.gz 2629 BLAKE2B 558b559cf5d92afad637f61ae82549e200a6042740d78ef25be5bf32212dac5027e4f1b3cb9104c65d589927e1ff8b65e62b7f46d6fd5ff707f175cf920bb206 SHA512 446911a59287b48d8b98acf588671e6ed19fc12ed8adeabdab8f21c1fefb80cac7b59b9fea52a4671b997aa63d2eadda5181490e6901e99e9882de572abdc595
+EBUILD dec-0.0.3.ebuild 671 BLAKE2B b752c071e3511e1938a4a3e2a8f18477cbcb1ddb31ff40938e1ca4d7eff0d029bc54cdc9c6d37f4b258b9e97625a56a6fc957fb9d4eea09d5384e908f66feb52 SHA512 edcf2fc62fe90389cd85a8792d87dc50e5fde7cdef1e4301cf48ef55c66a77730f049249e10d25c528c0a18032e605c21917c0dbfa62eccbb442f9748a7c284e
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/dec/dec-0.0.3.ebuild b/dev-haskell/dec/dec-0.0.3.ebuild
new file mode 100644
index 000000000000..8a3cebbc9cf5
--- /dev/null
+++ b/dev-haskell/dec/dec-0.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Decidable propositions"
+HOMEPAGE="https://github.com/phadej/vec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base >=4.7 && <4.13' 'base >=4.7'
+}
diff --git a/dev-haskell/dec/metadata.xml b/dev-haskell/dec/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/dec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/diff/Manifest b/dev-haskell/diff/Manifest
index c93f0f955dc5..20a469129283 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1,7 +1,9 @@
 DIST Diff-0.3.0.tar.gz 4128 BLAKE2B 94855d33247d1cf44642ad3bc395dd6944442e48405d2987dce1550acb34e3a8408c139b160f0d26aa1e4c76dfe3680750d96662b197e4633cc891563b65a19a SHA512 6920802ba715a97f7650e8edbcc8469c1479d8be2c7fb61703fccaf77f4adc23ced7d26794e6210318afd98f350bc5cb08fd70c1b2797fde9f95546e55a85198
 DIST Diff-0.3.2.tar.gz 5024 BLAKE2B fbbccebe6627853649367e016487b0d01e671a1a6a495996413ed2f4f4d7bc63245ea915f9de2465aa8ebe92db1893c34812306afe18aaf466eafcdfd21911ae SHA512 b41c8482b1bcd4e332f85015f7ea99dc3c76d106327bf6b3a8676bb31ffbbdc80f09386f8044aae234a1be6a6304ec4860bb9c0ced95f8910db19d3e2cefe297
 DIST Diff-0.3.4.tar.gz 7979 BLAKE2B 937b90294b9e48a741577c7d240a1b02feaadd2aca8afc439e19b36a98c0e3bc319ee67307b77a2410bf2139a580166cbedbc964d5c9b9fc15dc7422ec2350db SHA512 7b8af9a668429d8de141b840e4b22abafb7ccafa9cdbe4c5ee21efe58802ac5889f1575fd6b3c83755b1128ecec68f3aa0213e99b65161f1e7b5681dc6978ad7
+DIST Diff-0.4.0.tar.gz 8065 BLAKE2B ab29983e8f1322d45a0e2e2551d4f762328bfb3ae92b0bf0cc14c8126f8e6fae87eb3a591c4e9667b6f5a4f6a149630471e64a1da0f1b306f6b6d0e002583320 SHA512 6a48a234d3140bc8c641cdf649a1f0daa39ab4de4064435dcbb15a9ea52994c967aadc8584f70aab89ef78e17ecc66b8ce3d8dd2157eb5b85277dfff80fd608c
 EBUILD diff-0.3.0.ebuild 601 BLAKE2B 911fa074dcd2dc89d091c5cccea06312cca4045a7f56074020ed01a919e5a4ec17685d46c6ede44ca9e9dfbc73c6d9ae2f04dc7f22ddde4e072ee71277dd6060 SHA512 19cc620532ab67941671df2084a423a44a7d4922f8e273471164beae7b75750311718e49975f5a0e7456588385213ac992a386b61664299a467a325994fc81a6
 EBUILD diff-0.3.2.ebuild 601 BLAKE2B b6d14fed30e79eacb147bd47e7319e02bbeca9de3d7da8403b967bb08f600f25ff38ee5ef6ae34c93c2b38615667614dbe4c00b7b64faef6c83a424675fdc5c1 SHA512 1424c7d7828e77538d3f19ed1d950d64c6705f895b5cab9f42f773d1381c72b145a1c08e9b07439abe7121124d34bd520b1b6b2acbdbdd1909bd8b432f975fc0
 EBUILD diff-0.3.4.ebuild 716 BLAKE2B decf8637a1e3aca0242e49135242ad4d2adaf7b0332615a87026814ad96539c1062ab5c6cb15431c8af23e07cdacb745c95ff6b331026b57a2cce1633018ea29 SHA512 8d0a493e7829891a5a6526bfa5a8db3f1481d845eb712054e5dccb2f529c5e6f22f8139511623e55cf276b13f3bfc2a91490310a889d31cee870ee1bc8d21c2a
+EBUILD diff-0.4.0.ebuild 715 BLAKE2B 5a1f8376ce04d61420a5a39bc8c0a08c244ed992e806773d9fff3bc332934da8848e90fd4f0f73d45e2aeb0267375541141bac3634c2b54014691716e25db937 SHA512 eb0f9b017d4b9e2100ae5930d3f4217d763c00f504918ad50799ec1361cad62cf92aebf55119e10e0f78166ebd0beddcc80c23cea852129dc0be95841e274fe3
 MISC metadata.xml 343 BLAKE2B 8ade99ea53e57f6cbd50bbd149638601274414962c1950f608e153f23f5b06fdbc97045e1d50d02a9111adc2fa726bf0ba2c9fd281888e4a653919d459071e28 SHA512 db303177305c59a6ad2831d02ed384912c3255eb15bde6b48b2a6e06abb17d4e66d8e4de8f5fadd9bb027cbc5818a1c5a1b364e31eb8cd6711c343d4b6f42bf1
diff --git a/dev-haskell/diff/diff-0.4.0.ebuild b/dev-haskell/diff/diff-0.4.0.ebuild
new file mode 100644
index 000000000000..609ea0601bb9
--- /dev/null
+++ b/dev-haskell/diff/diff-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="Diff"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="O(ND) diff algorithm in haskell"
+HOMEPAGE="http://hackage.haskell.org/package/Diff"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2 )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest
index b4aa87f9ee74..b5534eecddca 100644
--- a/dev-haskell/distributive/Manifest
+++ b/dev-haskell/distributive/Manifest
@@ -1,7 +1,9 @@
 DIST distributive-0.3.2.tar.gz 5997 BLAKE2B dc92e2dae4ea335f7e1ca22432ee277c71b542cc26f6777d3a416d8de29acefe675f255b81c38d530b52965087902b115ac88fcb6d96c970417bb6cb0aa59201 SHA512 7b9d499c68a0e689c961ff6a1e33abad8d42fa714e6c45303559e58c962cb7fa1857a9dfa8514478a2c0abf464d0123ac12b8f86cee2d1c2c01a0875ad59bc1b
 DIST distributive-0.4.4.tar.gz 6686 BLAKE2B b408d3f7a95d11eabf7b59f5fced0373be66eb9ca96d22ceb3bad5ec77047d7e17b3cdf691bf9e214be52945d84511a77df01ce98b523ee35fbd35d6d8f308e1 SHA512 35f73d575f31b7ddc7ee5f58e4e2e871c3ea607c7147b96467937b5ffb80bcaeec6da616bfb596ffe1bc28bd7f4062d56496eb5b5cc9e45249865c216139dd4f
 DIST distributive-0.5.2.tar.gz 11824 BLAKE2B 7dd2bc3e4463ad44fba94a165f257343c171f185a8d8263d92db2dc3494b8ae5e2fb4a3174ac33c4864c009748ed5f30d1a2834ebf8c7e92b28b189391a6bb75 SHA512 1d16950598c25a9ce30ccd2711e085a5dba639dc0841af4fa0de1f1866fbea83142accf67fc95f230c466a5d17a5c9f2c577d6c3a72a913f7dbde77c8845175b
+DIST distributive-0.6.1.tar.gz 11256 BLAKE2B b8c964137613b828f2908b210964be06a39bcd360727edf816c9921d6f7c16c245fcc6cec702ff8f98e0f63c90396796af0bfc7964f25d589ca5616aa30eb934 SHA512 6f14660e14ff5dfe90eb44386ed111829d4a621f77908049197ce1802b4d5ddd67ec66dadb92f8726c03f455e077ea6a5b8503e24bd5d205883d53f13cceb630
 EBUILD distributive-0.3.2.ebuild 895 BLAKE2B eabbcaa4bcaa82ec6861acf1dee47042b1cac627ff6972d135f4766f90f25cc12c5d82079ed03c6c6b59849abad8258f13be090037edc8359db4a22a1dec7806 SHA512 fa0b4ed257700ae660c111faeec2a348af752ed9c7c6ae138ea54a842f3caf06bd53178158a4537009deac71fc472fdfe271403ee749415afe5954b4ecdc71b9
 EBUILD distributive-0.4.4.ebuild 957 BLAKE2B bfa11d25b2887a465c31284b1c4f10eda971a69dcb5ac99f254d2153340efb30ddf92468ece7d8ff3518c1485404e68848ff7b5349c449127044c0f8aa0c3f91 SHA512 b341629f31b293e343e3ab098fc67e5799ab37bf956cae65e5cdd9e6b8356ac42672b22eaea184608b635922ccfe519babed290c295a3c1a271841933f7d0341
 EBUILD distributive-0.5.2.ebuild 1269 BLAKE2B 81cd4eaada7c23da3185b167090d52ee0d894dc279ebbfd33cb54060d244d3052fd5a9ed72878ee3568cd4297c8bc4190198de498944cfc3fa75dc5a65b85775 SHA512 501f3407e51c788e9820c6c8af356237641c84bc6b017eaab3f67c4729f805aa20e6ec41f3349d1a547c323cc5e5fce687a6df1c727534620a3039dbba5d6911
+EBUILD distributive-0.6.1.ebuild 1205 BLAKE2B 353f74833bd8d2488630ccc4ee006cf14ccfb9237941692d33aa5bc1fbb7b4242396372560fbe0b08be0d12f25cf77dadeeeaf8956128618164d8c278092f6a6 SHA512 6e6ed365f88fe3fffdb75ee23a7165f9c3a3ed2c4989804989e686d6bab3c756421740b4ba52e8d44b5d3dfaa033dc68ff5ea47711cae4fb4a80ff19ae6a5f07
 MISC metadata.xml 514 BLAKE2B e720ae8ca046d7b45912e5d0118dff0afb9d3e6a057ee05af9cd6e706885d74426cae6518b720fb50ea9d2f1682d75d386c4c3b69aea33feb76916ed397fee8b SHA512 099854ea60b943b990d6627be340a882b8d480a00614fdda28b5532040194730f4504c0fb824fe28b843b0f738f5359ab0dbda124c036842739582a8fbc6620b
diff --git a/dev-haskell/distributive/distributive-0.6.1.ebuild b/dev-haskell/distributive/distributive-0.6.1.ebuild
new file mode 100644
index 000000000000..2389f0d37e23
--- /dev/null
+++ b/dev-haskell/distributive/distributive-0.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +tagged,+semigroups
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Distributive functors -- Dual to Traversable"
+HOMEPAGE="https://github.com/ekmett/distributive/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails on USE=doc
+
+RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+		>=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=semigroups \
+		--flag=tagged
+}
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index 510e31f14c18..f83c2486d95f 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -3,9 +3,11 @@ DIST dlist-0.6.0.1.tar.gz 5655 BLAKE2B 20cec7c6db2299efb8e67872168ad0108183b52a2
 DIST dlist-0.7.1.2.tar.gz 6301 BLAKE2B 372f26f3583647945b54eeca9cdd6bdd93b361d6891da35089748d439387ebe2cddbc590dd331c249c58f79504ec1ec2cb837346c61ebf0da5426a14414083b9 SHA512 471059e0a4702eca3c5c9457ea1179bf032ff48813776a283a0993abfb713e25fc12a0171b44535729f2c241dcb69496273abe9dbac181af5ef4404be95d5780
 DIST dlist-0.7.1.tar.gz 6137 BLAKE2B a08d9caa3bc985909938a0676648b05b5d63cf4bb94fb26aeb0649bdbfc046ab416cf83aebdc2c35b4a9280b9c233a536575dd0d6e5f355e1890502f8dbc22fd SHA512 0cb9408c0e7e30baa0489439858e4998d17d16c8c120ff3f84c8e256262110770131a96337020456ed4c4e224cc4a80f567b3f4afb0d0452a622940c4dac635a
 DIST dlist-0.8.0.2.tar.gz 8291 BLAKE2B 738ceabf3dc90a96190968a5f7727510842d1f326eff5009d5e1e6ae3c1543647f531318051f4c0d21522165240ddea3b8fd0b6ec5cd11a2edb42e0edc2d500e SHA512 49806edc04810fdd288c63c0b6f44e4c093844e9d47c57b059064d6b2426e1b75a9665e3209fcbd3e3781293cace79bf7532b195364fb259a5e24ea8774623ac
+DIST dlist-0.8.0.7.tar.gz 9228 BLAKE2B 11d32271f9a4254eef04cf2b4de2cb68471a3194add8bd8ba87995c7098a5c80e54a62e2637ec6482ce671e7674b33ed2339a7bb2b52b4f302a41aab89b86c6b SHA512 e98ce96819bc8c7a86f1eb402ba7c6aea95fc87502afbb40a4b61ac6dc9a9793ca6f6042f633733c9e0e7c7f3f77711809767ecd213639bfa3b77e71bd6bd806
 EBUILD dlist-0.5-r1.ebuild 645 BLAKE2B e62bcdd3b4c87d4ba86c512e95b34d76476a60d012bed24abf9f58ef68da11697ee1bb983faa3d1890339bf9efcf8ba22670ff4c529875f9608565ada0df2abe SHA512 755fcff3ee4624027026f58c7b2f680d4eaea10217d9ce0695e423d7f48d4ad29a2cce445f7ce4c91a5491e5015c308bb8d5b1d8b6477f41399f8920e2bd067f
 EBUILD dlist-0.6.0.1.ebuild 632 BLAKE2B d29b510ee30ca14de28bdcbe94663ef2c954ae07edc836c3750f2184f75fafe068f9ff7a2e5411e743f2fff34db963a46598aecc051c595b687d24d103753c0f SHA512 a27994a5f04b8a5f2d3b320ab1d444db373a2256f5fd6ae0ba34884b8cc29b3fac51dbee29a783f08033dcd771135af19a652a8e744b2dfa2f05aea35077005a
 EBUILD dlist-0.7.1.2.ebuild 631 BLAKE2B 97417506cc3a32b3386a38df1db158db2df051e373d114afd20667ad7c072a160456f070fc936ceabf256420913f6282bca06e09c485578ea7c5e79ce1a66a31 SHA512 fed31aadb2902206e493726ba60357ba59e699e95d7319ecc15826df28cf8c7e0fe5c2b96fee4a4fd2e660ac8e5f597df591b8afcee2bd99add72dc9dc89faa7
 EBUILD dlist-0.7.1.ebuild 631 BLAKE2B dd496951833b160368bc2a29bac302905e809d3a18d597b8439a16cd17bd6154147fefd4e7e63fda7f34337bf356e7c6b4afed393c918b9a362ee87736f3b769 SHA512 7d104f4abf3d59b9fe363e7177ef229fb7cbe15765af6917e687eaee581a5d43d30d00d7e1d753ab8c4c5aef6d3fab88eafcdafbbe3829d834e5f88d5ef367d5
 EBUILD dlist-0.8.0.2.ebuild 630 BLAKE2B 12d121b7899308c1e8e9a87a9532b5ebab137035e7324ebc9190e7f30aeaeb0d6c9c3874eb81f51168d6ff9768aeee7f8c7927453a7d999e169f483b1f34bac1 SHA512 7bd94047450c2fc8a09b4ae31de2d0e2c87dc1664d535363f9a7895a7589e4b37507485602f71fc7d24df9d177cb81d18f09b045975fcfccdda9d7788bb40d3e
+EBUILD dlist-0.8.0.7.ebuild 631 BLAKE2B c97709c995b7d03744c044af192a615cfaa94074bc728b9e4e988c958cf5d85cd638356f8e3bfe921b2e3cdfca74f4d6138695bcdfc34390d4484f7a6dfc18b9 SHA512 854acf068b7aad758e0a7539a074323e41810db2cb640877778d261a38a0ab0e24aeccbef6f5b1ee77842d7d96deb45c1732a581ea5e49bd0dd5e81034f13498
 MISC metadata.xml 580 BLAKE2B 72f9156d80854b8de020547a9ab629c3b9fa6a05a67462ad6d6153d672464e9904907e87069efab38691b7450eb6e18d193cf2e4800e3088f9ee3c38db833925 SHA512 727a9da664a5d91ee1323fd02f374f32c24c1a406f5146afca7d2f17205d0643efb88f37170901e551677eb4a432377afbc226269b18c85616de0f3ae5c6ea6a
diff --git a/dev-haskell/dlist/dlist-0.8.0.7.ebuild b/dev-haskell/dlist/dlist-0.8.0.7.ebuild
new file mode 100644
index 000000000000..c33fc3fd59e6
--- /dev/null
+++ b/dev-haskell/dlist/dlist-0.8.0.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Difference lists"
+HOMEPAGE="https://github.com/spl/dlist"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 )
+"
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
new file mode 100644
index 000000000000..cb6107369466
--- /dev/null
+++ b/dev-haskell/doclayout/Manifest
@@ -0,0 +1,3 @@
+DIST doclayout-0.3.tar.gz 11968 BLAKE2B 60c9b1a0f8e6cbd18f130c392b19362754b0622def92e6404ac37cc3aa304712cf947fad0dd162f7919c93524f4cb87d8c9c240d22351087f629f5fb58321ad5 SHA512 ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0
+EBUILD doclayout-0.3.ebuild 737 BLAKE2B 56ea3be5632692fb1385d3fd30fd29811ac053766ed86d3e295ac171e286ded3e562eb637e692ec1baeb0a39410305fec2637983ae06ab44823aa8de35e5be17 SHA512 775d17451d3280a9574b74fd23f3a97198880e2085190e6be99060b8d1c086ce3efe4b595f27b6a3c0c0f91f9949c12cd363b9ac5cdb2d58240a6997ee06c261
+MISC metadata.xml 482 BLAKE2B 3c3c57ee2775a246e8ce92e4ce0e8559e1ed5cb7477f88883cf4948ef86f417411a17cc9a69b4fda8c909fadf1a47094db752e8025a17938409beb0bb49609a3 SHA512 8735b47506e6513f410ed082f3647fca1162c865da5e14fad48bc3b7567be3b058bc079df9bf5d4cb85a82b8da0f35841abdb5307ee464021691f10763987521
diff --git a/dev-haskell/doclayout/doclayout-0.3.ebuild b/dev-haskell/doclayout/doclayout-0.3.ebuild
new file mode 100644
index 000000000000..9fc2a512278c
--- /dev/null
+++ b/dev-haskell/doclayout/doclayout-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A prettyprinting library for laying out text documents"
+HOMEPAGE="https://github.com/jgm/doclayout"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/doclayout/metadata.xml b/dev-haskell/doclayout/metadata.xml
new file mode 100644
index 000000000000..a9ba080b188f
--- /dev/null
+++ b/dev-haskell/doclayout/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		doclayout is a prettyprinting library for laying out
+		text documents, with several features not present
+		in prettyprinting libraries designed for code.  It
+		was designed for use in pandoc.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index 8a1b5a4a43ae..a29a823a89e0 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,5 +1,7 @@
 DIST doctemplates-0.1.0.2.tar.gz 5924 BLAKE2B 80c20a0dd097770d2e6fda2f38435393c65b9fa91bc521a6c52e91a7ac11a637787aa740be1cfaa051fa077d8dc20cb8b7949b930317e426d203d60458865471 SHA512 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430
 DIST doctemplates-0.2.2.1.tar.gz 6139 BLAKE2B 5667ed03cec2605c131246625dcdffc06aed3d9237e09490509bfbe69a80483fb58bb248706076ac2c4fde2bf178b3695f14d93615bcd788ddbeca841088855e SHA512 e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485
+DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
 EBUILD doctemplates-0.1.0.2.ebuild 858 BLAKE2B d14acac78295a23eded1a68d05443caf29afde3a7cc2a775ecea882ae767e1be4ff389e51e33375a5eb289369001f3e67bd3f4ee400719a6c29926aee9d3fc97 SHA512 fbc62e03b51d3713d20dd102b293c3dbac4c7d6f75dea96e3db6d2cc4eaa9f1483b2fa27ff888f5abd0f8942f487674c80a4792b58096aa36a043be867012ef9
 EBUILD doctemplates-0.2.2.1.ebuild 947 BLAKE2B 71f740832cfd9121d5d33629f623c4034761c005579f9ce1a01fd8d5063ffa8257361226c3e96eacda750fcd52ae40997b9207f9b40035f8b9cc9aa96498f2c1 SHA512 ad310400e1bc86d450f03920e4833e9bec7e9e1e0c764041fa942a38679cc46ebbd9da7bd4d2ae7b91108ad7baea45f8c55f13107052f915442c3eb80648ade4
+EBUILD doctemplates-0.8.2.ebuild 1098 BLAKE2B e910ee9a939f767336e8773d73b1426afe21d5a614aa0904c52624f62ccf5b11f5ae555733e74b3055d631dcac0c2779627e5e39334a2a020c6b421a2654cf3e SHA512 eb72d55c9652162f6730747767ffcef6f6900a412a005c6a45c6d0cef6ba3637e4031ca4604cd625e42acbb2a43535911cccccfcd02d09178053606640156959
 MISC metadata.xml 392 BLAKE2B d2e1fb4cd495de5e771a27e2982639991434dc9797b7d9c44ccccebfd4b9e0783d85384d31865055e5a882b39b4be8b954401350e4f1c71d089a60c5cff83b6e SHA512 083b9d618d32c53f48b9bcf72fccc3f6fcf600b4fb63a59e43caf11b0e3bd2d4effdd3804ddc69829c7108a9093f412cb1eb0df9a74ef22a6b12a497a93d4d1e
diff --git a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
new file mode 100644
index 000000000000..5fc32b279a83
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
+	dev-haskell/hsyaml:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/text-conversions:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/glob
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index faea530b44fc..eea53f3e8b93 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -2,8 +2,10 @@ AUX doctest-0.11.0-unamb-2.patch 695 BLAKE2B 184ad9d6ab465278fd30e346e2cd5dcc024
 AUX doctest-0.11.0-unamb.patch 1005 BLAKE2B 21fbda852728979e1469470f7a08dcf663266b5785a2ce3dae270f1c5818a30200ebb2264928d9d3e075e6b5fe4e66179eb5acf96ace2212e65e590a0b39d733 SHA512 aa527e0be7a13936c02a0c76dcd9ea841303f769c72aa5fe5729e3f52cfe2ec884eefd8859b19db2579f88bd79d40d6c59ade31222449de454ef5ab587c4e19c
 DIST doctest-0.10.1.tar.gz 18046 BLAKE2B b91529c81d8c23838933e5e46107e6249e9cc16a4fc2435de1bbc0f6ffa95ca6c9b8e7a5cf98d41409ae7765b5ab357ce080ea61cc2906726bb8aedbcb197384 SHA512 f12d3f30c6dcdd9e088362039b4d99d6b9fb499d0a78016e1e6e7b54968950490a1418dd5a7d94d5f509a08f3cf3111276ac15e84775278a77737099ac9bfd67
 DIST doctest-0.11.1.tar.gz 18086 BLAKE2B 577a86638aa67205df198444b5b8fd307e7bdce12b4a77ce2102cc95ef7f967c2e612a10ed2cef9ea35cf9455bf2f4e3a01920be1553bc35472ad442fd88f3d6 SHA512 ca95e0b5f09514e8236507856ae610016bd549b9e685b4a94cf1c0682d1cf7bffb344b471aab22ae3fd47c29ada0dcc0ba52b8f012800e9199c340b764971894
+DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
 DIST doctest-0.9.12.tar.gz 15806 BLAKE2B 20b63bc3451c81c646acc09dbde4fa77b3b7b82e2b8c4e5edf0940f33e71a8b3ed296e5337b673b5a1342ecf9bb1ed4ae82358c615abb7be420aa32dbf966ef6 SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916
 EBUILD doctest-0.10.1.ebuild 875 BLAKE2B ab1a51feaffd5212439c42dbc9cedcfdf5a896f5ec210f44516040c969a4c04bf432a0f0228ea9d847c61faec13b5c41ce9dc84c5e0ad14b4c124d76f28fcff6 SHA512 2203301b81f3e4b4aed786d4b2e47dad62cb6b98cb33598653cc38db2dd42966491084470214cfb523261ed92b2ce3950110ba0e20bcaa700f01f44f4dfa5d2c
 EBUILD doctest-0.11.1.ebuild 1077 BLAKE2B c6b91f918b4e5a9baed70040f40906ef819b891d53a841c37b2ae977374cee4b25b0b55db1f67ed78f2ffa514d151d61f7d0794aa3d0b903f455c1b9a2f144a2 SHA512 4aa1284c49c3b121a7e85bbff33980ad3e42c9b2116018b668fdefb3ef222b824faa062dbceb197846d5999e755376fc48f2455da679dcb2e32c208f4a9eb74b
+EBUILD doctest-0.16.3.ebuild 1085 BLAKE2B cf81539800051147bf7a514493aedf602319191b46e91b96f3f4d81851f4675e9cdc73b2df1e14a537d90481ef220c82b6e5d6bc71362bbfa062af6d956a3f6f SHA512 105864196cbc94c9199202c5e032410b8196f15fa5e73abf37d930b32fba2fd7953e289cf391909c74c5957d3a6c3efe32d4c7a31af1b848e504cad6e15dcd9c
 EBUILD doctest-0.9.12.ebuild 908 BLAKE2B cae64fa19ea24487495a8a99e9e4dd0e030159173c697abc7e141f2d2f78ef88cdc5b5bd492f3bca9e27e4b1ca566340fdd9b8410df06e7862404bbe0a3bc254 SHA512 5d64fa8dc1a8bd373cc632d44598c0125af32b17641ae29b55b9e4576063f7ed68a3cd1e63ade718945364297bab8009f55dc1e18648f8797928aebcab838a51
 MISC metadata.xml 622 BLAKE2B 8d73447e653e98ac598157a57db77c576b4010575c712574456bd85d45a6a27a75f6dd583d9e7a480dcf78513acc5117afb5c223ce6d6dbca64f5cd4df5e0b03 SHA512 a9a18fe1831a4a70230ba2634aad01967e069710b6511de0489d62062393e1cb61c4139176830ab820e98b3784de84ad97d58683740162d64376a2b718c82671
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.16.3.ebuild
new file mode 100644
index 000000000000..012b822c494f
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.16.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Upstream has no intention of fixing it:
+# https://github.com/sol/doctest/pull/135
+RESTRICT=test # module conflicts
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+	>=dev-haskell/code-page-0.1:=[profile?]
+	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+	>=dev-haskell/syb-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.3.0
+		>=dev-haskell/hspec-core-2.3.0
+		dev-haskell/hunit
+		dev-haskell/mockery
+		>=dev-haskell/quickcheck-2.13.1
+		dev-haskell/setenv
+		>=dev-haskell/silently-1.2.4
+		>=dev-haskell/stringbuilder-0.4 )
+"
diff --git a/dev-haskell/drbg/Manifest b/dev-haskell/drbg/Manifest
new file mode 100644
index 000000000000..f68a228162ea
--- /dev/null
+++ b/dev-haskell/drbg/Manifest
@@ -0,0 +1,3 @@
+DIST DRBG-0.5.5.tar.gz 1547022 BLAKE2B ca70a605334a60a0c4fcb1bf55c5e2f30065e55387372bfe0068b4ffa69e79607432b5eeef395126c00801e45a39a34b94c96e526357c8bec6fce077484c1c15 SHA512 e71fc158a7961729ce10d2ca795a935d6a103f31e864f0446cc4faf2b0edb3a5938a4cc79135cf043a375e63f9be4401ce092951b4e8f47c1c3b1c2070c118be
+EBUILD drbg-0.5.5.ebuild 1368 BLAKE2B 57316ac86e3870226d287563828cafd6908c33db224dafe86b22eb32dfd4d8e863271e6756297797399d018dad87cdbfb2f53c6459dd3cf82004da0d1b91587c SHA512 33a47268457632365e70684e75e35642467c0bc2a3c2985281fc9d93c3633df5b7e863db20eecfcdacff07ce0dea9d00f5e1cc916d6026c35ad461c54055b280
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/drbg/drbg-0.5.5.ebuild b/dev-haskell/drbg/drbg-0.5.5.ebuild
new file mode 100644
index 000000000000..110377610514
--- /dev/null
+++ b/dev-haskell/drbg/drbg-0.5.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="DRBG"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers"
+HOMEPAGE="http://hackage.haskell.org/package/DRBG"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT=test # fails own tests
+
+RDEPEND=">=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/cipher-aes128-0.6:=[profile?]
+	>=dev-haskell/crypto-api-0.13:=[profile?]
+	>=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?]
+	dev-haskell/entropy:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/parallel:=[profile?]
+	dev-haskell/prettyclass:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/binary
+		dev-haskell/crypto-api-tests
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test test)
+}
diff --git a/dev-haskell/drbg/metadata.xml b/dev-haskell/drbg/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/drbg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/echo/Manifest b/dev-haskell/echo/Manifest
new file mode 100644
index 000000000000..2bb51fce0bfc
--- /dev/null
+++ b/dev-haskell/echo/Manifest
@@ -0,0 +1,3 @@
+DIST echo-0.1.3.tar.gz 5373 BLAKE2B 3710de35b42e39f7ff9d2e5c2e32ae4c1e863f9ae844ada25dbb653aafd6ed261357c3b5046e9e0cabb03dd4de4f6252272a2b643087a61d1df5f26de329e588 SHA512 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f
+EBUILD echo-0.1.3.ebuild 794 BLAKE2B 19ee02277ccf385b1fd97aa1ef74c4c1b2758f36d6fe72c0624ea91003e575b15d56f3a702c653529f7244bea472f75a6681bf6d0679bf11ec8a94d801ea7997 SHA512 7d768f30725201963ec785a9b2d4f7e69c4aa1514ad944b164eef59f80ff815a4d2ae50a22340d1ccc26af50ab40bad048ed608bec35fae1b23c1427ddcfbe74
+MISC metadata.xml 955 BLAKE2B c282b00f86558234927b728f74a97e10aec67e7d3694f113e6ad057e6c64840d7c076f0e8bc7a9b47a1f341808450e090b57a890e3e34a2bcf8d7b4992965d0f SHA512 7272f1a63a881b6677bf7b49eb40c79c4fe1cfe891e7572c2456bf8d6988128c89365f1365524abe2428ab3a62fd2f2944d9509accecadbeb2979a0ba4c289aa
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
new file mode 100644
index 000000000000..628da37e9f37
--- /dev/null
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A cross-platform, cross-console way to handle echoing terminal input"
+HOMEPAGE="https://github.com/RyanGlScott/echo"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'process >= 1.0.1.1 && < 1.5' 'process >= 1.0.1.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/echo/metadata.xml b/dev-haskell/echo/metadata.xml
new file mode 100644
index 000000000000..1ccd56c6a779
--- /dev/null
+++ b/dev-haskell/echo/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The @base@ library exposes the @hGetEcho@ and @hSetEcho@ functions
+		for querying and setting echo status, but unfortunately, neither
+		function works with MinTTY consoles on Windows. This is a serious
+		issue, since @hGetEcho@ and @hSetEcho@ are often used to disable
+		input echoing when a program prompts for a password, so many
+		programs will reveal your password as you type it on MinTTY!
+		
+		This library provides an alternative interface which works
+		with both MinTTY and other consoles. An example is included
+		which demonstrates how one might prompt for a password using
+		this library. To build it, make sure to configure with the
+		@-fexample@ flag.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/ed25519/Manifest b/dev-haskell/ed25519/Manifest
index 5e08ea891b55..9795fd5cd611 100644
--- a/dev-haskell/ed25519/Manifest
+++ b/dev-haskell/ed25519/Manifest
@@ -1,3 +1,3 @@
 DIST ed25519-0.0.5.0.tar.gz 80034 BLAKE2B 4de73a76576bc63a7c5e4e8c0d195d48c65901ad417a306ca0001856a3a37975cfbb527dd466c2a737006e44e8d440e9831c360c8c3063b45a704af79c165cbb SHA512 cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
-EBUILD ed25519-0.0.5.0.ebuild 1095 BLAKE2B 50f17aee2addc7363671e38c3e307e9b92b15307b7a9d840463e33aa5ddbdb53bd7aff96b72424ada21f33977051b4997563b8532bf3634e181f8ad287214824 SHA512 4b15fe8ad56186f77d6b96e3b4a6cda3e672b32efeebce7824395bc762d7758d3f77719c1d390fed50e6a092f753cc486cc2a8cc07a34cf0f139d86c3a3e15f0
+EBUILD ed25519-0.0.5.0.ebuild 1165 BLAKE2B 882b8ce0f63650800aa37c08c1a928de9f558f6c9b9a17470042fa6522d7013d4537184a2abfbd976eba991b406ce05a5f644fa4159b934871b8e4641c317b95 SHA512 c81f0e21a69708bdc45ea128021045121dcf84e658adaa77ffc91c38e6bffa9b13dae2032e80cb36829c4609314354c6fd23c3cfae81495df6611cc0048be528
 MISC metadata.xml 560 BLAKE2B 888f56c8e6e70d64bf97ded8786ceca38897a03f73efdab0bf041f62ff0acd53dbccf3dc6e8918ee69dc3f3201017346c4ae73aefd650b337c0b896079cbc68c SHA512 5f0785f4aafa940650ee52b473d8e89d8656d1db149f314a96018ea52961e210dad93b711025a00f41774b3daab2c6ea483d19ed8e0b8ebd4507dacfce32cc11
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
index 4d24f844aa37..db4d98440236 100644
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ b/dev-haskell/ed25519/ed25519-0.0.5.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=6
@@ -6,7 +6,7 @@ EAPI=6
 # ebuild generated by hackport 0.4.6.9999
 #hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs update
 inherit haskell-cabal
 
 DESCRIPTION="Ed25519 cryptographic signatures"
@@ -18,12 +18,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
+
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.10
-		>=dev-haskell/quickcheck-2.4 )
 "
 
 src_prepare() {
diff --git a/dev-haskell/edit-distance-vector/Manifest b/dev-haskell/edit-distance-vector/Manifest
new file mode 100644
index 000000000000..922b72869aef
--- /dev/null
+++ b/dev-haskell/edit-distance-vector/Manifest
@@ -0,0 +1,3 @@
+DIST edit-distance-vector-1.0.0.4.tar.gz 5819 BLAKE2B 8658c52e64e704dd5c52bae0e63ae0b4d84c88d6cb1e3ecdafb05191dc70e3dfdec34001b2c287ec62703eb7ecdbac9b127b3dd084bc4e484e70cd778d31913f SHA512 8d7ef7c6ca971aec5efc2e90adff2584c1e4f996df3ad4f6111f790fd88fcce1814111eb3a3bbe07d8455b03ade98f11e6343c4746e895be2ba9b82a86a33e6d
+EBUILD edit-distance-vector-1.0.0.4.ebuild 686 BLAKE2B f8335bbe568dcdb9262dbfaad0f19ad9038be59c0c815b203c8501fab1d9450e36e71153e587dbc0723926f49165c8c7d79709973fcffa072d8bfb7fb98c98b5 SHA512 a298e2104eab8ed9cd89267811fd8eb90f1f874420c4a757703da64af0f0007995f1e10d830edc9778995147bef5c4782c6bdcebf6526a55722555472a65dc01
+MISC metadata.xml 715 BLAKE2B f806edd036f5aff0827ab5a5e661b1878a37fd791681d235eaa4dd2ddfac2432cc5544cb0bb91af88b59b01f6c443cfa79ec711cadf9f02732ae17888c8bc17d SHA512 7631013f455be1ab70fcf1a596a3c21c9e807bda921020ce3b073a5a4f97dd9d4c3825d14693f3c118ff684e3694cf72d4258ecec3edc38988ad26d2d5e3359d
diff --git a/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild b/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
new file mode 100644
index 000000000000..e61c98b7c569
--- /dev/null
+++ b/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Calculate edit distances and edit scripts between vectors"
+HOMEPAGE="https://github.com/thsutton/edit-distance-vector"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
diff --git a/dev-haskell/edit-distance-vector/metadata.xml b/dev-haskell/edit-distance-vector/metadata.xml
new file mode 100644
index 000000000000..c2c7c2767205
--- /dev/null
+++ b/dev-haskell/edit-distance-vector/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		An implementation of the Wagner-Fischer dynamic programming algorithm to
+		find the optimal edit script and cost between two sequences.
+		
+		The implementation in this package is specialised to sequences represented
+		with &quot;Data.Vector&quot; but is otherwise agnostic to:
+		
+		* The type of values in the vectors;
+		
+		* The type representing edit operations; and
+		
+		* The type representing the cost of operations.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/either/Manifest b/dev-haskell/either/Manifest
index 6ed36d62d0e3..8a56d6319fea 100644
--- a/dev-haskell/either/Manifest
+++ b/dev-haskell/either/Manifest
@@ -1,7 +1,9 @@
 DIST either-4.3.3.2.tar.gz 8665 BLAKE2B f9308b05458add4afca329c9fd292265096f13d5a09cb9a783c8754b8c1ec3f71c4214aace38ca09bd7a11245ff9a896473981cbfc1e5a9075709de6ec35912d SHA512 35b0825cb34fef8cb673b808110c856d3be4b02a28c52ac59d5b31e34083095e7e72d1ea437e70a43500064f7fdd2baf90ca078729907b975192401c240b19e5
 DIST either-4.4.1.1.tar.gz 9376 BLAKE2B 5fecb832b018349360c62c3a6af2673bd8687ea6c1a652e60dedc392f31a5fa9e16ca1b1414501848eed23b884665ee69a32cdc6e6ab01110d3d6865cf1cdc50 SHA512 ebc61b0f83812c7479a4fe5422ae4b73f219f0d57938e8c43e0f1e8932374c874709453773b7577f98b07ab17c884e8f4f77a28d457291b5d3f988da71fb6195
 DIST either-4.4.1.tar.gz 9243 BLAKE2B c6917248fd2b53ba69ea18669fa1f29c41c202a474b0d86ecf1c0114987d88f28f238b4678405e2c5e84d62b43974abd1481356dd96c756b652c80093c8f9141 SHA512 d61a37fa5cbe9f4ff46ee6b0690405c41b503c30dcf2b06d15961539ee9c4f7e5414dfd7b377b984c4d710f148f43388d60cbdb5b86450f9a97f9b1fb8820bfc
+DIST either-5.0.1.1.tar.gz 10162 BLAKE2B c3489b2957a8c0081cfeecbf5ed247417c0e1f52fdaeaedcc4eb757d31574f17cdcb02a2c1808aa4aeea7a2f8b177f959f58b799039cbcef0b6ec875a620ee06 SHA512 96b23a9d5f1d2d4dd256251c488e06fa0e8642d849cf61c9de2a4089d2cbe86763062e69f83344eba2f75b30992f3e90ec195bd054f8de386c4c6b477a025c01
 EBUILD either-4.3.3.2.ebuild 1419 BLAKE2B 715529a677c6caf3aa4800f1ebffc6bd94827d147dae1de8f7ec62366615cd9f33f34e00071cefae6a606dbdd29b5f84d6831563a9c4bbe1cdb26a3177c6ddb9 SHA512 92d861b76c0c824ac025a0b383f7ef21a3954d6a649f16d74cd98030a01537858e2f6d60ec88e9a40eafb0df7265d994c20d8fc930783b7bbae421e9117477a7
 EBUILD either-4.4.1.1.ebuild 1498 BLAKE2B d17901fdd0d9c11bf03cf74bd453327e06d463669b9e406dc49cb58bad5b27d771ca6b8c4e216016cfb6e3905a53d7a4165ac1138c10369af227423dd6f607f2 SHA512 5cea492c8de9bdd3b0eae82b0b3c53b998844fe5b3338a840e401bae508cd127d50f6c1e995e732d665b52705442a3d7475c942d3bf6a95a9f0f235e3e325d8e
 EBUILD either-4.4.1.ebuild 1500 BLAKE2B ff33f1ee66b5a18443e288fbd9a3dc9b7f2cd5bccc30b5ef74ed96786e0b0acb621c43772edee4dd37ac89df6c690371a8371280f3544068b4ee92a920495dd4 SHA512 ece4591cb38f917323bd47aed1d95c4edf6687c76ba49108206a52e3daf0831cca2ff90bd05aa70b7100ed1ebee752b4d1405336b9bc4c36687c4b4b77fbe915
+EBUILD either-5.0.1.1.ebuild 1163 BLAKE2B b8a0b645620fd8a8fabb74367be8a7e0e31a250abf46c5579cb779a288a74ef6ddfd6a89b68bf4e008cac3515b70e501ea2359a2f059ee0c9933430668d30258 SHA512 7fa7f667b1b19948f3413e7e1e396a264ff162de6777ff9b861c65b17e86e2b19f8223b154f11837e1a086a227a29b8bc86b950dd8b7e3843848f403a4be684a
 MISC metadata.xml 404 BLAKE2B 05a8facada54be9b19c9587ca9ed467975348f81148f4d577b9f3d24ba6300711323456a7b10519879cea2a8ecaab76730ab59bb71c9aeab0101fcdcc0631003 SHA512 7e73c19cd884a2dd7d42b7a5a3e9ab1a14fc6b88524a8814618b9291ec74a9f3946b1294c6219d77753dc72c3ae858083b089524897b827132e2207d2a763c0a
diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1.ebuild
new file mode 100644
index 000000000000..0918386df358
--- /dev/null
+++ b/dev-haskell/either/either-5.0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An either monad transformer"
+HOMEPAGE="https://github.com/ekmett/either/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/emojis/Manifest b/dev-haskell/emojis/Manifest
new file mode 100644
index 000000000000..1d86657ff0fc
--- /dev/null
+++ b/dev-haskell/emojis/Manifest
@@ -0,0 +1,3 @@
+DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
+EBUILD emojis-0.1.ebuild 614 BLAKE2B 391edc17dc9cfe1487a2f76f96a516fa720bd265b8a85ef63f130737e5455d69634ef0db1efd737304673522fc96caf5985fa67c3bb8041f5995ac2ddffd3e30 SHA512 756274e09b39887d7231820ebe7fc756ef76b00df80c9ebea4568d4538197752ebdc6c9e34719f2825f1fcf48db91cc2dd359885a656c791b6b0353a2a4a9f7b
+MISC metadata.xml 747 BLAKE2B 53ed581a964a7bb50aba3acba47f09d10f19bafd91c46ae429bdb0cdc3186d2a20026dc51e0f5ea087f26365eed59e20321ac1c80402926f5f4f6a4c54135f4d SHA512 5a44d4a55cb9be4f8cc2f612e7abefc11d8d5a45c9bb5dc4aa115c5f0d681de080b1d8d4a65b28403ba0d5b058aed0be253ba4de3d31411e61b308c613e9f8e2
diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.ebuild
new file mode 100644
index 000000000000..c070a220f9cc
--- /dev/null
+++ b/dev-haskell/emojis/emojis-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between emoji characters and their names."
+HOMEPAGE="https://github.com/jgm/emojis#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
+"
diff --git a/dev-haskell/emojis/metadata.xml b/dev-haskell/emojis/metadata.xml
new file mode 100644
index 000000000000..9b9c355c0ab3
--- /dev/null
+++ b/dev-haskell/emojis/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides functions for converting
+		emoji names to emoji characters and vice versa.
+		
+		How does it differ from the @emoji@ package?
+		
+		-   It supports a fuller range of emojis, including all those
+		supported by GitHub
+		-   It supports lookup of emoji aliases from emoji
+		-   It uses Text rather than String
+		-   It has a lighter dependency footprint: in particular, it
+		does not require aeson
+		-   It does not require TemplateHaskell
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
index 9c93b8adb0b3..2f8b1d608c64 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -1,5 +1,7 @@
 DIST entropy-0.2.2.4.tar.gz 5107 BLAKE2B 646367fe9c067dae74a132488152ec04f8c3d1e6b58ea900be25c31ca860349a84bd0207723410125e28a84348a5350d986d4c0d3207377a49a09e17797614cb SHA512 257289daadb414ba82d7e18cadfc4e8a654297746984d22a7f202054271f4e19c29d4194cf21b3dadfd06f10d96bc6a29f909d4bd36a98eb18bdae4a13e56b49
 DIST entropy-0.3.7.tar.gz 6498 BLAKE2B 07e73ab051f55b2eebc0b5f3071615869ac447955984dbb8eab45d0fe05401204f4ae7803866ef1952a5bac363c349edb1133fb730557784807978cefee00731 SHA512 920521a35cba9c627ee97daa9675ad1764ac91762800371cc9e491320afeae7994a431ea6938cb7464a0e6affc274a24148c405d7eca2d401d925cc2e2a84f85
+DIST entropy-0.4.1.6.tar.gz 9464 BLAKE2B 484e72ba8b6413b6205db4660f52d183dcd075bce836de6b339e2019d584a90b9f650d6b808b46855c9a423e41f21d814e10026efec050f507edc68106568893 SHA512 201a75efe210be5728a1c94ba9ec62514b96c388b6791d9301b34d2fce0208a9fa4ef25965c7840d052fd6221f15a1bec196a6eb209e6d03c3e1f971161df1b1
 EBUILD entropy-0.2.2.4.ebuild 535 BLAKE2B eab34a54009441a43879bb9fe47a59879d0f306f9c7e7060ce4f0537ac2c9c6c1c7e6552bc1df4c9462b22ed7521ddd92f04b9b8d7efa1a7fa823d1ef1baabe6 SHA512 7032ccc7dc6be90445f73ef59066cf9656dcfe8e0a409e866678379612bc03a1fbdea994960d721d0b822fda6bdee9b02620f1d2713b4aea667fdbfbcba191fe
 EBUILD entropy-0.3.7.ebuild 619 BLAKE2B 0d0b03e0530a5733f5c40e5c3436b5356488d62b39fed7373251773750e29247a26f91e3e662bc4803ef748346f0283e5a924fdf2827f7411839e78e048a3736 SHA512 8e9c5c212a2f14d3d1004c3bc4cc3773dbca0fb065c3a42c4ef58ae3ea5626cb5b50c90047919256dd67432e30af9069be16352caafdafd1cb76b6774b74e476
+EBUILD entropy-0.4.1.6.ebuild 647 BLAKE2B fc4ca236895fbddd9c5a8229fe60f926558d5e4e57a0009877b713bba544e003da306ae3612c3d9a168ad90cd460bde105bdd205895bcfb559ce3130c1ac8edd SHA512 856ef532176c4e9959c70df1486205809d6cf775665bb495f31d437914252924b5d5b5df96d984aba4a2d2ff4188882a27e708ea8b3690a72bc94d3f0f8cb073
 MISC metadata.xml 712 BLAKE2B 5d798b692bf1613cfff18c7044167b83a8706f240b7b95a2e05beb377a5436f0c4815375a0f47fecd26d24c90afd00610377192bc8f5f85874b5aa285f682d41 SHA512 252102b1a14184782b09ed964d7bca68e3500e265109419dba201279b6b9e18be73d651e347fee6a6a550d9506f5517e10a24e5763e68edbbd1c523754f261f0
diff --git a/dev-haskell/entropy/entropy-0.4.1.6.ebuild b/dev-haskell/entropy/entropy-0.4.1.6.ebuild
new file mode 100644
index 000000000000..f7b946c45c95
--- /dev/null
+++ b/dev-haskell/entropy/entropy-0.4.1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A platform independent entropy source"
+HOMEPAGE="https://github.com/TomMD/entropy"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="halvm"
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag halvm halvm)
+}
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
index ba368cd88c31..0be927ddcf60 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1,3 +1,5 @@
 DIST errorcall-eq-instance-0.1.0.tar.gz 1629 BLAKE2B 052a614678a72d1bc5c5b5b71e07a9a51a80247f91256bd247981dda3fb162b7b948104222b4ae43f923feb6ec21035bc73dc0b8405409a3f46e12bcc6648ae5 SHA512 313f3537a927c606aaf9df1078c1da23ea8173f2a06d5c0a834ab6826fd8aea86469ac866bd292d2864afbd228d5b5365929d1c7a09defd3b7f21ac685a4d082
+DIST errorcall-eq-instance-0.3.0.tar.gz 1534 BLAKE2B 6b137de15395742d5c73e1e9f1b06f88109675da701d7d65e40879b844b4ebbe4d8400fec44a12388af3a4ab1dddec30a8365e63eb8f042805ad020a575de325 SHA512 934ee3b3f00d7d32b9aa384a568cfc9c99a3947cb39cdc23495dda21acd0672d6de753b4243f417397738473d091fd14776c21da0dbaa0b40c2b465cde5910a6
 EBUILD errorcall-eq-instance-0.1.0.ebuild 628 BLAKE2B 9791d6cf26b2643041a68e44795a2e89e0573939775f69eb729eb4e1341a36e726ca9b41d2bba235152c1d4953d9333d465037a6c5e3b5e24bad7a112add253f SHA512 888b0e69414b9129f25ac99ef2a04b2ea22b19f013d4fa0a61977a11379c394058d712ab80666fd776fb0052346c50b61e757f9ce734b26b6a012f358620d776
+EBUILD errorcall-eq-instance-0.3.0.ebuild 664 BLAKE2B 4ad535077e2929481a73a8444aede0d8e327d0077706033898a32d74e7599919ac5a0a0e8065ae979d17fd55f9442ca052ad60599640b1ead978ba42dca62107 SHA512 314ec9734be5aef56f7049967fff7669e0a59f6d35bdfa6e3709c32d42e56f139770bd4f913d7a8982f22883ea11321c66b7ab9aa8222444bf79fff5aa3f706f
 MISC metadata.xml 403 BLAKE2B d91f6c24dcbadbd55fc00ce8c51fa9df861b025124d679850dd10e79c9ae8676d2a58c194791743c8c16893be9562674e5e112ea7672b4579d3e2804864205b0 SHA512 2db46308a0fb8d443c6369bb1275709cb975a0900552d0d0752c8bc6e689929d4e666428903aa914129f2cb8f493d379786adbcc38f4813e7b31aebc5cff6277
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
new file mode 100644
index 000000000000..ee0328421c71
--- /dev/null
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An orphan Eq instance for ErrorCall"
+HOMEPAGE="http://hackage.haskell.org/package/errorcall-eq-instance"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-orphans:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.5
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/errors/Manifest b/dev-haskell/errors/Manifest
index e1ca803dc6ad..9f62d0c8d573 100644
--- a/dev-haskell/errors/Manifest
+++ b/dev-haskell/errors/Manifest
@@ -1,5 +1,7 @@
 DIST errors-1.4.7.tar.gz 7922 BLAKE2B 40bd2019f87df2fae5af82fad574375fed6717787fad84c5da74696c827a954e88059db771a06f07de3ab1b99757d26e4b345f030e3b5f9a5814eb531a0cdb42 SHA512 14873d32c744758000c6c8eb954aa659a57d78a32519d88e80e0f5b34a3f528e64293703da950475d89db2f79a7f2c80bc46a8824fee91cf3fe5668bda22a77c
 DIST errors-2.1.3.tar.gz 8559 BLAKE2B cd350d74d7836432dd5a204a4a3f5fe915a050979fe9053be6282f59f2f77c63159544221541b64aea806fcaeabe5f81ea2196347bb9e422c6c1458f13ff9ed3 SHA512 8950d043b883395a69ccab6b655219d035ff3b4a22911a23d54834642cc5c98b5044b7aee170dd004f86b3b8c7e991ceddfeae87ed592e7d5e1cd6e44c4e0144
+DIST errors-2.3.0.tar.gz 9184 BLAKE2B 7a44adaa0dfb5ba623df16b79db469804def23ea8d00ed2b6cbc5995c75b79ef72de095e333428525a1ac5e24cf7bcc81346eb319ad7d343e5d58af2a8449e2c SHA512 dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
 EBUILD errors-1.4.7.ebuild 763 BLAKE2B 4e6254166ce7d2420393760daf3f174326610b8c9fa274b12327167d5b37ffd76ced921275180c3f58fa28fc44d062bee4b38ae7fa899671b1646539ea16e2f8 SHA512 9706d729ae3e1fd3b9a689212d8ee1f43763d6dcbd8f54d45f909ee30ba6a17ec7f25b9bf34372f980e806bbd00cc959c3f844024384430b2bb41e56cb81a429
 EBUILD errors-2.1.3.ebuild 800 BLAKE2B 76a7162befa99c99c61917afef43cbece6e21aaab9197978f01f04a681db1a09ec9f91b1563ced3a78bf20633c124190e8ed2f2eee13054df51ba8bfcda25823 SHA512 96cb90194c510ab82055cb04432a58c55526b4d0792292c9c11c24590ebecddf658db9434a021b7aeb10813f6ce705c670e5c4887f422e88afcb1ab5c2714265
+EBUILD errors-2.3.0.ebuild 825 BLAKE2B b5922fc3a88de44c10946d1924519a5ad6c65eaf8e677946d615860393e56a5f13a70ccaf6fd86ad7c1f2c165a785f5e2f95cc0c45b786f3936f3d66da0975d2 SHA512 becccde46436f61bc74561afd2a37cad003628004eb9492ea7d6285f4c44d085fb25481cf44b8d9e5fb890f2b437dbb72d80f02708db5dd846c1e154ea1e8073
 MISC metadata.xml 502 BLAKE2B 3c097e09a0f3cd40d27ba7bb9484b3dd44b6dcc61147fbc49fb885bcab850810895e0ac0f2a749d2981420d534a2fbfd0e3b89c5a39f7428f644e99bbd58e552 SHA512 6b581bdc7ed765ecdef99407f3b1be3c97d42826f7605c40241fcf9e922a05db13d1cc894b241a6692b83087398ebbb2e73a963c5d53f1b7979b6ef3f5505d1a
diff --git a/dev-haskell/errors/errors-2.3.0.ebuild b/dev-haskell/errors/errors-2.3.0.ebuild
new file mode 100644
index 000000000000..dcf1a2441b49
--- /dev/null
+++ b/dev-haskell/errors/errors-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simplified error-handling"
+HOMEPAGE="http://hackage.haskell.org/package/errors"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	<dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index 445810ae4633..b6e0f402f9fb 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1,8 +1,10 @@
+DIST exceptions-0.10.4.tar.gz 20819 BLAKE2B 16873edfeb540ddf5b950f81772c7d162e3fc37d286dcf6608c4c3017516a4255fb7cad247025aa9b0970508613038a3d0b42eccf22e74a0c4efffdfa22be5d3 SHA512 3df1edb4abab8e2e2dbd7387809d9768efca36c6840225ce33bee8679a4efdcf86d28beafb54a9a40e512163e4d088f94e788341bf614869bbdbd9d701bca4a2
 DIST exceptions-0.3.3.tar.gz 13036 BLAKE2B 021e8c3f40f9ef9a734f8cf0f8491767d4d2c5c1f1b659a089525a346cea7ecb67058f7405d6659361c6d83b76603527dd956e6244843ceeb5b7bd8c6fb0efdd SHA512 3264f78b950a3ea737f577e5ee406bddc1916bf93271ff6e78a477b1575bb105ce0c47324c4f56288a7ef6e7cba398dfb66ea66ee07baf5aaa17012cd6cc4da4
 DIST exceptions-0.6.1.tar.gz 11392 BLAKE2B 6ec2c1b2603da2a33c663996f13b522fad3fd6b8c3683c13c58b07459e03ae67c2cb21cac3114bdc089ba563c9ef8754a187bdbc8a805fa5a041989c7498fde5 SHA512 92413cfa9fccd877303ec4f100c4ac94d3e30df0563600733a940c3a3ee9d4e1e934bd6d09774faed684c8ea9821b8c44cf501cc44fe8c834dd19e2efbed5070
 DIST exceptions-0.8.0.2.tar.gz 12241 BLAKE2B b84c642451fa957cbe23d63b86cee0fdef7977d09dd9bc28f2ba87e81a2e4803dd016951c85ac139b81c584d73893cbdae249504cb6a7457810f3e11f41058ac SHA512 8ed232f97f9d705f694aa9e0261c7920666cb0052d00370883b08fa6f61a97f8b17643512bdda5189760a51b42a9340e153521abafec20d42ffa193f3b0369b3
 DIST exceptions-0.8.2.1.tar.gz 12354 BLAKE2B edff8b7dd4488d4a01fd7d7416106dd130dcd06f86d0a849eda06ab381491c9ba49928d952f46d3af2f77dad14203ed3f401cc258638510b62725186a0ce4380 SHA512 0de9862ea3e71b7511b059c90363856b0ed445bdd6aa24ba39630d31a2cde601ef29f6a8c9f39ef80be7682c6f58a5d74d17552a8f64d544fa67aef6017f254f
 DIST exceptions-0.8.3.tar.gz 12986 BLAKE2B 31ae066b5bc71a01c3542495d5ba1efe379c9d8ea170b5175c94a822c90f859fe5519e1c4747327bea19ebe4fa2e16953546b7208f3ea21e231849ae44ed676d SHA512 1b650d979e27c3307a7b58ea09fe19bfd97a35fb75aa526237cfe4fe68c99560794dc8985b601da1fc6cefb8358c76f60df822b709c621172785343233cee89a
+EBUILD exceptions-0.10.4.ebuild 1334 BLAKE2B 4ec0055705d4dc357e068d5e2feb0e32a5ff5cbbe0272f015ce1156824fb11ada419d20c2197e9d06b1ae8a9acf455aea4cbfe8d64463c257e378fc863757277 SHA512 395a9ee406735c31c11891dd44c311535472369cd03c5aff25180ee3359deecd5f3f56ac7109753319805a7fb89497a5d87b6ac5d7aebea8795f44d1299c9c26
 EBUILD exceptions-0.3.3.ebuild 941 BLAKE2B 140b530c1af17445a21011d657e54a66c6dba13337526f000b37fa021aee0d27655fa578cc07320f661e478899876828d316e0b2cfd6b01732b994dc5f8f7e4e SHA512 9f664d7066fc0e02007a465436e59f5c6ee25b5fa797da1deb85733183c8bdcf315e5804b62357fb9a1400e6c79233d4b4326abb08e97777a228ed67df3a808e
 EBUILD exceptions-0.6.1.ebuild 939 BLAKE2B 8863513f8bc6237426d4ee7dd3f8307e446fb6c1527ec02071d6bf42bac323fad5bea1e269b9b0a35d041818b7c3ca58622094aa738b5dcbc4bc1e21852d239a SHA512 75b8b150c8e3a449a507cce45c7d31fad6a6f009343abbf00078fd2a92e436f289e35315f331b040839508ef05638777d6587c804913b04d4b4052d490336aec
 EBUILD exceptions-0.8.0.2.ebuild 1192 BLAKE2B edd15d28345e95eabe2e8fc6f24e83379b8a0e7502db201137446658ae2cc033e22ff483c3cb98c2435e50b5395b9ad8a48e43c36ccaef39076adc473f96075b SHA512 a3ef705c47ab158475159ab143b3c164246c7e06ffb02badacd88c735f8d46debab881174101b4b864fc1ef02e630ccfaff07cb6f6dbc0c1258cf044c4134612
diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
new file mode 100644
index 000000000000..073b42171f4b
--- /dev/null
+++ b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extensible optionally-pure exceptions"
+HOMEPAGE="https://github.com/ekmett/exceptions/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.10.1"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck                 >= 2.5      && < 2.14' 'QuickCheck                 >= 2.5'
+}
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index eb09136cece4..f1337aa700fd 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -3,8 +3,10 @@ DIST extra-1.3.1.tar.gz 30439 BLAKE2B d1a550e8e09376490c25497ace158418679a971e3d
 DIST extra-1.4.10.tar.gz 34981 BLAKE2B e1601f3d6f782a3b0138fa47929afb2bd2fef74305c4e6f8d41aea9eb12c00975da9a3edb200f4ff4e613c049f08239c993ebc11eca600992d831ed54a59058d SHA512 16b7bbe3944d7013a54dfe629f997bb46a24c9b933a6be9570cd86f6b1bace9c001acb0b5b8d92ddf50aa21ca67d5694d3705029116644012345d20f1e3386fd
 DIST extra-1.4.2.tar.gz 31311 BLAKE2B 4039e3c0ca573d782a4bc6db2d892d22ffcc5e012e752f065c9f98d6e580a5b43e772e49345681bb9a31ef9679295d459aceadbca9bf79b4f496b8a1a7b08e8e SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409
 DIST extra-1.5.1.tar.gz 35989 BLAKE2B 637533fd0b175892c58b341d5dc8c3d97a28291a638f2cc185a7338077d2f6ced21a1efe0859ee8f4e9fa1636c3f8ef4423c83a0a683a9accd25efd70cafdac9 SHA512 c3a0d7abc589e4a175c5c090b4a850751b0f231a3934db3bb87f4a11044acfcb161aa366789b3c6b5415778578ca126c3469f648fa326fa5ebec0889c59005e8
+DIST extra-1.7.4.tar.gz 42476 BLAKE2B e27eb047546b5fa378916d6c65daea2e40c313a49afb7c78d935b27dc693fbba1e7b82c54d2cc6387eb6808dfef0de51b6b6768e2e91b93d590409a32d308569 SHA512 3161834ea25d3b485432dcab9f4a385a2552fa8d69b5ec198152b3dca08f6ac0ffd42a467e69210c2a1ac5bef7f1c6ff15c61459cb447c125ee240563a748d15
 EBUILD extra-1.3.1.ebuild 642 BLAKE2B 7713cfbc608082f1d97dc747b62c7ca3100f888d52a0b21bca24f6190213bda2800919bda39ae0db258cce035d7bf519c839b99a0f383fd41db6e0fd069bc924 SHA512 bca675453a2695c6590ff13f27924a0ca109aa95d7d1b555110bd7729ab8c07ad301593bf4f1a6ceae5a9a8683265788f6102f4145c77006156d989600bf8638
 EBUILD extra-1.4.10.ebuild 614 BLAKE2B bc93a77c5815439594e5bfdafb43fa0a6009ed70223ccd71c58759af7235cd341f23a2d947bf8f35e1a4c4c7097572c9b68fd1b6d5b1e2e26d4251fcc3f1fca1 SHA512 a6fe5dac82744aa28888bbeb18a538728371148bf1ba57eef88ed18930ca098474b247554b86eb14e11379abf63cde1f6b26a163762aab6f64599deeff230ec2
 EBUILD extra-1.4.2.ebuild 637 BLAKE2B a5072e3f78ffc7624b6206235a016843c1c3caa21913b4a67aaa95bc53649ac341373a32557cab3b19cd284ab303701a7ca6a87ba1585b3e20fe2cefbe4afd18 SHA512 64c6b133aca2d7eed1cc68cf723e161f54587d673442ea752da116edce8b1ab9b18425ae675b9b4be0185dbdcdbcc2a486764e6bd30cde0f3200dbb1266570c1
 EBUILD extra-1.5.1.ebuild 616 BLAKE2B 80541aeb7d492e8e890b16305168438539021c73ecd12a28a581d98f41749b6bf5b1e06410f44db22fe5360120fe659137e2b478472efaf56e814143565fc8ad SHA512 b8bdec9038c989984f8668f02ba4c29297ed6ed8f01f4fa5bb03d00580e4a70158ccc74307c0c0e1c0e4dcb21ecd981f1a5d4e89817249e2892375e2bc4e7247
+EBUILD extra-1.7.4.ebuild 665 BLAKE2B 20c4301a2b1ca1728bd2808e8503ef7436cdd6eecb198836499eab6a345fb3b3d22355a5ed784eb67213859cf57f2a7cf1211a3b65c61f8edc05bc6af804ea60 SHA512 e970136619dc538961b8afe0ec354579e18073bed68aa93a34fb4e77c594c77f37b4d4bbab9bd24069cae73877e6577ed1f50be8ce9f5abcf3cfc56a3b72cfd4
 MISC metadata.xml 330 BLAKE2B 02bc69029c346d132aca400cfbc70f13d9bffaa36fcafd9c01a7f8213c27623b9fc19ae9c9a8c75ca898c5a251d5f5189239f16b805316a2edb32f7eef5424b4 SHA512 67832d58fae9b3c4ad5d3943f35135a20f2d26af7debff66857e36316ed9e697f5cfb285d2e67da2422c626dcac38c8bfbf1e1320237ead4cfb10514a6d1df4c
diff --git a/dev-haskell/extra/extra-1.7.4.ebuild b/dev-haskell/extra/extra-1.7.4.ebuild
new file mode 100644
index 000000000000..fdfa34438d33
--- /dev/null
+++ b/dev-haskell/extra/extra-1.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/quickcheck-2.10
+		>=dev-haskell/quickcheck-instances-0.3.17 )
+"
diff --git a/dev-haskell/fail/Manifest b/dev-haskell/fail/Manifest
index 20753aa968af..b43456300121 100644
--- a/dev-haskell/fail/Manifest
+++ b/dev-haskell/fail/Manifest
@@ -1,3 +1,3 @@
 DIST fail-4.9.0.0.tar.gz 2416 BLAKE2B cad36efcb3b93245dd3f90643694d85e6797fce5ee1866c6e8691d9b2845774846b99a7436f854c26daec985f07a9700fe4b2c1a467f2d33bd8a8fa0e6d3058b SHA512 0b4e6111387768482ff10b8ee55ff0b3b04750d8def057b7935bef814902de4536d0825e18b95a342722735b29cf88aafec21eb3b2a75eb4f0c55aa7c6b80108
-EBUILD fail-4.9.0.0.ebuild 617 BLAKE2B 797e35181887041384db364f7dbbddd53c499a0d98b526a9586a00a4fa8dbbee31272c3af91cf2d3caf91e9a603b63f7af52247ccd4d4e5f1612946443f53d3e SHA512 470af6b6b670f266428dc12538f77035d06def7981389634bbf3bb608bdd36dc1ac8fd61372c0f4571b300149e141bf507d1f4be0f6b8ca17428095943a358bb
+EBUILD fail-4.9.0.0.ebuild 713 BLAKE2B 9395f4b2518bb0828d12cbdf7aadaf9e00c99c500e494eba143f9d1ce97728bb276984d86203234fae19a32e4479e4a809019cc063b452f1f45b4c00efcaf4a0 SHA512 81fc381641162ebad33ffa98e1520ad7e38df863aabe5b660362385077ccbb26ef24b025c56758393ea2dff4088c88195025291a2fccf78b256d92a5da9ad27e
 MISC metadata.xml 802 BLAKE2B 3233af197b69239c6cec5f3711c9b6ef976fc3a71251298515866d786afb360c02bed95e4d0b614828f91b2fce9ae496c72072423468fba2453f898c95f7f141 SHA512 45b162d2aafda8927d5fd066b5db9340830998aae3093717910e5d39863c329060741e7318312c5f26c0115dd0b583fe77c89a82eca7ad15ac54013be29835c4
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index 01c2904253c0..f5bb54330f1d 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.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
@@ -6,6 +6,9 @@ EAPI=5
 # ebuild generated by hackport 0.4.7.9999
 
 CABAL_FEATURES="lib profile" # ghc-8 already provides module; haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
 inherit haskell-cabal
 
 DESCRIPTION="Forward-compatible MonadFail class"
@@ -19,6 +22,4 @@ IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
+DEPEND="${RDEPEND}"
diff --git a/dev-haskell/fast-logger/Manifest b/dev-haskell/fast-logger/Manifest
index 78a8febc3260..fcfd09ef4508 100644
--- a/dev-haskell/fast-logger/Manifest
+++ b/dev-haskell/fast-logger/Manifest
@@ -1,5 +1,7 @@
 DIST fast-logger-2.4.6.tar.gz 9039 BLAKE2B 47923e51c30074bb35194a26c03d2f013f8c5b5b83c0424075dce6575064d0f705f6d71c691b3fd7d7c91d67bf4ea38f6e4056f5f60894c153bd6daff36e0a70 SHA512 724498a0ec9c0774f1be31f36819594e8393eac6667d922a92157ef4725381420095d9fed7bdb1791e0959e800710aa877055847312013249399ccbb9778e283
 DIST fast-logger-2.4.7.tar.gz 9321 BLAKE2B b2f2bb94df6dbed2d9642f15208a46496eb4c6c1a1f82ad27079d8c89768ea5ae4138e8e6727e730efecabb85818dab5907f76c02394fe27118ac1291fd9a144 SHA512 9f9154fb1c9e941ac43bf3064aeebc3b2a845a1eca3d1a62b77f02fd0a9327a459e3a870803c0f1a292294f7e4d7f77b8a9b5a3182873e77e169bd517025dfc4
+DIST fast-logger-3.0.1.tar.gz 11700 BLAKE2B 8544f6c131822b39c2583c02554de4ca5cd08865e8f963406d035257eb59bbc27867b70282d5c3cef385873a7b6e7bf88d4baeb1edf77055752704fdf422cc44 SHA512 e646840b50496e86c24753267e0c0c7b0ff3a619032f69881d63e19c17394d2c5b248cb6b7f752100b253f58d7f493aac9ac77a754736474fbd83fe95ab9f6fd
 EBUILD fast-logger-2.4.6.ebuild 773 BLAKE2B fd6a7551b24d82d4a7c0a94b28a72ab1e71be18de191008f7717491bc9d07e4337cfc3b1132b6ce09277060ec6141334a5d3128adb21e522c522e0c7380bbaaf SHA512 ffc4d794b33c4a16926131a9a50799d18174c62730f13d7ac8fed998644bbe7c9caaad4adb854d32dd046f4dead3a497f3d24f6bc7a40987526df6230fb7244e
 EBUILD fast-logger-2.4.7.ebuild 765 BLAKE2B 391f45f56547f70cbbfee731fc8adeaf5ac2a4a89486abc581879e7732a9cfdd93684d73fb96562634831b41ef948a9d365321f2c1e7b2798ca0c8cb23f61f80 SHA512 fd9ccc3af56a6260f645156423c5a004bf37d9647a41a6426b1efb2333fe814f5b8be0ffb36312138eb38b5c6c0fa12802b228a10aae1f5e65f50d8e4f63a553
+EBUILD fast-logger-3.0.1.ebuild 760 BLAKE2B e1aa9b74196c0d97b19eb026386bebb366229cc1ce044b8cc63d2d169428e4de3d28fe7bb0643d15a7586e386576251c779b09397dea4225f0d63d7436646d66 SHA512 bbba2caa392fa59b4a04afa7f19a6f119061617b09746a211930326f72b588be645d8f2f508c83bce00627de2d171b1591f65c61acc43bc415e60dadd38b2e98
 MISC metadata.xml 397 BLAKE2B e084281d8153eff9bdc5bfd0427face68a634b98eeeed38ad3109123a3dc8f282c066cbddfeb072383b722ad77114de9688690308f59858f025da927129ef6b0 SHA512 33dd8b48f8f93d25e30e8f616744515dd4030d2fa1e47f932611866f634b39bcce1eaedfec7db4cd4419b28b2ef13aca32c5f054eafe8db1986c242df510bf05
diff --git a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
new file mode 100644
index 000000000000..511958b15561
--- /dev/null
+++ b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast logging system"
+HOMEPAGE="https://github.com/kazu-yamamoto/logger"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
+	>=dev-haskell/easy-file-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	>=dev-haskell/unix-time-0.4.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 521cdc7e4e8b..f94680384f89 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1,3 +1,5 @@
 DIST feed-0.3.11.1.tar.gz 101392 BLAKE2B 3a208015edf06255359d7ed2c05191fd01383f35c2d1611176b4ac3c180cb0f9843c0494259d3bc338421cb437028d2fc73a3e1d283486931eb0edbcf381a18c SHA512 29c310c4d206c4a6088c3fcc242faccfa57f8337ecd54b5eee30f892acacadd519d65c66e490b55bd91d0e9a39540ae77a2ed10e8e260e6de750a44ed9132ffc
+DIST feed-1.3.0.1.tar.gz 107230 BLAKE2B 5ed36f28c63e2af4669a37cac0715891b96d37570dfa99404df5764ad1e5b4e512d3d1a54e263c838875cc4a29ce00b3a022b3a2647983cbda4011ba5accd855 SHA512 73662018affac036bcd3c48a8a5b6fcd4e752231d805c12e977c6097a47691c2eca07eb8d6e6840a592bf35892b4b4ec44fb1f73f8a14ecb47fc6904b406f767
 EBUILD feed-0.3.11.1.ebuild 1228 BLAKE2B a273d3b66bee4a82cce34b9413bdd2bb339699b9b87a98e5560f10243f5b02a5e927371778c47051ddeb4c35cdaf84533c745dd19e4b31468593cd1ccc2401ff SHA512 74f7b019118d3b24e1f35779626423a8f362e3b0a431c570a81d07555a2ae345c08b40f8a2227b0a219e1e3b907cd44b953d37b6474b0a5b94c9d07291f1ac6f
+EBUILD feed-1.3.0.1.ebuild 1395 BLAKE2B 7dbb10b7b864964dbece48029e1f9bbad8693804b002c73bf2d8dbc76c57fef88bee3fd082a329a2ee33d5118403ae19884c1051cd160cbbb34aad89ca63dfae SHA512 51f5e4dd76b61bf6a86e06a243cd2dcf873526fc8738383a7a846b43fbf04eb80685078da1e182508f10f383e19a09adeb12511d3c9d5f065a11e557ef20cf25
 MISC metadata.xml 417 BLAKE2B a23c62c688b3cb75a784096f85482aae555984209c8991e9c49ff072180f78c54ad037c44fa5358c2a933f9694debf42405f9f0a1029a2ffd042c4b027c3f29f SHA512 fc48f0f9cb5ad4a47fe86e32d4fefc32d09d766054c23fb8321fa82b777116b2a9459e7d5cb723bbcfd497264f2db13c958ac23fece523f1e2ed79f50a9565c7
diff --git a/dev-haskell/feed/feed-1.3.0.1.ebuild b/dev-haskell/feed/feed-1.3.0.1.ebuild
new file mode 100644
index 000000000000..909b96ff32b8
--- /dev/null
+++ b/dev-haskell/feed/feed-1.3.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # markdown-unlit fals to generate a test: "test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/bergmark/feed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # ghc: could not execute: markdown-unlit
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	<dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	<dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4 && < 4.14' 'base >= 4'
+}
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index c32ff6d8edc5..d96f522f1cb8 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -2,8 +2,10 @@ DIST fgl-5.4.2.4.tar.gz 36574 BLAKE2B 16d12bd889198e54f0950706351873f4f2a47fd5be
 DIST fgl-5.5.0.1.tar.gz 35963 BLAKE2B bcc8864184d7020405d918c626734bee636a01713b1471bfe01737d5fb991bc26d8c1be04ce969ec53814f00ae25fddae0fb4d71dfe2613e6a51623d38ae5d51 SHA512 0f2b5224e36291ca044bce512b04e1a87e30f8d79ae76bf4f4725d15b26079521c012085125c92ea3133da5d6318595245d4b321669e772f88cabbc90b4a468a
 DIST fgl-5.5.2.3.tar.gz 52223 BLAKE2B 63c5eecab0f8748516c182721f97c8b3cda3387c387f55331807a02345d19e637a39e538ca865122e54e5fe00b713d0e446e16d388481195900e4c36df97cb51 SHA512 4e092048256704e852f13f59046313df83cd00f37c5c32daf69ef13d1ab680296cdcd2b793cbf7383225ecb3caa5c5a1e6110c467d67276eaea6041942856a33
 DIST fgl-5.5.3.0.tar.gz 52923 BLAKE2B 7d35433acdbb967ed7504f3f69ada0fa6913655335e55d8cbf53866e318de2e07dffbec61c20007d7223560f212038b0cc55d8012a44c164f1da7e8890984b6e SHA512 a7f5e4cb9d9cbd6f3063780fb03cf8abbb3311c22848a8eb377238113e55ebf92ddd283326128baabce38faca311ceb270bc1d55dbaf708a935c5e96ceb2df9e
+DIST fgl-5.7.0.2.tar.gz 56399 BLAKE2B 0972a1db67f1e1e4910afc6d2cdd974715647ca0e3e0d8bbb1d2ac4bcf36afe9a4d36033c0bc2246d8bc87c5795494776173878e9c17f479f702722fc0fdf9f7 SHA512 a259cd9abe236cfec892d520b27e293293071ce1b435055cd009087d7d1fc2a87b71306e362020d3e8f6460c538da4e686c6b08b13361fc07c1e978b49a775fd
 EBUILD fgl-5.4.2.4-r1.ebuild 595 BLAKE2B 280761c27402d8c9c761666f91b8679242348bda9cef6e2dad847e1ede79c16eae065330fe83edd0046321aeec37d7fae41ed41720a38a2fd49702479b34e98a SHA512 f4891d6ac8b99229fdf4f02876209b45ea0de94f2dfac24ec3867d3fc6d5501dda7ed6b8db9ee60a11e3d2e9bf55e3469a4f11184363e11b65732ded5adf28e4
 EBUILD fgl-5.5.0.1.ebuild 592 BLAKE2B c4953a30237c8e71d45ccdddabd1bdf69310d6b4200a5e63a44e2ed6a46b2ebcb0494714bdedab6b7ca0c74f9fc6577dd1dfa1aceb92626bdad2fcdb7a6f6faf SHA512 6f3057d730204a579076460ae51a81e92037e415db74c20291b6b2c9321c240a514a22c986a5e61b10d1c82146d3b7bb29ae61c151ab8972efd8cd9569b69b57
 EBUILD fgl-5.5.2.3.ebuild 709 BLAKE2B 881152953b5700297d1b851680143b5c49ad09164e0b32102265e61dbfea4ef10535f067a289134df862da6e2a7fc0cc3b304571acb7ca4f6b93d2e1443293a5 SHA512 23d8793b706db41d3c1a9a62114ae44c86339dd18622f8ed1064a44a42e394208514677a791a7e685d7d6b7c1dfa69147e8e41f200b7332f559e4c26b00489ad
 EBUILD fgl-5.5.3.0.ebuild 732 BLAKE2B 8326b8a420690bc6d62bd70da5cd134f253a290f97c01008521b3f4ab1ede7493e06a6932bf9785181bbbefc431e8306b4a7f0e393f7044b395e35fdd77e320d SHA512 218405485d3f4126ebdef3c1f38bbb00a885864bf4d2fc6ed4daa274fda8c01e943abefcdf79426eadff446fba25408c2e31163ed498ccd5f79da525a5614aaa
+EBUILD fgl-5.7.0.2.ebuild 675 BLAKE2B e43438881e3ebd1817f9d5729a30b899ec20b7224f0d9e51de8634331d2395eefe4238fbd9bd4edfab43969f1b538b9af3e2d81e44977b17b1312d1be29367d0 SHA512 cbc334f754beccc4a25c665c820e0884b854c7375f7b82c244632faa9cc0cc3caf063270a409c6c0917b768f310709e3e62493a9b418981e3d4502cd265f5051
 MISC metadata.xml 330 BLAKE2B 8f25b35230273f76d6c2dde245293cf8a1ce77d924ea68058d85e0a6afc15c016877c3b3d3abd4653620719e78f26e214a7232e5b64e4e3a49bd1b42392a9846 SHA512 1520b8d184e9a17712ebd3417fceb326f6e974baebc7e1c96fe8b253b825086b6a022fd537a7a229823d935714347498a50ccb677034e6af3a80f05da3dd44c3
diff --git a/dev-haskell/fgl/fgl-5.7.0.2.ebuild b/dev-haskell/fgl/fgl-5.7.0.2.ebuild
new file mode 100644
index 000000000000..c257fc18b490
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.7.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="http://hackage.haskell.org/package/fgl"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
+"
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index fad6a4d88abb..bfd307cf0335 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1,8 +1,10 @@
 DIST file-embed-0.0.10.tar.gz 6247 BLAKE2B b8ab7590d0ac8ad9539b07732b589053a98b4ef87feaf2fc816ea81a2b87a9a41bcac9ef44d7180dcec52ea3a266eca7ba01236b3c5699c77685a9119582ba00 SHA512 aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111
+DIST file-embed-0.0.11.2.tar.gz 6493 BLAKE2B 5e24d8a46fc40619943086fc9f5b211b35c19862a9346cffda4d4afd7c63f273127ca5dc652d40169438ccbef38f45abd77a394575f13aba023f18adc7746620 SHA512 48ea61d41d1f0ac855a446c64830b15904f2a696c16a0abec4407d6f74b61d333ed4854d3c75c2402c7a834704c063793a6660ef4e4fdd0ce9195492a34f8361
 DIST file-embed-0.0.11.tar.gz 6469 BLAKE2B c1d8071b765c8709435f86b9985feccf2e46f3bfefb25a73cb7032e2a059a0a3fd0b405a0a552de89923b9f8331a045476fb472da9504c24d5f27310a7fd23c3 SHA512 2c6ac6bdf951706a6d2cfe317bb6c50e3fb166acd746ff9af0420212bfc8f298cf4dea08b2e38cb4615b98cbc15954e1b7d46918970234e4ab91012e34bf7b41
 DIST file-embed-0.0.7.tar.gz 4283 BLAKE2B 54b6eb380f2894838e05b0c08a29f9092077d73284632c8b1daa211b08dc8a183fae329c0f5bb66741a6018a9b87f65efd6fcf3868afab5616a230f3024f9e8b SHA512 ae87b0df303261d7a36d1388c7d92f021e36e58feece5f9a12d55fbc16a74aa0553fda2bbaaf34e819108d39655997a44d8b473b48de1b410b00a993de439b26
 DIST file-embed-0.0.9.tar.gz 5624 BLAKE2B a67eec3f43e6c89ec97a4b68295e5da376536fc0565fa55a6db47ab4b6534f0a95bef31b26873fea9bd62dd85891b0409f4588ac5dc1bee066c9f132f6ba96e9 SHA512 897ebcf06eaf6e5ba0c08763adf5f5c47321599cac884e856bac21c178b9116bb3117bab89bb5a1ed2369711a8998c37c2daaf6f7555c403c55c09c5204ce1f7
 EBUILD file-embed-0.0.10.ebuild 565 BLAKE2B 800f1a09b39e87981213122c560887d713d25f87d2667d6e34f1b76577a686ec541f66acd7a9d73669bffbc81da9941b4b4576c5150c68afef29eb1be577f110 SHA512 0cd27a0967ee437e7421f9afb71937aabfec29e942e94f1d64044f257bfe8f7aa69c4dce42af31c2ad7ccc6f82de871e7a7f71c746d8dd3067518986628e954c
+EBUILD file-embed-0.0.11.2.ebuild 565 BLAKE2B 1efe9b11dd23ae41389ca822565df74c63c01f6cd1a0ba44429b3abd3913cc432664cb0b1640171ffa770b056b76d340843ac6f990e5f06ca4f6eb355834dff2 SHA512 f6925b8bf8fba21655c5d78010b583ef7563a7a747d59ae4433ad606ddf9f9820ecf4f0863a7867d90305846b4399d0203ac370e4ddf9bc28cf519cfc348840e
 EBUILD file-embed-0.0.11.ebuild 560 BLAKE2B 19a2d037657e1c389ebfcc463f592db35a3cdcfd79d3542d641669831866573a91b1b8e04b29e91144b79c03452d71d3b0f64e3092dc3168da872b187a7289d0 SHA512 6bc990d8e68c55e538d424b7a16175ad1b061b2633804e14394520814e0fb05ffe37b30660f0e6704c1b838b9e8a84489e08540c459b160cd96308e3d1f71d99
 EBUILD file-embed-0.0.7.ebuild 592 BLAKE2B 0973f436e672355d9e00d93d909bf23ffd7021816fce987cf907fc8378f9d0e9df5d7b5951cc1eedcaf53b5e6cb5059746c8741c68d0a3cf5eefa8c47258ab2f SHA512 39ca98995082400969ed1e34909941fbe0733888c5dfccc8ad5967b697bec664bf6ecefeacd544b17ece5a8fc9734b2c0e378ec15ef0660d837948c7801690e7
 EBUILD file-embed-0.0.9.ebuild 594 BLAKE2B 532d7fac2ef740b3eee0bae3e1db77c7b9175ac61202b9a22a0f91e90fd5e2acedfa65fce30acb2c15c4f37cdcdd5c035814bc35913d1d2674e29c599f00f365 SHA512 bdb568663ab4eeffa43fb190f2b99454938203b2a1382bcb625cbecfae0051316308aea17e5284616448d6908a097b7e5597816fc30218688f57d9a129150481
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
new file mode 100644
index 000000000000..f225d60cb20a
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use Template Haskell to embed file contents directly"
+HOMEPAGE="https://github.com/snoyberg/file-embed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+"
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
index 0fdd2a5c24b8..37fd30903fc4 100644
--- a/dev-haskell/filelock/Manifest
+++ b/dev-haskell/filelock/Manifest
@@ -1,5 +1,7 @@
 DIST filelock-0.1.0.1.tar.gz 5884 BLAKE2B 27596191c70ca71f11fdcd3bd66362d51407774dcda2e9f31220981af5e259edbf7cac8db87fb7899741c937caf240e7e1af210f569b33600c3407956c1fa975 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97
 DIST filelock-0.1.1.3.tar.gz 7187 BLAKE2B d56f23a9e590417a70586c934de4f189696e61f24799992124cd24bee10091e789e4c393bbc7ea96873d6704eadcb205aa14846e54dd6c30fcc4ce99c64f3e9f SHA512 2fc95f33311d43501daaed8472cffd198a0b9146325a9cfded5952c9a43b550fab6e89b722c2453034ee233480778bf2af9fb6089f111d168ebec1ececbaa895
+DIST filelock-0.1.1.4.tar.gz 7216 BLAKE2B d99e5e0899e94d683f8cbe9919b40ca85d3f840a766bba2d3d8d1f8dff31595b2d012840fcf3d693708c661f8445780f6258d5b24b6b3333265364f81954154b SHA512 ff1d87f6c8bb7dc63b63b7d85dfc007285a74fa47b4bcbaa8783a05482a0a8964ab631fdda5bb177eeed1a89f9687eb19014bc7ef20e99f1daf227e1061152ed
 EBUILD filelock-0.1.0.1.ebuild 571 BLAKE2B 0116129ebb2b8cd623fa97d38d1aba6bb4881ea5533727a92b11d7d841aef3d94e90d393e91b1d03ab6f5f108b60f7dab843ec4c7e0ebea31647d27f498ea9a0 SHA512 dc16dabfaf7989af19f667dbdb5d794f0d6c5bc7ac03955cf8ffe8a7d91344d703fd2a173823a3a01b2d1c1188e8863e96408533887acf3851b8e1f03d5c4a49
 EBUILD filelock-0.1.1.3.ebuild 609 BLAKE2B 11e69426b6824e62cbf6ec3d15813cac33a5ecfe9122ae328991eb8196f038b86ebcf49e4b0dcf15889e9ef8731f9453e48d8d5a34820397e834259cc6747b3a SHA512 b3aca77bc3100bf007d9410b7c267cd011fba082bba0be8f9930faad48fe8271ac9a0c83e6772cb2e21d2c9c1c9f2af95d992a1ef6f1a509fbf2cbca07d7e48d
+EBUILD filelock-0.1.1.4.ebuild 606 BLAKE2B a4b77d6725949e3f4c412364e2239f46acbd4cb7c39c3879b2d364e786346f0cea05cc1d425bacd43ff496b58b60ff7a558bc3a57eb640d0ac8fb83418d7a218 SHA512 fa6abdd949b049335a31313bb53c2da245d2ccf4366d2774e036970923ae2883fdebfb4697450331562238f77bf258657cb45c94500e02e068c072e64b085b4a
 MISC metadata.xml 377 BLAKE2B 752a7f7145365ceb57f3e07d726843acf7d62a476af56bfde35138c63e79171aa8d4b0af5209d28c69d13e2d8e597d80137e44218f72615f8d495b2cb615da02 SHA512 82aa6e68e477c7332df560e453c6ca40d97872f0dfe1bc29a28c00df29aed3b1c9329fbd6c40b009318e1675d23f2eadbc84b9fc5434044dc99605bf520e4b60
diff --git a/dev-haskell/filelock/filelock-0.1.1.4.ebuild b/dev-haskell/filelock/filelock-0.1.1.4.ebuild
new file mode 100644
index 000000000000..43c345b675f7
--- /dev/null
+++ b/dev-haskell/filelock/filelock-0.1.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
+HOMEPAGE="https://github.com/takano-akio/filelock"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14.0
+	test? ( dev-haskell/async )
+"
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
new file mode 100644
index 000000000000..1308d8e06c56
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -0,0 +1,3 @@
+DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
+EBUILD filepath-bytestring-1.4.2.1.6.ebuild 660 BLAKE2B 55f04f12cc8e31a18483aa1afd3a2d5a1b12bc632ce24076928f6364cb9449fceb371b67aabe223d861b9d6111f9246cab12497bfffeef603aaa20db93b4f878 SHA512 2dd5b0d500ccdcdd83a5a3b33a7e54293b68a960b629b492481f63ab6f4059cf7b734a4cbad3f531db3a6ef850a0f37a28905f9f69bb5d692a09729c7d061695
+MISC metadata.xml 1044 BLAKE2B e6b1abdbd4e39ed61665d4bc99c3bb9d5416dc683a4aba0fec22271d3600574a6fef11efd84aedd624a50ea4be539f93b131598d2e6011d3ccfb9606c6d53703 SHA512 ff1d28f9296a70667be705e2614d220c15c53c003734b951e932b3060308f0482456956aef29f2209c3863ef79e69b97029d16dfb38d9f23b316c7491c972eef
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
new file mode 100644
index 000000000000..10c2718e0edf
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
+HOMEPAGE="http://hackage.haskell.org/package/filepath-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 )
+"
diff --git a/dev-haskell/filepath-bytestring/metadata.xml b/dev-haskell/filepath-bytestring/metadata.xml
new file mode 100644
index 000000000000..89c5eda9bf27
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides functionality for manipulating @RawFilePath@
+		values. It can be used as a drop in replacement for the filepath library
+		to get the benefits of using ByteStrings. It provides three modules:
+		
+		* &quot;System.FilePath.Posix.ByteString&quot; manipulates POSIX\/Linux style @RawFilePath@ values (with @\/@ as the path separator).
+		
+		* &quot;System.FilePath.Windows.ByteString&quot; manipulates Windows style @RawFilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
+		
+		* &quot;System.FilePath.ByteString&quot; is an alias for the module appropriate to your platform.
+		
+		All three modules provide the same API, and the same documentation (calling out differences in the different variants).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index c6076437abab..42a5d038cf58 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,7 +1,9 @@
 DIST foldl-1.0.7.tar.gz 8533 BLAKE2B 2467457cc4d54e5f4061b902ce2a8ee766038278b17b9d10b2c1d0c647e5bbc366ba409e8593267084580bed51651de5c5bf1e288c49b4ce43b37e41a51ac878 SHA512 b2dd75560b48430be67ba11503b7f639739ba83e340a93df37a04f729d42e4fb06c46bb7fc878855737848de67e40988a184d78ff4500ac8d21890ccc112b033
 DIST foldl-1.1.3.tar.gz 10640 BLAKE2B b805d112d34bb1cbc18f530c7ea5f080eb139137e819b981bcd8078de4708838d506bb156fafa6789ea4d8722ea96ff1fbf51e514f190e76f9662631f3670ce6 SHA512 a833e9a81f154337ef17dd746dc46175dc8d4862ca4e945dd994004e3891497787df6b6e74a48372e43ca59c1c69b1d2d32a91e2d3ae27673975dc0fcd86da8b
 DIST foldl-1.2.3.tar.gz 14782 BLAKE2B d9c394711e3ef8f72cd4d2aa5d9a3d58a4d7494b5a912efcb984019ccfc4b795ff8dae5b648e1b091fb885e64a58d8c29e6d5fe310d0e69b1eda169d00fbbf2b SHA512 30ba640561eafee690333e4741a7065e91bc5da5e5dc62a158d9f1fd21e723e0a0c2df9a29c783699fb746277ebb3ecd66bfbbeebf34d3db952e2ce0e4aba475
+DIST foldl-1.4.7.tar.gz 21602 BLAKE2B 617f16b0b5ce18c12d5807daf973beb7e5fcd01591ff057d6ec66e8c6fae3cec140949ac87bd5c7d23bbd5ac86cd4355f5c96b8f4d703fa26f291975ff6bac8c SHA512 e1c8569214ee58d1d5333018a50832e8be53fa2751c18b5d93c7c8d393f722248050fc56c6a5243a0f9f8ff94a0cd2f475c03107e70d601bf6bf3a81c509b58d
 EBUILD foldl-1.0.7.ebuild 836 BLAKE2B e7792ad2a11167de158a42ae80018e1626095b2bdd71d55003d64765724ef96e0257f65874e7a6bbc9f55bcf99231ea88152fd17f6f978f94b532f562b3c3f74 SHA512 d553a3349810301233840dcb43b32a9b64d7977ee7d17ed4297080e07c055d7d31006815d471046a5ee1ae980464f231a5d99a6b9d57a05819f3347a6e73e67c
 EBUILD foldl-1.1.3.ebuild 1038 BLAKE2B d0b2fa28d79e081427a15678100cb0be60af04aa26e05cf75157f90069040242b9e21f7a145f9d2ab6b07d9a7fa66441b801ad03406fcbe3b9a8c2d9add0a994 SHA512 b0013674bb2640995491d1bfcb0f3cd771d346cee175941b265ab1cb82c6d957c60a5b338cfbf98e8bb7100162e9c4f3cec504751a286c76a8255ff0a3957526
 EBUILD foldl-1.2.3.ebuild 995 BLAKE2B 4b4d157f1b18ee44d41ad64e082a24c96d6b2bf3776e3d2d2e39656f6b11349658c023b8c9755f94be6a662077e9a3495a5b95cd207273051759af6b4c8c60c0 SHA512 29ba7d00a704df4d4a2d8939acfd2b0fb6994a8812944e539d03e0960f99b40e7a427e0e72d6b5ed4503da973edfc211e96acdf7850dc5cef6a4cbf0b22a1dda
+EBUILD foldl-1.4.7.ebuild 1447 BLAKE2B 89de7a29fa693449b313af17d77d4d972cdf9422f736325861305c31176e9b2ef965976123ea156e6aaea800b7967b1d1d835e93825f88e5f244cdb75f98d216 SHA512 6376828a462b5e5eef46f7705b5d0654681c032ae9f4d9b3d429d44aa8ff6f372100845f5b46f726dcc02d015a8a72d30172a6282a1f229e6cdb4e5edf20835f
 MISC metadata.xml 545 BLAKE2B cf41305d52b7585b2ba32f6f97f4572d229e200121f4221703f3d4f13c760f9bcece8641c8316ac280753211b0d347fe0da178a03a9bc716c2c0dadf8acca077 SHA512 96bde433f0f86ea8ec8fb8e167a6cbf8dd595317dd18e5b2a3ec251990660007b82c7a0943a33fb3445f0fc3cbb2fe2c0ee7cbcc080d736a5259b7a540ec1b76
diff --git a/dev-haskell/foldl/foldl-1.4.7.ebuild b/dev-haskell/foldl/foldl-1.4.7.ebuild
new file mode 100644
index 000000000000..423090d68ca3
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.4.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="http://hackage.haskell.org/package/foldl"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # it was found in multiple packages: hashmap-1.3.3 unordered-containers-0.2.10.0
+
+RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	<dev-haskell/contravariant-1.6:=[profile?]
+	<dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?]
+	<dev-haskell/primitive-0.8:=[profile?]
+	<dev-haskell/profunctors-5.6:=[profile?]
+	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?]
+	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	<dev-haskell/vector-builder-0.4:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/doctest-0.16 )
+"
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index b5cb5d0f4dc2..2e562dd85d91 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -4,10 +4,12 @@ DIST free-4.12.4.tar.gz 50601 BLAKE2B 9216251304335fc75090d97e97e6bf93532aa23286
 DIST free-4.2.tar.gz 17972 BLAKE2B f54f98f0bb277eae28f3b8487a2c2c2e4f786c7a6e7ed5c7a78109c8c141c20f097d5d0647b101102ca9e85e82b07de856d172fe8bf57c61562312aaab62ee22 SHA512 9f5d124c783bc43399d787c5f233f873800e121e7c9e0629b528dcb4e063e37b12b44e5ba74ac3731cc77949de72d76641a47070e0237c9e02f16137a80ef96f
 DIST free-4.5.tar.gz 22856 BLAKE2B 9d9e7e382c199a9ddf02f6d13830e53b40a2a5b48bd91ceefa69310a646e2cf304d4831197969ab31f6c4f65b95e7441a01097db787d6eb11a8e44db8324d874 SHA512 a7ddaf84dcf2dca584e487f8c9fe633a18b14201217142192784cce516497bd338abfdcc861c9578937b0b123ab737288062ad32fb1981c2eb97e88b0942238b
 DIST free-4.9.tar.gz 43414 BLAKE2B 9122aafff9c676378085a08f7779230cf3d82919d172e130bdfd3ca51de522d89abe77a90dca228b42883ff42b2ac07125192f0cd38294ec353f598053ba9489 SHA512 1e5c49b7e3e61a8348520522f6bcbfd04e5187c31c391eea30793baac023c9c939ebe6f44cdad0a71f099f137fbe3dae73a31652dc8cef3cac5ce9b42d461b67
+DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91
 EBUILD free-4.10.0.1.ebuild 1203 BLAKE2B faca34cfcb88ff630ff9b084f1beb497ad10e3e3c652d3993c42937ad9b4fe1e4a99d9b2251756af6d63626f9ef9259efac72fc3ac15b8c64d86249e5fbda8f7 SHA512 ee0f908621792edad119b0e27caf91ddd9a0e823742a3fa6b6b9bd5bbf958a6c068e3ef3775a6008e31c8ff9e42b4556c4adbd2cc0190a16bbf69926d0637448
 EBUILD free-4.11.ebuild 1203 BLAKE2B faca34cfcb88ff630ff9b084f1beb497ad10e3e3c652d3993c42937ad9b4fe1e4a99d9b2251756af6d63626f9ef9259efac72fc3ac15b8c64d86249e5fbda8f7 SHA512 ee0f908621792edad119b0e27caf91ddd9a0e823742a3fa6b6b9bd5bbf958a6c068e3ef3775a6008e31c8ff9e42b4556c4adbd2cc0190a16bbf69926d0637448
 EBUILD free-4.12.4.ebuild 1383 BLAKE2B 63cd40f722d9b7f2a2bcc27628b6573dbc3eff810bf7ad7d8d9f313f10ebe5f4a9ee90c1cfba099582b322b93855176847a5c2573b3f4ca2230c388cd727e375 SHA512 6cc7d72a9f31404795f42ec310e6c8a3e8a708984d7cfb9f17337b4370ebe93fafbc118ce30f37fa7466b4b89482e538fd16ab0fcf975250b24864d244c36fad
 EBUILD free-4.2.ebuild 1116 BLAKE2B 37ad7a0f4cfbb4942757373b75bcbd773d56ea68b3ab5ff2e77067ac80835f119a5415e515291f75ae542e88472bd84f72e2854ab40ee256a594e1047030b593 SHA512 bb6b3f5c0839f6e08d59b27298272aa1e13ee28fd78530707f9877ebfc424771d07195c8e7170d41bf437a10714fcdeea22c306bf7535b3309b4d439a19fcc68
 EBUILD free-4.5.ebuild 1115 BLAKE2B da70e68b124d411da54c8ac5a31d7c9f5ab26c5d4c6cde4f25f6f48fb46f7e74b8d926c116f6d5bcd849b46d26ac8be572e30bc08d7a4dee145457fd2383585d SHA512 cafe575dc90c28275cfd98c3655b5d2f8ae760934fb3ca034ea2cf7dff24d730b8f09497fd5c95dd0d16cbe40a9a841edc726c94c022466625de3f9c8842bae0
 EBUILD free-4.9.ebuild 1203 BLAKE2B e9e9217f5b472e431ffc57315e128e39e0e9d38f2e3e753d8e72aa7e1a77008dd427bdd8ad5c566c04f9d4ba437a6b1db2670961f10ed3628098b45696eab083 SHA512 2534395c949ced5b0092c990cba8c14c5e1240e8fc11bb097ad99c4dac56004c106eae3af0f7fdfc0d63b7e8738b59240186afb95bd1c65fc6096aaa33bcf174
+EBUILD free-5.1.3.ebuild 1385 BLAKE2B 5187736e3e0bd55c1151434100f7084056071c7a975f0dff50f9a81e5ccac4ec14a455780824d585ee38caffa746f1557e0a4aadf5ab8d481bb1a83fc399c31f SHA512 823d92b562d90c8227609e147458e68beb498963505968626cdd4c3ca40615803a9b13e8334c4a4c7908e7a33d2f4cec859d602a05fd0041c1a97bb082d7da17
 MISC metadata.xml 382 BLAKE2B 4254876ed44c9f2b5c412484cec6a832aecb00c1e19aa24f7525eb0a50cd3c7e61742886ec145c4ee79dd65ded3a421316350101e3de0cb8a63ff9177ea85ed7 SHA512 c18059e802afa4cb8ec632859c010eb2bebe8344615b28cbe03586998f163f4492b9c7ae9e4a9ac7ff4783500f427eb059678e56bd585a25a7680e5c2156fdc1
diff --git a/dev-haskell/free/free-5.1.3.ebuild b/dev-haskell/free/free-5.1.3.ebuild
new file mode 100644
index 000000000000..3bc8d782882f
--- /dev/null
+++ b/dev-haskell/free/free-5.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/distributive-0.2.1:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/fsnotify/Manifest b/dev-haskell/fsnotify/Manifest
index bed927935e94..fe2fb5dfcf5f 100644
--- a/dev-haskell/fsnotify/Manifest
+++ b/dev-haskell/fsnotify/Manifest
@@ -1,7 +1,9 @@
 DIST fsnotify-0.0.11.tar.gz 14530 BLAKE2B 983357e6f119a0b5cf1c43d5cf2355b11f49141c933110698f5e07a1d4509e6d6909969d3e902a3b07c5c6df89e9114ef3a688e105527e551bff5a2c47aff558 SHA512 e992864b349a134c3dac7a5a9da3452ba6c17c61b3a27a322f03eed3dd078923516604899a1d028fc6563a2677b86e6cf2f1eb1f92e2b3b33887e0df2a14573e
 DIST fsnotify-0.1.0.3.tar.gz 14116 BLAKE2B 4697f755028a876409d34138c00a084b1986990cfff9fcdb1f638be5d4be1d91a25f2d4077300582f7340f61fd874de3c5b463b9d8a06b288d59ea53a650ead4 SHA512 6835670a27bd0607c8dae7bfb4c197f78217eaa46d9a03d84ca53f5ade3fba78e85bbb0c1cc9621d9b17a2d415012a34eefb3ee2f63d518a9d7e354e07ce91ec
 DIST fsnotify-0.2.1.tar.gz 14689 BLAKE2B 06e8d05232b16c49045d4e737a587fb9c0a5e0f2706981949a579fa9ed3abb0795d5ecf60abddefb4eca86cd7a76313b8280e2badefe487ce2cdc9132039474b SHA512 b9c6505d27f7010b60dbd4cb2fdfe65efacd33398fda9f95526dd0d828b82b1afd029e6457aa1ece3421cffcb1a6189badc34b644faf8386e2631967380f1372
+DIST fsnotify-0.3.0.1.tar.gz 20638 BLAKE2B 8b897ed716e17ff4e22da274eacf03770ddf69661ea74a3ce2c284c21668a429ef92fd1f437fd104a82e02608a13fbc7e1a1bd5a5e8cc524fe2c70fbc3697ac6 SHA512 d5c96a54c1b4788e1d50f259d11d4e2d6eb7224552b50cb359a1f4cdcc2a9b7270f9b5ccdfe9738a163b54ab7ab5a0114de9cabc56660a7324cdfc4b16179e1a
 EBUILD fsnotify-0.0.11.ebuild 1048 BLAKE2B 445a68384b17df9b77d735a16d6c7982c5ebc4574f05609d2814e3f48022505c86ddc8b849f8b316e93aa8e9d532248a6ba351d4836bffabb2fc9f78d371ff1c SHA512 e7face6699b9a76fcb8f8a14dde154b06ee9562da66a02eaeef9ec403bcaf39a33165e5aa3d4bde372eea1559d1b58a09829ba473c4fab6c55a148e345901f68
 EBUILD fsnotify-0.1.0.3.ebuild 949 BLAKE2B e9542b66ada391a1a9e789b97fd7d68680d3276507ded22595c0202ae414d8a7a30ba3877d85d9f3e1d24c044e6cafb6612a84a8200e56cbf2037cb83af56356 SHA512 500bc3df5abd191035e048ffcc44e847aab1873da9875c49a1662e76cf435d3d6ddfcf3aec105b95a97ba38a35d2ddde6e707fbadeb04156f77b0cad05ed4614
 EBUILD fsnotify-0.2.1.ebuild 816 BLAKE2B 395173cda4868af8e878fc771d91fdcb3eec6ee325ab4b3d429e1a4221d64d492e5e934a17a53127e90a6cfff49025624dc6b0b13c0fc7782612d3b6c092a59e SHA512 eb8bb1b97fd0061710fc4af1cbe9a0553ff8443994d51f2c865a73911307948cba0d411194da1008e9d88316241ecd4dbe302d2e7fe8c41de9502fe079d71473
+EBUILD fsnotify-0.3.0.1.ebuild 883 BLAKE2B 352205785cddb4de89654af9074814c203c065e20b65fc888654a8ed52e8c0c01aa3a1749b87a399d02b1eaa167b8a759be024edd851508aa1b96f1547357373 SHA512 9794bab45ae5f6efb25fe87fad985b3f33111734761c1810a35182b30540e7b0e0e9c871731b933d560bb6b2ad7d6fa7d5ddd4930aab405d2a284a01b90f4ae0
 MISC metadata.xml 589 BLAKE2B a490eef4605f583796539a7a7b376641589b09ee023c60fbef6937dea0577cac4d07098eb05a5b7ba787a93f4281912d0178722d02d095d76e0897944767b0ea SHA512 96e4707db65cf8709dd613c725a0c9d5944841b2ba81b94d669cdcac4f9bb2dd2ba060e2109744046825be4455485f9af8b0b052e9eb90648ad52428d4c5154b
diff --git a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
new file mode 100644
index 000000000000..376479a62aa3
--- /dev/null
+++ b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cross platform library for file change notification"
+HOMEPAGE="https://github.com/haskell-fswatch/hfsnotify"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
+	>=dev-haskell/hinotify-0.3.0:=[profile?]
+	>=dev-haskell/shelly-1.6.5:=[profile?]
+	>=dev-haskell/text-0.11.0:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/random
+		>=dev-haskell/tasty-0.5
+		dev-haskell/tasty-hunit
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest
index 689a39c20fce..c243bb3b789a 100644
--- a/dev-haskell/generic-deriving/Manifest
+++ b/dev-haskell/generic-deriving/Manifest
@@ -1,7 +1,9 @@
 DIST generic-deriving-1.11.1.tar.gz 65456 BLAKE2B 6c93c737ac312a90af03d64f3abc9aea23d10218212e1933d2f995da080df260d47a0f6383c31db214e42878371a9fb5f043c524aef2ec8c5e8d959611773ebb SHA512 c0f8a1fb4a705eec43b71b6b578968beff889bb43551086fa520a311fbcbfceb49fb49844e68698842ebbb50ed57d75263b6a6a79e3b8a080240da07ecd8f61d
+DIST generic-deriving-1.13.1.tar.gz 68256 BLAKE2B 419e50b07d72066a13016c9c0d2cb7f7ad995956ea07763c3345d2e6057e7b428cffa5ba7b58df0230195a05f97f58360640a28a020c41bc3f78dc6f3bb8f924 SHA512 946e3a4da31141fb1156690e0fb51cd3ef0a4f62c0e5b68d0e0d31953d8999885011acb743edd5d0bf88985422c9c74a727dd7f775316911da57ff49716103e2
 DIST generic-deriving-1.6.3.tar.gz 25268 BLAKE2B 57e82a46e072370a1c0027032427740f1ac9f243c1573c5e6318e3c86f13a64019c52b4e514ff3ad4822d67b8563971d6e39cfb0031241b83997190cb2cc8983 SHA512 0730c792b96d21c9a078032d4446f1d994b5bc8e0a7fe4a22256de77e13ce3c01838ce4f962f2a9a3f18a4143b6deee167cc6cac648714f100f129b81ed2cf16
 DIST generic-deriving-1.7.0.tar.gz 25341 BLAKE2B 1250ccdf00c8a73f8f5e61e757f7ec178cd3fadc46d5a71f91f2e8aa9b856e0278125cfd124c7cf898201a9cd8e8af0e397e39ac823143c5d9a5563cd6545782 SHA512 d773eb0463a7814071fb05512c211fdf6efcb3245d6cb6046e0c3bb8d0634fd397636e3f8f2e37833878e3452ac2b0fab35542fa336ad1e36270b0e876b395dd
 EBUILD generic-deriving-1.11.1.ebuild 623 BLAKE2B f97cdd9b485809e6fb2645dd2c1721a3e9cb6040fe5299d31201cd651ba3890eda5c18060d57fff3d338951f0010bc0de53ce38192c71a38635902559b8dc1a1 SHA512 35312bd0643e0c8c8bd78a6b38b244f8803bd3eea49ce748f4821bae785e0d41709a3350b2ae5b0a1457c6b469bec974451b2b101a0ae0ae45b6711888485d64
+EBUILD generic-deriving-1.13.1.ebuild 715 BLAKE2B 01c7bc8b89ea527e96be6e14089af18904ce6477ba087b15976970050f7e0328777b5ed57fee216411acbe6742c6bafe68fa0c0d17504d26f2b2e4f735d83dff SHA512 c1eff3a9e41de8ed2c541d11a4f2da204dd93d9cb74d0364eb41f067c38cbbc3266831c969754798a1441d1354af919934540258e8c40866c69e583148accc5d
 EBUILD generic-deriving-1.6.3.ebuild 573 BLAKE2B 647b9a7c61ec5afe7f5538436218cdfb038d04dff13d7d445c1a1a2b37002f406a0deba7901966b423ff023e7d99abba07483a8cc34a71d0669c4c331df31785 SHA512 40ba5a595e7d805a7fa07c293106cb00de94e1c6f6ddf2db3e32f406872efb30f16d7da0d2509fae8a9e94810567d412b96de0a6133a63f8c291371b9e8a89ec
 EBUILD generic-deriving-1.7.0.ebuild 568 BLAKE2B 51c48c6e30dd0859b62cd5593bcd44104c9232352e7bca69086bd569cd2de9833b1ecca1333cff4596a00a3e742e133ec320e72ba373abda7ed33bd76feb8a6c SHA512 6ad3845e6e6c3b995a75bab7bde5f87183c4663a2158ad92a937598c60d738299c3b97ffce84de6f66e2c171c68fd35216f7efeb8a63ab78a086b923729c7352
 MISC metadata.xml 889 BLAKE2B 335604ba68647b47cc2248fc5a9908f69972a0cafe685f9ef638e4b4da1cefa966ece2967f1531060c42b7ce51e2fb386d054dd3574957c4e10501ba276b1b89 SHA512 6504da89504ed73583423762aaf87c38cf35abf9ca05818540f157062c26f85d29341310c03ad4045f7a8642528e09bca8cf81433b02f5a724b89371156d354f
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
new file mode 100644
index 000000000000..100fd00432eb
--- /dev/null
+++ b/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic programming library for generalised deriving"
+HOMEPAGE="https://github.com/dreixel/generic-deriving"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest
index 9ff0aa34d7fe..2fb24dcb3763 100644
--- a/dev-haskell/generics-sop/Manifest
+++ b/dev-haskell/generics-sop/Manifest
@@ -1,3 +1,5 @@
 DIST generics-sop-0.2.4.0.tar.gz 32986 BLAKE2B 8d4d426452f710a57fdcb4bfadd68f2b7faa208127feb7a55b9446cf2d455f799d703748c09ca2590140326f6f5a1f2e86bd609e7d52245ede4624f2c95c2baa SHA512 ce0d92214e622c58febced5684ba92b117e413d5718c6fdea1471f0fc5ea48ea53b212a536618086228542985f304dc4434c75c6ab919a72e6f49ccce342d866
+DIST generics-sop-0.5.1.0.tar.gz 29797 BLAKE2B 8e61bf85d8541f9f54aa0ae908f37cba380b68a40d83c42ff7b1cf1931eebc3d8671c22714bd18addad9aa59fd0f0b9e3bd000f033911dd7b96d32ee4dc5d5e5 SHA512 454cb30800e4c6b225df6464970746ca51028ffbfe50143559eebf16918dd783ef2e7690c4877b568d1835043ec733ec0ca9a39e0ae88c3136c82d0afb42bda8
 EBUILD generics-sop-0.2.4.0.ebuild 675 BLAKE2B eab8568b922591a95282d4b935e630dbdb57d0353d09e67e407abc8a8bd0bfcbf54813833f3589023fbccc0741948378e47ae8039c7e706448d3315ab3598536 SHA512 f6c7f481229b8c97d85c568e0d1b30b6e3c8ae097ff28df58fcf0beb0d1f5b22e02eae0c0d1c05f44ac308b41243606ddb8eb358bdd3e8d6920c3fdbd512cc86
+EBUILD generics-sop-0.5.1.0.ebuild 746 BLAKE2B 21d005589cec1875e68fdd8aded211353bcf8aa2da82f031909cd61a9625be263ed2eb12eb347361634a33eb7759b19d2bb39b9c8f1dd05a63db5a54f18864bc SHA512 35e9a21075ac25bb93c0a91b3e827016cbeebfc1ba44151b74171aba3063de6e4c34341c168fa892c4c3b0ddf4e9b586c72445f08d771bece5cd0a5ea814a6e8
 MISC metadata.xml 1381 BLAKE2B 451c24e7bc9714a9b579a9b26b9c1709c3e678fee0ac943a26829ae6c51416d4b3290fa50a7055705b49e423289ef7d68e60d6125db0671c4af16cdc57c30f15 SHA512 75abab067f073654bc8323421e2a758400965935603e68639e3b2fe7e8069b04205830c6e2bd9fa05ae2f1fc310ad7a2a35310872b46572f4b846f72c005ca19
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
new file mode 100644
index 000000000000..a0cbdf14132d
--- /dev/null
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic Programming using True Sums of Products"
+HOMEPAGE="http://hackage.haskell.org/package/generics-sop"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest
new file mode 100644
index 000000000000..6a1ad9061102
--- /dev/null
+++ b/dev-haskell/genvalidity-hspec/Manifest
@@ -0,0 +1,3 @@
+DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
+EBUILD genvalidity-hspec-0.7.0.4.ebuild 801 BLAKE2B a756c5d0656ff7c5659e1d8589b3ff286795da256eff5c6dd7a1cc4a566286f80d959c56cf5c6ae28629f6cc897ee118dbb26b38526b49a5ba070d9461670547 SHA512 a7fabb73dea3190334c6cf6bc3c2affba274f537f3209a39a0abe99d6a82bc595cbc5d5df42f01daf4640801e3a8f220f2f860e269ce25d1fe223c24b6ed8ca2
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
new file mode 100644
index 000000000000..803a16b0fd27
--- /dev/null
+++ b/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Standard spec's for GenValidity instances"
+HOMEPAGE="https://github.com/NorfairKing/validity#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?]
+	>=dev-haskell/genvalidity-property-0.5:=[profile?]
+	dev-haskell/hspec:=[profile?]
+	dev-haskell/hspec-core:=[profile?]
+	dev-haskell/quickcheck:2=[profile?]
+	>=dev-haskell/validity-0.5:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/genvalidity-hspec/metadata.xml b/dev-haskell/genvalidity-hspec/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/genvalidity-hspec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest
new file mode 100644
index 000000000000..5e8a36dc7224
--- /dev/null
+++ b/dev-haskell/genvalidity-property/Manifest
@@ -0,0 +1,3 @@
+DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
+EBUILD genvalidity-property-0.5.0.1.ebuild 799 BLAKE2B 5551fad258c5123a76ad28f6939d7d25c3bd53b0d8f7fa57bcdd403c062de77306f4e2ea3486a325309da352199b1c4c9410be8a3901751f61ff122df2f5f80a SHA512 4928ccda62e358fb63bfe7d12a7a6109f9b7af107f431eb4766cda883a184443b7afe335d698ea260beed4d10cddd4643fa549e0fe155e1a480caac548212489
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
new file mode 100644
index 000000000000..5af378911aee
--- /dev/null
+++ b/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Standard properties for functions on 'Validity' types"
+HOMEPAGE="https://github.com/NorfairKing/validity#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?]
+	>=dev-haskell/hspec-2.1:=[profile?]
+	dev-haskell/pretty-show:=[profile?]
+	dev-haskell/quickcheck:2=[profile?]
+	>=dev-haskell/validity-0.9:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/doctest )
+"
diff --git a/dev-haskell/genvalidity-property/metadata.xml b/dev-haskell/genvalidity-property/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/genvalidity-property/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest
new file mode 100644
index 000000000000..c2f88a93ee54
--- /dev/null
+++ b/dev-haskell/genvalidity/Manifest
@@ -0,0 +1,3 @@
+DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
+EBUILD genvalidity-0.10.0.2.ebuild 736 BLAKE2B 88cc13b972612b8d6397421f59adeb20567ae64ab5ee506905cc78803063c7bae721dc6bbf4448882eb56c12770c1d1e5d19b3ffd0dde8b80e47181973c88259 SHA512 f8d12cc9fc1ac9e35679e6049b4bd7a3fe5e93ea0ff447ba9c74c9dfc7e39f038b41ec5e1ef5f4e7be3a720ca45698d9c2a50ce37cec4b8e96cb6513fd807673
+MISC metadata.xml 534 BLAKE2B 98bf6ee6f4b3d7446bec75fbee2bbe4a4e1f91a5de690a1271fca13552b3837a847d06ffdf8d06443021d9c8809ffed0adb07e048869ab865ae19cdcc489344c SHA512 3eaeb6c24136d3070b96962395b57a56e6536fd013bac39519b95d335a08903a03309a3385409450e5e5c1372022f993c321d196b663908e9f97a32eef543564
diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
new file mode 100644
index 000000000000..a8b688efd42b
--- /dev/null
+++ b/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Testing utilities for the validity library"
+HOMEPAGE="https://github.com/NorfairKing/validity#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/validity-0.9:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/hspec
+		dev-haskell/hspec-core )
+"
diff --git a/dev-haskell/genvalidity/metadata.xml b/dev-haskell/genvalidity/metadata.xml
new file mode 100644
index 000000000000..c14cec8fca51
--- /dev/null
+++ b/dev-haskell/genvalidity/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Note: There are companion instance packages for this library:
+		
+		* &lt;https://hackage.haskell.org/package/genvalidity-text genvalidity-text&gt;
+		
+		* &lt;https://hackage.haskell.org/package/genvalidity-containers genvalidity-containers&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
index f94ae033bb6e..7d59aab9c356 100644
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1,3 +1,5 @@
+DIST ghc-paths-0.1.0.12.tar.gz 2565 BLAKE2B 3e4783a854510a4ae6d6a9d5f4d0fefa7fbc03088aa298d8731c7bdf961ab47553b0e46c1b8d2f61193b669c43fc74e8eb6f948abba4419b0110772d56397c1d SHA512 1c66caf459f5783bde38a47ce1292bf5c47fef21e3f69d7f6c052b4eb39f446ed5decd38f0e4143a90d55ba44ebc0891b4497050cc652cbf3fcad636d45690e9
 DIST ghc-paths-0.1.0.9.tar.gz 2402 BLAKE2B ba84e058a09fabe4b386120855966daeef0d71e0ccc4f131cacdd12cfe064c415715ef3dcbc33a1c5f0e5339f58d61b37d8842c2ca0f97245f56926716bf834b SHA512 0aa38add4a6f27ced115d769603f98eff6fe3e8b60a6477f4b1e669031cbb6408b87d2fed023d790169b623b9cb2b7983871a9bf9d5cfcc298774a34808e2094
+EBUILD ghc-paths-0.1.0.12-r1.ebuild 1533 BLAKE2B 66301b5851278fcd967ae1e9763b19d4dfdfb499167452df53217b7c39666eb66efafdcb329ae23112283afb9c25c432e6f1c77ba00e09dcd5359172e828b766 SHA512 2db489ed5003f656152c0d85f0579a9546903d74ed55f3631ca6c8ab9619797f772dab3b631b5eedd4a1093c1c54c195624c259970f2cfd22b93ae8cce040047
 EBUILD ghc-paths-0.1.0.9.ebuild 1387 BLAKE2B eeb0f8a5b81840542dff473d0a272c8dbc89c406468c21e6491925fa4b34a0796222c385397baeefc25852980330dbca144f38ae06cae72b22b681ab8a1458f8 SHA512 810a8f5e2144778e5dad780882e2c934467fb7f85523304304a42b2a1fec91ff492d53dea4a3aacd3ad524de038657f1540685d47ba3ba22f33c4c9d7f85a194
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
new file mode 100644
index 000000000000..bfe1e0199186
--- /dev/null
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+
+# haddock feature is explicitely disabled, as this library can be used as haddock depend
+CABAL_FEATURES="lib profile"
+inherit haskell-cabal
+
+DESCRIPTION="Knowledge of GHC's installation directories"
+HOMEPAGE="http://hackage.haskell.org/package/ghc-paths"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.3
+"
+
+src_prepare() {
+	default
+	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
+	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
+	cabal-mksetup
+
+	cabal_chdeps \
+		'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.3'
+
+	# and use gentoo's hardcoded one:
+	# a few things we need to replace, and example values
+	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+	cat >"${S}/GHC/Paths.hs" <<-EOF
+	module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
+
+	libdir, docdir, ghc, ghc_pkg :: FilePath
+
+	libdir  = "$(ghc-libdir)"
+	docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
+
+	ghc     = "$(ghc-getghc)"
+	ghc_pkg = "$(ghc-getghcpkg)"
+	EOF
+}
diff --git a/dev-haskell/githash/Manifest b/dev-haskell/githash/Manifest
new file mode 100644
index 000000000000..0596239e92f3
--- /dev/null
+++ b/dev-haskell/githash/Manifest
@@ -0,0 +1,3 @@
+DIST githash-0.1.3.3.tar.gz 6670 BLAKE2B 5d05a438ae6c17a0db9b2f58d3b7889ca461e12bb97e26d22319e667446be6423b0387465ecf438bb0cb94004aaeb380483d87be718b9077fb7f610a914e9905 SHA512 767f9e57819b0450a3f004e6f7ec333657fa76b4507cf89f16ccee44a8f986c972501a1177a4449dceba68568b744846f70dae9f35bfcbc1537de5cb3cead676
+EBUILD githash-0.1.3.3.ebuild 643 BLAKE2B 64bc24685ac5c607642e52b11b84343390ed9ef2842ed8283a7112c40fd983bb8090ffc21c5649b4fd9b6e97785979902d25d4798cda26bba3089e97dea04197 SHA512 e3beacf00a798b783db29d209574e758ee9ec6850d3168d8862f1e072323d86f951f06809607869e2c44c6259362907214cbbf23b1e296e2e18b795d82f83b2d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/githash/githash-0.1.3.3.ebuild b/dev-haskell/githash/githash-0.1.3.3.ebuild
new file mode 100644
index 000000000000..774df22e9d6c
--- /dev/null
+++ b/dev-haskell/githash/githash-0.1.3.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compile git revision info into Haskell projects"
+HOMEPAGE="https://github.com/snoyberg/githash#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		dev-haskell/temporary
+		dev-haskell/unliftio )
+"
diff --git a/dev-haskell/githash/metadata.xml b/dev-haskell/githash/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/githash/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest
index 0091349cf107..95e4f9a85868 100644
--- a/dev-haskell/glob/Manifest
+++ b/dev-haskell/glob/Manifest
@@ -1,5 +1,7 @@
 DIST Glob-0.7.14.tar.gz 23928 BLAKE2B 0f5c58f55f182051326ac2e52b3332b9f6dd4a907cc179fd3d79f1e5973a99f038fe82c1c2d517dd281880657fe465544fe5275ffc864b67506318de01959ce0 SHA512 1ad470c90da94445bac959326327166cbaed2bd9abd6b861dfe1ff4849edc4cec00baa6d8d160f2513a2d0c036075c8f80ba795d70c85f2de447254b893dfb0e
 DIST Glob-0.7.5.tar.gz 23443 BLAKE2B 9664399f418ad2979d05053b09258b9c53a877274d806ef3efb8797452234663cad53448d5ef7b7b79cda6b52328e753f53a5ff2f2022516594b6d19729afbef SHA512 7397a6003b73fba31b1515ada667f2ff536cb1cc76d552e43167135877397dfc693a563abde11ca2912e0c005a99a37b45e564becadbd47d2c4e4f40ca4245b1
+DIST Glob-0.9.3.tar.gz 29358 BLAKE2B de4a69e816b0e6e83e411c497eeb975ce6b644367c7204df0e40081f330854274ecd43e53f848b42a872de9ed6515b8a773d96fef7a7286f7a141b490cc570df SHA512 4b677745881b318a5a82668d56c4547f8d1173be55cb1589ad0b9e62622151d771d3a40479126749135cbc98f56d8cfea3619358db5929c890838d3e0b85a536
 EBUILD glob-0.7.14.ebuild 1197 BLAKE2B 61d8dac9235023f744ad744d8ecf735940fcd357e8317b2b0c064ce9636857b5acba1bcee61ae6c59219e7954bafad5bfe1428d57978417bd15735e2073b2e63 SHA512 2c634c61aa1c3c03d97f2b9dbf61ab9bc7bc80d0f1e36b5134621c475ebf7b906ce97dfa04d0145cc2076aef97c5e606c502efdb58d9819c156672223a2f8051
 EBUILD glob-0.7.5.ebuild 827 BLAKE2B be98513546c63e92c69938c67ff57d22b827f4e27e7284e36fa8da90afd351fe4f4d492a247386e43a8ca4c8bf0120389b52a59e54708a560bf916f6e6d4ec59 SHA512 b2fc3705736931d3697ba2757f46c6ea4689e22addbdfab6b9ab60a4c3015f8ab92fd7d67046f154cfa61794321ddb59044764f3d63309e496ce1f6e18791d8d
+EBUILD glob-0.9.3.ebuild 1197 BLAKE2B b1529084abbc4ff0640b930c8732e97973a58f63eef6a67c81efed863957dd5b68b613673c36e23bfa5132aa613984d3f86c64e68567e3d6e9ee4b6e647a066e SHA512 2ae91df2fc7286f37ca5be27468daa67f5c676c3baafe109fd484fa6465fc35fe72e7855e1967a1c8bc401ecbe0cb4c6d3948577d86d8d79fdab176d5a0cbed3
 MISC metadata.xml 352 BLAKE2B 7969510c26dccdf7f75f6fb5bb3c2adc54e5f673f3c36ef97b467cbab9659fa7a7eb01396fbdf37201fdacf699fcab9056e24a86918c16563f1b67cd7cf19b8f SHA512 9226b1c371c8eb0feddc1b4432d3398b06a4920a66575c95bc5f7d24d7f57d3019592e2f1f7335771f8a210fc9de7ff626039ed244174308b96b4457b15f8644
diff --git a/dev-haskell/glob/glob-0.9.3.ebuild b/dev-haskell/glob/glob-0.9.3.ebuild
new file mode 100644
index 000000000000..9afef6926486
--- /dev/null
+++ b/dev-haskell/glob/glob-0.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="Glob"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Globbing library"
+HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/graphviz/Manifest b/dev-haskell/graphviz/Manifest
index 7c4d53da60e9..64a0413902cf 100644
--- a/dev-haskell/graphviz/Manifest
+++ b/dev-haskell/graphviz/Manifest
@@ -1,5 +1,7 @@
 DIST graphviz-2999.18.0.2.tar.gz 223908 BLAKE2B 2f425cad55622a519ae6d6641bda6340c0dca63ea800fdd77a2c66bc4f4ad06595499089c3a7857cdc02be1f031bd91b94a9eb025e206990942ded6ee22745a4 SHA512 8b27a81af2d31780801534f785bfda1dfbd127e176fa2c4bada2b33a7c80166fbb0efa67706296201bb19d201b8e2ac56453be0d8fcb488b93feb95d2acd8a09
 DIST graphviz-2999.18.1.2.tar.gz 222546 BLAKE2B 43acbf090a0396041398e54461627339b914c590fcb10421ac3299d68805b4aaf2637a65987d6c9a1e45cc96e2e536ecf11eb88ac6a62fe92a56c1fd503e4bae SHA512 1e0bc5b72b934febb923c13052f83db12270954e37483f46c64db8a23eb7ea3894b72c8e2cb303cde6bec30f75a28897c53d81e92fe9489ec21a4589e648dd3f
+DIST graphviz-2999.20.0.4.tar.gz 222563 BLAKE2B 5c7f57c8c78d9711cca48372aa4832bc8b18656031bd51595aaad9e1428314d04a913ab6c9bce62ada407954c6db47224e26515c04fce1ceed5ce3a91d59dcd5 SHA512 fc0a959e642e245cea254ccec9b1bb36b9eace61da2f8350ea0961f7fdffe6c5d5f42cde068201e6110ed71db0dcaab3c14cced431768ef5ed7ae76b0e5b5e9b
 EBUILD graphviz-2999.18.0.2-r1.ebuild 1458 BLAKE2B 0d4b29275cd44791459532efafbaaf44aac3fdd29b94b5dd007cfcacdac4ca5ae84d9e93e95c9c1cd9ba77908411ef77b335d63716c9a6f7f52280d234e0dd79 SHA512 0355c5b0b54bcef6476a7f5503bd64c263efbc5f3f8f5840222dc8a919ad67ea6079600c51aabe455a8235f6dee0d90d3e61655b03cb1cfdc8575594cd982cb2
 EBUILD graphviz-2999.18.1.2.ebuild 1409 BLAKE2B ea6b84c3b6a47ce717ea4eb77c80ebc267dafbed583d03d7cbccb9f1580f039837e72855ffe594b04dbd1c64234799ba5ce59cc0d1368b0ff0080dcff2e13f9a SHA512 d3ec40789cf4142db1de9cd2951c34218b09096edb1d3cd7345d2125b043aa3f176a54293e71c77428af856bde4a3732d636ba1d62403bc60d815ac53b73cb25
+EBUILD graphviz-2999.20.0.4.ebuild 1650 BLAKE2B 96cc96b7ab944628d858380aee7a5eba417f42168cbfa8a4fb23903a41956f934d0ff23ed2d8d0405340e2a03c15928c527e1cb25e64333057b40c15493729c3 SHA512 484361531c9fdf61d024ce3a9c512c3f2f4045ece95e0db9b2c2f496a7c28d312a082563c2172aa253537b2615d3b9fad95e247cb50ce014145a0933cd519850
 MISC metadata.xml 1323 BLAKE2B 1054a4262b89ba33309d2c0c2d499008bc2965266055b431ab552776a67e390ef8c83eb5485ecfdd0f878c6643ba79f1592c8d18bca6fdb132c2d52f39adc2be SHA512 a87c0ffc1693ecd616f5a97d673ac93830543757edbcf6a59f6343bed2910218175fecddbb1e81a5d97464a0d9a72a4fdef7d29d16625aa9a3eecd1cfb86c9ad
diff --git a/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild b/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
new file mode 100644
index 000000000000..1891e83361c0
--- /dev/null
+++ b/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+#hackport: flags: -test-parsing
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Graphviz for graph visualisation"
+HOMEPAGE="http://projects.haskell.org/graphviz/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # 30 examples, 3 failures, also known to fail here on previous version
+
+RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
+	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/wl-pprint-text-1.2:=[profile?] <dev-haskell/wl-pprint-text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14
+	test? ( >=dev-haskell/fgl-5.5.0.0
+		>=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
+		>=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.14 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'hspec >= 2.1 && < 2.8' 'hspec >= 2.1' \
+		'polyparse >=1.9 && <1.14' 'polyparse >=1.9'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-test-parsing
+}
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index d039d5bca9c9..d8e48aa259f2 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,3 +1,6 @@
+AUX hackage-security-0.5.3.0-ghc-8.8.patch 720 BLAKE2B 1761f38642335f28a17d4bb089cf0f0de8acf4b14767e3c5987f723e520000865080c69e29d6a35870f0b5cca44f67371686beb84ff023d73fcd13fbfd89c962 SHA512 d220ea358e59a8b965695006ade99dad369a4648ab77012d0a7e3413d90d37809887f449b9e4831f97d2e871205f3b3d86fa4977ca781eb028993d393f002031
 DIST hackage-security-0.5.2.2.tar.gz 83131 BLAKE2B 4ce0ff3d4ee2647ac5311996756ce43aa91ee7989ef6a46ea94679890900811c770e5ce91acc0e39fe0e42767cdd6d21bb11bee7d385c9e3a30c642b9471f423 SHA512 5adab3c46d7aada8668128ad8c9389ca65489eec776f8571b8ee5834d74b961f19b558cb6642cbb1891ee381b2d4f2019dddf29bad13607fe23bef49a3d6f535
+DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
 EBUILD hackage-security-0.5.2.2.ebuild 2032 BLAKE2B 242ff84e8aefaf864b93e461aa9d1fa1a289b5789733e346afc9a82a07e822e65016be85171dc14ba5e545ec47c33c8a2a2fe564385dbdd072681269d1c93489 SHA512 798100a59bcdb6e9a60d1b0064ff76d49ccdcb3cacbc05bf58c2ce75d65d3aa5004db88378eecbcf750a7703f829a246bb38d168c60166ed6a6944672b84e8a1
-MISC metadata.xml 1351 BLAKE2B c2977bbb8e8b408a51025c61970fe9881207ca2c91e5b7c7778a6c46caa15314c3536b2c720370c7739d37ca38c3f1693bd4c6ad024a5eaede982cd5940e0c07 SHA512 bc2b65083d43a010a500ee5d47300703dec5a0b1bd4490ad8a64a35063e15bf198124aa049eb895c3c42dfd021720d32b7c73eddbbabb105d5e851b24e78cf46
+EBUILD hackage-security-0.5.3.0-r3.ebuild 2638 BLAKE2B 3e51aaaf5e00c49d738ff7ba0157957acd79a557f7a96249048038f54789dde0e3b7b9b5217a845973e2de8e201a0d6f8f4b4a0d2d1f25482f2c5b1718d7064c SHA512 0090fb12f14d8a265d69740562e481ac5636e4daa7b97c3f2bcd97e67d7495a45f3fb08792d162b753ad07c8b55fb6e3b2d4808d9da228e6c7b7c5718003bb82
+MISC metadata.xml 1431 BLAKE2B 03fa714e5907e9f885b674cec4e11b811777b613ca9aaf59ab5ec6dcd8bf24c55f0750ebe0e6149a787d1dcc258153e52cbf4df66e4ea54befbd4f2359310c2d SHA512 cb667e67ba19c24521883b51ddc4a18d4001c0871b38f4cbaf24dbf0eebac8ba96457298d11682748d3d6039e6f5cf88e9613d7114a03c96786c49d83964e3ba
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
new file mode 100644
index 000000000000..7c30961a4b4d
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
@@ -0,0 +1,12 @@
+diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
+--- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs	2018-03-25 19:39:07.000000000 -0400
++++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs	2019-03-16 08:29:08.347456951 -0400
+@@ -78,7 +78,7 @@
+ lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
+ lookupM m fp =
+     case lookup fp m of
+-      Nothing  -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
++      Nothing  -> error $ "No entry for " ++ pretty fp ++ " in filemap"
+       Just nfo -> return nfo
+ 
+ {-------------------------------------------------------------------------------
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
new file mode 100644
index 000000000000..2c6a4be4ebc2
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RESTRICT=test # QC-2.10 finds counterexamples
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/cabal-1.14:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	>=dev-haskell/old-locale-1.0:=[profile?]
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/quickcheck-2.9
+		>=dev-haskell/tasty-1.0
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.10
+		>=dev-haskell/temporary-1.2
+		!network-uri? ( dev-haskell/network-uri ) )
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base              >= 4.5     && < 4.12' 'base              >= 4.5' \
+		'tasty            == 1.0.*' 'tasty            >= 1.0' \
+		'tasty-hunit      == 0.10.*' 'tasty-hunit      >= 0.10' \
+		'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10' \
+		'QuickCheck       == 2.9.*' 'QuickCheck       >= 2.9' \
+		'temporary        == 1.2.*' 'temporary        >= 1.2' \
+		'network     >= 2.6 && < 2.7' 'network     >= 2.6' \
+		'Cabal             >= 1.14    && < 2.4' 'Cabal             >= 1.14' \
+		'containers        >= 0.4     && < 0.6' 'containers        >= 0.4' \
+		'time              >= 1.2     && < 1.9' 'time              >= 1.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri use-network-uri)
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index a3594f6cd4ae..4a4ad2a438d2 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="use-network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 	<longdescription>
 		The hackage security library provides both server and
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
index f38bc3c65d6a..1641af2cc906 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1,6 +1,8 @@
 AUX haddock-api-2.17.3-ghc-8.0.2_rc1.patch 747 BLAKE2B 743b22c933a793ed5006664ff78b7b1691e8ea745f8dedf080a426c2daaadc69d4e7dced80e9872c7e6a65c56cf2946cf24f75219b2e9b8dc361598c8f27fed8 SHA512 813823790fceb96c8b314835896dac165bd4e91f888090c65cbe91dc2ac026e2d0bd79acb40974154252ea106a7dcf56d80da6af4dd67db59f8004166f29bf08
 DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
 DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
+DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
 EBUILD haddock-api-2.16.1.ebuild 837 BLAKE2B ad6019c4dd7dfb6c408372f22daee9d4c4309cb490ab6adf613575a01989ecc11a8ef42d5e65bf0b5c47cbeaefd3347bd369c25f5587fa7dd027261d8ec95cce SHA512 d533027bf3c3546e05450638c6168039eec533d3f17ced01bad05c781d823281ae90957f1964fa2ed63566aef8c05625a4c43d633bcb4dd25b19145ac42aa3f1
 EBUILD haddock-api-2.17.3.ebuild 1050 BLAKE2B fa65189aeb89200c0d55a4e30b29cda630d346ba3d6a6430a331f83515f73a626913080e02b6af7b9bfcd60ee9204cd548ed4da943128e4547e8e2fd760dc37a SHA512 1cdc9ddeda2cad2193975ebd504d2ebb1d319f6aaf0f0b3d10cd677b14880e7495eeeddf701820b34cc6d7f8b419ff63887b0dee099d15f687166ab3970f500a
+EBUILD haddock-api-2.23.1.ebuild 1086 BLAKE2B f1cdd9f7d6c64fb3bd25722db68c547e6c75ea6c0b5e2fc397d3ebc98debb864c78b5c87ed18d701d30d04acb43af3e15ba743626317775b28a4038e716e62df SHA512 3c5ba5d5dfe9fb91f0c16889a3b2fc8057d8d59cac5096767d3d30d1bf399dd26a67f8837fe833b68300519699c99f93e5de8b1e4f25ac0231a759d5be9fb811
 MISC metadata.xml 357 BLAKE2B 808036b0cf5b428f9488a39d294aec21cd83215e5224007492c96b6b49a296c5a350a1ba1fbc75e3ffdc33456a02f4669e45d3e740da8324ea9f635cbcd8a2c9 SHA512 0f4a0bb813ebec80793d97d4ab2df397fba47ffdfb19afc8de5262cd3cd627172a982afd9fd36ce25051285f3b33cc3ba70ede63de59ac7be7ff72d237b85db2
diff --git a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
new file mode 100644
index 000000000000..3d0bd06d30c6
--- /dev/null
+++ b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="http://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?]
+	>=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
+		>=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
+"
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 4493a05eda7d..9edfc687cecd 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,7 +1,9 @@
 DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee142471b8e7f53f5a77e89265211588cc80719e7fec49e35142b8288b4632a0548def65f9f2966d6838d79e75ec1574588336 SHA512 5f1a592af66a054482fc06ca8d974db0ebd4e42b383ec6b3fd7d44d155bd89c567013af1266e697b76a96b4d39486bc22eac7eb4b1d6842ec0f842533ac8dffb
 DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
 DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
+DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
 EBUILD haddock-library-1.1.1.ebuild 664 BLAKE2B aab3d7db8cba5626ed859b8a8c16036245d3d3d1557bb8d647f1cb46ec0359827f7b4c041f8c2cdb8fc4ac47469b25498aec7d66d020822c9fce9933ec4adef3 SHA512 461b622b104e531253546eb15b043d374c1853e2d9f219006afce7ae08d0f2b92d8592fae4550ff4bbd86146e277b0edf9bd80a16aecbc7c0ca68336520acb8d
 EBUILD haddock-library-1.2.1.ebuild 788 BLAKE2B 619f531f45d6d7cc9e470026e00c99e1004c1c8026fc03ffd23184f3d71d86484bf1a63c5858e54cabcb8fa8fd4dbdb1c03f50473699ce38e9bd0dfc4f8d2e13 SHA512 3e062c7652c1fd911fe9dab727ddbe11f5b3d5afab382337b4ac98b758bd0a760b1432acfac2fade49ec44e9d775dee7aef37078ce8e4b3c1106859e5338d4bd
 EBUILD haddock-library-1.4.2.ebuild 803 BLAKE2B c79dc51e3bb499e40127ead0cea5c873ea52442bae3b5c2b9d7e8837c5e7ed2db842a2bc52bd955e060c7d19d51c900d1cf7cbf1a849f71bfe8fe6ab0a87727f SHA512 9fa9237bd3befd6cbfee8b146cccf0e06327736ce985a2758813d38b1967bc36dc4a80273d373412fcbe38b5c060f51f3f7d3ea27cd79f21b0bd223c4da7c5cc
+EBUILD haddock-library-1.8.0.ebuild 1268 BLAKE2B dbc4a4a10086c4c62bde0a65a4cf6ef1c5e790cecc42e0796dff2c06e13bf186528c40b01e1b6d05eb6b6a595c84e74bb1f80ee9e74e466e631cc423253e41dc SHA512 cd186926e82bdf34af55cd084999185dfdbd874bec03051451d374481d77133a3027e7e9050fd133c1eb8bf8ea8b9038fcf77de3c05e4f3086840e43b1ebc4da
 MISC metadata.xml 649 BLAKE2B 3009fffda0bdf4a08fb7014a168578c8054cd7e701ca254b12debebf6aadf7a36d968d3d39a555767aef11646e2cc71707ab40f5ad77bc85923bdac3a3ac45a3 SHA512 316469b542dcc67cbf2c6f28a2cb7c3321fc13654349c59631c185ceeb2bc55b78d23b2bbb224ab7b19b1aa0d2d8237fb9ec98693e4420fe8e1556e5acd370cc
diff --git a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
new file mode 100644
index 000000000000..8bda04a8c3d4
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="http://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
+		>=dev-haskell/optparse-applicative-0.15 <dev-haskell/optparse-applicative-0.16
+		>=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
+		>=dev-haskell/base-compat-0.9.3 <dev-haskell/base-compat-0.12
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
+		'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3'
+}
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 58c0c0bf1b78..3517180a7a7a 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,7 +1,9 @@
 DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff35e1d104fcb05c4317f16e78c0517b27529c1fab28e2ee4f2e14cbf2db592ff88a6b01d1840193c9a69233230fec1ffc423 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be
 DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
 DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
+DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
 EBUILD haddock-2.14.3.0.7.8.3.ebuild 2045 BLAKE2B fcf79febc15cc898c6634e323dd25c901701e9080d4840bfaf93fa015ba5fcc60f4c99f014e001c3e658bb0569bfed050030f2175828bc7742453d85b5c35b74 SHA512 dda52be19c7f8cb561f60d0155aefec8c74a24436e21f5ef22e46782e8cf5a8ddb2835540ddd6dc2b9d84ef876f0deb61e3dab30e02dd0d300a6ee7c732e097d
 EBUILD haddock-2.16.1.ebuild 1919 BLAKE2B 195a42e6f55a9c94a5e0bcf5b1a8674edc4ddfb64fb913129aec1ddd09bb1a87756ae1db82d15744aab75c6e36b38961ca4f384c3f5b781433e3bc75581a9490 SHA512 f26c619dda53258e3fbcb286979ad1f3f21368d384091a11e729201e4408846a2f478a27844304c6084427f68fde3828dcc5b92064724f1734f20d2bd5272ed8
 EBUILD haddock-2.17.2.ebuild 802 BLAKE2B 8498ed4ea1900e4e28c5a76977bc33c74010ebea30f9376230e1cc839e60df7fd9b7a972594f75b7050647f60220910280ca162a2266aad782cce89010a7b3b7 SHA512 c0291127f88ab1ae5134343eb2eea1fd7890efe128835e1f2208f44fc04b5b690ea7913eae4ae3784ee9ca9f56b94f40a903769318d9d83706f2c3667edf59a7
+EBUILD haddock-2.23.1.ebuild 814 BLAKE2B 7a4100097c71ddfdeb1f3528eb9f646aa0935c8d439be60e48053f8385c1ac108f401305de67e19866ac3bcd21b09e142d802474c54fea0b37491dc48e27aa8a SHA512 eaf44280bb93043062f047ede3e696331de40e10550e3cc758cfc32da25a2f1681f3af728b952dff5ed64e7654261264676d5280bead0520bf06e7420f719eff
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/haddock/haddock-2.23.1.ebuild b/dev-haskell/haddock/haddock-2.23.1.ebuild
new file mode 100644
index 000000000000..d2e622f4d065
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.23.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -in-ghc-tree
+
+CABAL_FEATURES="" # test-suite unavailable
+inherit haskell-cabal
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="http://www.haskell.org/haddock/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.8.3
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # test suite unavailable
+
+RDEPEND="~dev-haskell/haddock-api-2.23.1:=
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+" #	test? ( ~dev-haskell/haddock-test-0.0.1 )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-in-ghc-tree
+}
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
new file mode 100644
index 000000000000..1204fada3b76
--- /dev/null
+++ b/dev-haskell/hakyll/Manifest
@@ -0,0 +1,3 @@
+DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
+EBUILD hakyll-4.13.4.0.ebuild 4077 BLAKE2B a0b3943c7448292eb0e88a6cacdf3a07866f91ffcd0c3cd0f0ad058c8e2f346127278f4da92a81f0555838a1309f5b2688662026c2dd263ecbaf9d8d7999b0e1 SHA512 faab39b62c01a1ed3043b3c065bc3c11ff727036b958211e76319d6b8946f168f15833c922f5ef306ea723860970572526ef71dedf69b324b0ede2ed43c3d7fa
+MISC metadata.xml 1181 BLAKE2B a22ae826a948f6941e935e93f5381bffb53ec0c532e571d5c903ce5670cdc615a1a4915b2b0b66530e21877e57eb55d2947a5d54da18df8e0030aeb6e369dd8b SHA512 104a8d369da505e931d184a37661832fa99c27412b4e4e8c2dca8b857aaba48258a0fa52d47fafeb964b1633255a38b72383fa439038e948631730da02f07a8d
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild b/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
new file mode 100644
index 000000000000..234752180902
--- /dev/null
+++ b/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A static website compiler library"
+HOMEPAGE="http://jaspervdj.be/hakyll"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.12:=[profile?]
+	>=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
+	>=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
+	>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+	buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] )
+	checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
+	previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
+				>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+				>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+				>=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+				>=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
+	!previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
+				watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
+	usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?]
+			>=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildwebsite buildwebsite) \
+		$(cabal_flag checkexternal checkexternal) \
+		$(cabal_flag previewserver previewserver) \
+		$(cabal_flag usepandoc usepandoc) \
+		$(cabal_flag watchserver watchserver)
+}
+
+src_test() {
+	# unixFilter test expects 'option' output in error message
+	# But it's a localized string that:
+	# https://github.com/jaspervdj/hakyll/issues/607
+	LANGUAGE=en haskell-cabal_src_test
+}
diff --git a/dev-haskell/hakyll/metadata.xml b/dev-haskell/hakyll/metadata.xml
new file mode 100644
index 000000000000..75fb004f1986
--- /dev/null
+++ b/dev-haskell/hakyll/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="buildwebsite">Build the hakyll website</flag>
+		<flag name="previewserver">Include the preview server</flag>
+		<flag name="checkexternal">Include external link checking</flag>
+		<flag name="watchserver">wait for filesystem changes and rebuild pages</flag>
+		<flag name="usepandoc">Include Pandoc support</flag>
+	</use>
+	<longdescription>
+		Hakyll is a static website compiler library. It provides you with the tools to
+		create a simple or advanced static website using a Haskell DSL and formats
+		such as markdown or RST. You can find more information, including a tutorial,
+		on the website:
+		
+		* &lt;http://jaspervdj.be/hakyll&gt;
+		
+		If you seek assistance, there's:
+		
+		* A google group: &lt;http://groups.google.com/group/hakyll&gt;
+		
+		* An IRC channel, @#hakyll@ on freenode
+		
+		Additionally, there's the Haddock documentation in the different modules,
+		meant as a reference.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hans/Manifest b/dev-haskell/hans/Manifest
new file mode 100644
index 000000000000..154d478d4f41
--- /dev/null
+++ b/dev-haskell/hans/Manifest
@@ -0,0 +1,3 @@
+DIST hans-3.0.1.tar.gz 102002 BLAKE2B 2344c30c2143c38b77316cb34b35b38b9228452ca1a5ef0ebf2faf6f74d66a4a264db1f4d336ae86f5ab467cde4c2a914af22cc222110f649ede0bdecaadf5d4 SHA512 4495feb3bad78e8502bf1213727a130cc4e190dae54c1876ab353a919bfbce8e2fc370f3a191223e92944b3dbbba8a57e69c126d70c4ba65801eeb22a4edb55d
+EBUILD hans-3.0.1.ebuild 1165 BLAKE2B 45d666ae13b313f566e48fcc151654cb549c9aab70226a408f7980525e48900e4ac965d24cbb1dc46b70d74c87fc200bda724f200fe71c369fa0d6b6f47d981b SHA512 ec6bdf42fbe7d1bd7682cafb43f69abd42fab32a7edc908e584f71d48c58918c3d9e22c96661386e7a1d936c0fc7e5f71b547b85ecdee2f0c881f05c68d249d6
+MISC metadata.xml 522 BLAKE2B 9ea735528157782d76fe8c0f321f46e05f8c8038a16ad316d980139056949ed700579eb62160cccdfa86d282783b4c9ad62af321eedbeff170cadb4083b8df4b SHA512 4c29e14f7f7e4ef68ae3386ba3224fc473d5dd5b25b8d2cbb0f2cd0801603ddd1f54cccd9f9fc1a494258a6d67597b454bcaec0b6dfc05f8d2f5e770b70f03b1
diff --git a/dev-haskell/hans/hans-3.0.1.ebuild b/dev-haskell/hans/hans-3.0.1.ebuild
new file mode 100644
index 000000000000..8095c489a087
--- /dev/null
+++ b/dev-haskell/hans/hans-3.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Network Stack"
+HOMEPAGE="http://hackage.haskell.org/package/hans"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RESTRICT=test # some test did not survive QC-2.10 (unicode string generator)
+
+RDEPEND="dev-haskell/boundedchan:=[profile?]
+	>=dev-haskell/cereal-0.5.0.0:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/heaps:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/monadlib:=[profile?]
+	dev-haskell/psqueues:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	test? ( dev-haskell/quickcheck
+		>=dev-haskell/tasty-0.11
+		dev-haskell/tasty-ant-xml
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples)
+}
diff --git a/dev-haskell/hans/metadata.xml b/dev-haskell/hans/metadata.xml
new file mode 100644
index 000000000000..0c6e0b4ba623
--- /dev/null
+++ b/dev-haskell/hans/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		HaNS is a lightweight, pure Haskell network stack that can be used for Haskell
+		networking in the context of the HaLVM, or with a Linux tap device. Currently,
+		HaNS supports 802.3, IPv4, ARP, DHCP (partially), ICMP, UDP, and TCP.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
index b4ebd34db81f..605854ffdc1d 100644
--- a/dev-haskell/hashable-time/Manifest
+++ b/dev-haskell/hashable-time/Manifest
@@ -1,5 +1,6 @@
 DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
 DIST hashable-time-0.2.tar.gz 2111 BLAKE2B cf4dec1e99e2d76a2137b121cfdc109cb527d7733f893b5d74530bfac8708aa1246168c6439b2da157e15384fdce26f203070fe3151b5bb65676c1a08604a3be SHA512 0a05707019f2cc19c26a4dac955c5f31f334589074b7ecff15ae60654dea1376205b897d674fa4b1369dec62ca4f93a061250baabccf30f877ea984495df1211
+EBUILD hashable-time-0.2.0.2-r1.ebuild 851 BLAKE2B 7b452827e6db3adfa68d947ad14c300fe9063b34827e0a9914f9e1096cc9b1afd48f3d0c0e4fb2bf683dc201efdbb776dd18c7966f84524ec965e505d195c0c3 SHA512 fe2697b8783f2c6daa8a6a415747a7173efba1c1c1496ec3c3e83021c929bd492a96a095ca01d7857a01d5812574326a845c616d883632b0a39a9b86c50df71d
 EBUILD hashable-time-0.2.0.2.ebuild 715 BLAKE2B 7bd6ea22713dd46603bdcdb0f6ac83ffde6fdd138e5eb883dc7235fd5b496ef19985533d9db599dc66ab646edc81e18285c33c663ee519c29ec6a21cb7d74e5b SHA512 0162e71805f8896f0ae17b79a59bb16407bafc1336eb178a5c3c925a199eddfeca117b28c30b2ea9d76014448132bbb94cc3a8275b090a5b2d8045405d7f2abc
 EBUILD hashable-time-0.2.ebuild 810 BLAKE2B eb0886d1f2245f127645ea9a687d8b92226b01e5d2b2bd3b12eb4c845c6a79dbea54dbd7c005ffb3d6bc22f6a02d22c6bd5a4c4b88e25e1d7c77371479ed707d SHA512 b44a572538361ba381a218441d3022ffc17f123bdec6dc5e5f42c050e8031635711796b39953f1f07de9d7145426ba247d7ed01297498e92f6b9c3b488e9dec6
 MISC metadata.xml 332 BLAKE2B 037093d6fb99f66788bf24fc26ec14eddea9e7451975a90bfe3ac662d3de01fe4a2e253a3651485e103709104358237f03cccc91d582229847fb58c537cec4bc SHA512 84562d5e5861a05e4920fdab8511b6d0be31ff1415daf7233141d961812c9e919f2a1ea51ccbd2f68a8cddfdcd74008c427a44460fddbb957c5165af3134bc46
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
new file mode 100644
index 000000000000..f0ca382bfa40
--- /dev/null
+++ b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Hashable instances for Data.Time"
+HOMEPAGE="http://hackage.haskell.org/package/hashable-time"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.7 && <4.13' 'base >=4.7' \
+		'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
+}
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index 5f124a5b198f..c1a001ce35a7 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -2,8 +2,10 @@ DIST haskeline-0.7.1.2.tar.gz 68251 BLAKE2B 0e28ee337d1d7979d7ae81cf73d9b2d7e566
 DIST haskeline-0.7.1.3.tar.gz 68291 BLAKE2B f1e645d7cd4886cd1d7b9cd42ec64b27dceaa8d3f3d569555d3cafe792effc34550a320fe221f3278e33abe390908149990299e041e9480682aca6d649f6b102 SHA512 eed183edd1af5b9d77c61278c40f07599900793e47858771810b48cbd178c34a06264910dd5484f76e5a03e53551e1035e1d291d8e3577ec6f4f5a9ba8d61d5d
 DIST haskeline-0.7.2.1.tar.gz 68409 BLAKE2B e966c75e476e5167fc3b59c4c92d00af135b96f52790ce4641771fcc5d5f25e8c21abb64088da183559e4fec60a985def5d3c90e3f34b292d3d690f2b81c3aa9 SHA512 a2f790b9bb27cc8681567c3c0c3476231976d08a0e2d1e9fb69301f55511edd0221034ae8af27ec4c9db4b15f2d72b8b716d013518d0b8d15d98e859dbf0321b
 DIST haskeline-0.7.2.3.tar.gz 68332 BLAKE2B da80d367102c61775956c5c07906ef4848df60ec1af00a2a0f0199ba06219515f57681a0f158ff7a4c2a478f5af40716a6f240f16a49249249e78cf2a6892a41 SHA512 94e24ef66c7a782057c3495eba74b7ae3c703bff47b2598c840e1372b2b19a09fb97c5075660074ef6bccde9a6c35e234df06fda5de103e2fe5b4fdf7df069b8
+DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
 EBUILD haskeline-0.7.1.2.ebuild 1120 BLAKE2B 9ef0e3ab0606ca89101af54890412f960a72f9911d41bfc73d67fd419e6dce88fb8801bff001011f5d9a49679ec9b226f7e8577fc2200fc60b47bdf28f65b168 SHA512 c22f91ec736e3b0f71c26ee28f8f89887f46c6ec89f2f298b0611a63d91709ab7e67dc0e3fcc371f0a0858de5d413b78e1b5f9a47f85633de7bac9bc387a1bd8
 EBUILD haskeline-0.7.1.3.ebuild 1086 BLAKE2B cf40e166dd8a5b03f0195681616b848ea9db8bca4650e7135bd6215266772e2ec267914ef2a1a33985731dc0cb2d4648df1ca8a71149af8f7bedf1724766c67b SHA512 ceed63f1ce489e60b700557b6421de8d27b2393f1945e9939c0f7264b677b5d62dd08a8bba55499acb98b0351c45968cfa619d5139fe503df647cada528513de
 EBUILD haskeline-0.7.2.1.ebuild 1227 BLAKE2B 47124c536636861f7bdb60843f13d90156ad09a2a8e80b067058167179d1999a88013454b32744da7e24aad5c33a404e8b6fe78afde081f2eb2957d833b83ecc SHA512 4487939f808d0b02cda366ddeac53054388c4ceb4b85aa1fe2d3e4d3eda06119fc184292342972e4818359e1a22f3fc1918c65651f9e14c6b7932ad68f4940c9
 EBUILD haskeline-0.7.2.3.ebuild 1276 BLAKE2B 52f1fa001db855db6c006c4ff76e2429df6b4afc77048dda50ca14880e6ce3d4112b5c7fd137b34fabb8677f5a95c432cdc6a880427efd10e3208e5a75b97ff7 SHA512 6c67a61f386366dabb389a6d10c33229732f351fe202f1a01d673ea0e105e41312af13b74129633627124f26e9a77c821417bea8186ef6e882a0378dd5e7e098
+EBUILD haskeline-0.7.5.0.ebuild 1023 BLAKE2B c96cf5336f95e68466c744ddd7d40b7b5db60b84d77fc88149e0c6e85f27b4d88c46417da8299c24c54a1e6a1f7e954c5517aaa1c4f6284914b5fe41494f97d6 SHA512 1b30ce1e6aa13af6913ce09c00f44b8666aa095c1791a3e96e4538377647a175677034482426cb452e38d0edcaaac5480c3f50499591914b50aa8f6d0f04ce38
 MISC metadata.xml 946 BLAKE2B 160e58571e6f868f90e507b4309ea26c352515a4ca67071a8fe130af4d1f2807aa5b123f7f1f0dc2dae4a1a5a3d3ceedce3ab63e65f9da711b522d079e64fded SHA512 dfecbff217817c7e7588112e7fcc36f95c8520423d7b023f979c1316bd314efc62e2d7cff8aa7ca9716bf19ad98d205529ef11b56c4557e2a40624a1c0656e18
diff --git a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
new file mode 100644
index 000000000000..ea4773a729a8
--- /dev/null
+++ b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A command-line interface for user input, written in Haskell"
+HOMEPAGE="https://github.com/judah/haskeline"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+terminfo"
+
+RDEPEND=">=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.9 && < 4.13' 'base >=4.9'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag terminfo terminfo)
+}
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
diff --git a/dev-haskell/haskell-src-exts-util/Manifest b/dev-haskell/haskell-src-exts-util/Manifest
new file mode 100644
index 000000000000..cb5f83203e52
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/Manifest
@@ -0,0 +1,3 @@
+DIST haskell-src-exts-util-0.2.5.tar.gz 6428 BLAKE2B 42211d72756d97e7761148b8cc0d7b2a548db38b007d506fc1cad3ef2e7003e352c225201e047683c82b4ec8561825170b6976f36a4d824d3595173023f2b76d SHA512 0497d8e2206402cc295289b1893f326c8f5fa7fc00177279b7af389b3351a94a123d7eb754d8a245981bae51d1a978684791d9b111befca2888bc7fe22f07147
+EBUILD haskell-src-exts-util-0.2.5.ebuild 730 BLAKE2B 4d75d3ceca57644959726663be8b574be4c2ae106fd500447de2bfdb47f6112a8e1b7701eb30d59c9a3dfd72364d8ef3b65f194d28dd674cf620eb1eabf6798a SHA512 9c375b6305d4ea1fc23fc1bbb04aace9aaa428a5c5acc68a18d8a0e5257561a3ebe2bd761b9664fda649fd64147df3d6295f386168e8aea7e5a805ae033a739d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
new file mode 100644
index 000000000000..ce057531edb5
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Helper functions for working with haskell-src-exts trees"
+HOMEPAGE="https://github.com/pepeiborra/haskell-src-exts-util"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	>=dev-haskell/haskell-src-exts-1.20.0:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/uniplate:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/haskell-src-exts-util/metadata.xml b/dev-haskell/haskell-src-exts-util/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 65373dd594f4..034c6ac732d1 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -4,9 +4,11 @@ DIST haskell-src-exts-1.14.0.tar.gz 291256 BLAKE2B e0ec5d12d8f5a0fb2fb0745fbf2db
 DIST haskell-src-exts-1.15.0.1.tar.gz 1605910 BLAKE2B 47672c636ff8da5ef38ddf83a895a454667e1c34723cb339d3f665e3a5acf678b4b9c3b1e8c2887a99a3922a14e3d310439113ead871d5869ed51b3ae9b44eec SHA512 d6fe854b2e7a13bb90815848517843ee67faad7e03d5abf6afc9e97252bcb9d915b51d94b757354a9e83b255f9b795e5c9fa2e3e962acd84772eaa9844d9b1d6
 DIST haskell-src-exts-1.16.0.1.tar.gz 1410081 BLAKE2B 6fea8732c6ea264040eb4fec73147463a530f42fcb201190b393aac2461085770853dd0f7615cbe2f2aaf34f75921180565bc72c98dacdc3190c39a08866943f SHA512 b74a824899cbf85a2bf58c7c14df33fac7e70bbb775b51d8a861172da88d1dc6db3644a6534c9076a9c5499023a347cdce7e24b3495045d11a905f31a51492d0
 DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
+DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
 EBUILD haskell-src-exts-1.13.5.ebuild 1109 BLAKE2B e90949843788eaec50cf6a2a70c5caba3be7fb71932dbb8c321819c105829122421b4861869cecbc2ecc6fc6f2ca04f17af34c31b115ea03abd2a3bc07288cc0 SHA512 6f9fb2e68e5e1b38f34c9ce46bcf60a1ee06e3cd5ebd8e2329e741bbf3c28b682ec4a05470d51694a1804373715dd26a938a24a65dfaf6e1b8907def82939b14
 EBUILD haskell-src-exts-1.14.0.ebuild 797 BLAKE2B 5eae75b64d22a3b2d7f862c32969c19512a62ae7a4f9e53edba7e539c2b22fdbbca0cca1b2c209856c68a2f904835180fa6195d4b4d6168215cc3babc9e3557b SHA512 879ccc6187dcd53ec5f16514f73ddadcb0e791b7e365889f9aa1ce2761ad8badab2525738ba12df0edc2b913d893afb90da938033c1e5b9b1c6222ec8a014fc0
 EBUILD haskell-src-exts-1.15.0.1.ebuild 946 BLAKE2B 41beec5a1fda84f0cc85d06250d30d986cf67edcb374c5de23e9bd5781915cda6040c91df752dd4d7cb663752ef7b7a7f307a93a22519723c61388483dff438a SHA512 eca1df8b206f68e91d3cfa48a87dcbdfe59c39f77f43ba41a1c219f65c25b238242d166d452b93273d8b185a7d757df2d99996dd0283b004a3ac6a1a0b02df30
 EBUILD haskell-src-exts-1.16.0.1.ebuild 932 BLAKE2B cb421d898d8b457cd0881a521e0d156453eafb5a436dcd96c572cf5d7777345b3c5f36242f749402a0f07885f604009d3650384953c4c3de85cb2b1c965266e0 SHA512 9398fd189e317035cf5a088da0d05409d7b135c34d249fa9f273462b111d160bb0d0134ccc415e2ace8aed8d0320ab2cca80ee841d2185a0589f061b368a70fa
 EBUILD haskell-src-exts-1.17.1.ebuild 1079 BLAKE2B f717875a8ae3abd8781edd68c524951a51265f277f20c067e5fba72ffb7272c1ac249226201f6eac0ca3bdfe17cf65906913b8ebac2c998ea00faff099ece430 SHA512 8df3cab3c83f8e57ea03c8361a11cf41327152f7044b6b3eb40dd9aa07524f4511a5fdc636d56325e31e56ee8c1f0436629622c94f4ab8d613d814f317c6d9e1
+EBUILD haskell-src-exts-1.21.1.ebuild 1014 BLAKE2B 986d5d068def2da1997b61323a77f6c03d3020dd3eae0469216e76464b3f0b5357f6f6d32987a7d8a63045c765a70c95f4eb20d991b062d28886f5e5a350ae4c SHA512 5ce4a51e6b06879985310982edbb9699c3d54351d208a58385a8688d508eae872879a5da25630c23d8f016a5dd9d3f657063371a4a69d33cab0d8cc22b222287
 MISC metadata.xml 778 BLAKE2B 88754b796b4201cb9fd07d237a7c750dfa5f2a306e152bc8e0dedcf410bbbf0836d954e4522dc39790e18f83858844380d96f25be34f3133a042a234d6d50467 SHA512 ac9bfe683996bf5860b908657539f7cb79fcfb300cb6e852e18d1400fbca52e4d7320c525b15cd9a7924bb5be682d75bb5a5f4435012e49eaa66e1076fe73289
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
new file mode 100644
index 000000000000..9f059879744c
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
+HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.21/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/semigroups-0.18.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	dev-haskell/happy
+	test? ( dev-haskell/mtl
+		>=dev-haskell/pretty-show-1.6.16
+		>=dev-haskell/smallcheck-1.0
+		>=dev-haskell/tasty-0.3
+		>=dev-haskell/tasty-golden-2.2.2
+		dev-haskell/tasty-smallcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
index d5ccf83c1598..aa3c74091a5b 100644
--- a/dev-haskell/haskell-src-meta/Manifest
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -2,7 +2,9 @@ AUX haskell-src-meta-0.6.0.8-ghc-7.10.patch 2741 BLAKE2B 7c776bbfe35f8674019b80e
 DIST haskell-src-meta-0.6.0.10.tar.gz 19432 BLAKE2B 8984179d1964cf06f918175cb08efb444fd8cf7cdf52ac2617b399657dbcf5ba73841fc80fce0dddba1a2d4a21548d3bbbde74ffb49dcc259b4be0ec6c22c5d3 SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d
 DIST haskell-src-meta-0.6.0.14.tar.gz 20079 BLAKE2B 49d25b0061d46a0f55cc946944e29022998f1b3929df8632a3b74acbc6392054a695585aac5d2e166945ee4e513c1b049d5321c8047527cdfac42ebd23989a17 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f
 DIST haskell-src-meta-0.6.0.8.tar.gz 19449 BLAKE2B 0f8e21e01e26e2eddd8ebd0835b1f69e3dad3111cf7ff264c56a363f8b6f4bd7684ad3fc413c3d1584727d6ab914aa699792a98a092d91bfadae41018f73eca9 SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751
+DIST haskell-src-meta-0.8.5.tar.gz 24027 BLAKE2B f94f88fa7a5edac23cab13de346056a3b9f6fb30e47de8f98142378211d7d12ad1622317bed04dec3cc322730023b0cce5e571016b6325c05e2503fe9fafa73a SHA512 873a797f53fc30dbb51b719228bc649f47d1c3432380a82b5dca11574b432676ed29d297c7547f1d752bb1c977c8858e55fb5135ffb58146b938d02414fe6723
 EBUILD haskell-src-meta-0.6.0.10.ebuild 813 BLAKE2B 78fc430196c6edc961b317685996b9bf7a1b2c4eb87c183a7fc0406819d93808c92c7a6eda719cc303d4d2d5a0afb58b1b308ae19b50e5b7d85881555622f425 SHA512 90df8937cf11d551a9469a2e82614c56790a1379a20cb3bd90b6a47ad9f825c19250d61cb821522e530c09a81d09448911b942f203272333d6c8a258bc2c70fd
 EBUILD haskell-src-meta-0.6.0.14-r1.ebuild 811 BLAKE2B 66a71726087624eaf67ea975ff3f4560de4ce436a5da25026d49539bf6b3c1887f4349b6e622d8df6872d45b0e41301402f02c958a4d6883e95eb451babe23d6 SHA512 5506be30926cb46bb2e304277827898f463515280b148bd1ea9fa7ac68fa067c1ea530808be492f360b1172bca9fc413575486f4554c810aa25a9bc3374c7ab8
 EBUILD haskell-src-meta-0.6.0.8-r1.ebuild 928 BLAKE2B a39d9aaa5941dbda954a76f19757e0a584069e9320bcccbcb135f363d2ced87ca424325138f3d9e3a22b975d9ef2e6e237235fc4a502ce7e1f53ecc2672924a4 SHA512 7761acd29d4f928efd8c0e194cadddd2756d1596e64c3dac1bf210d7a49c61050b379674258fca8d6ca78bae5400575493916442aaa0cb4ad2ccc46aa691d983
+EBUILD haskell-src-meta-0.8.5-r1.ebuild 1084 BLAKE2B 10978d69351a01282ad4ca6a642c1a71128a5cb5bec5e27a285caa7d6d2cbe0cbc19aa8a7206d83aedc13a456a15ab15256e1046956e4958a41e5aaecde5e72c SHA512 ee4fdb5505d8187154d8c43598d82cfd674251b1dd45854a1b40a4effe0a19cf14d58ea3373995b9e4d7b61e5c2c3cd298b746e02642748162bffca24850808a
 MISC metadata.xml 407 BLAKE2B 6b7053f4f1a93c0605e72ea519385a9784d55028bf184ed28a491a56ec64167188b4f97b2b26b32b28a79e8ed4e309930f7a4efb0d587eab8974b0a4cd931b3b SHA512 25b2811713d5574b1787c699c9d24beb1c694b8a397f1bfda992d0f3e6f53d3ec3a26e46beccf1d60d1df574d2c8ba85b58075d40216d3bd224904415f57410a
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..a7392d7d0d8d
--- /dev/null
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: fails to build
+inherit haskell-cabal
+
+DESCRIPTION="Parse source to template-haskell abstract syntax"
+HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests/Splices.hs:69:77: error: Not in scope: data constructor ‘Extension.QuantifiedConstraints’
+
+RDEPEND=">=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src-exts-1.24:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/th-orphans-0.12:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'haskell-src-exts >= 1.18 && < 1.23' 'haskell-src-exts >= 1.18 && < 1.24'
+}
diff --git a/dev-haskell/heaps/Manifest b/dev-haskell/heaps/Manifest
new file mode 100644
index 000000000000..2ac6d517b9c5
--- /dev/null
+++ b/dev-haskell/heaps/Manifest
@@ -0,0 +1,3 @@
+DIST heaps-0.3.6.1.tar.gz 12440 BLAKE2B 560a605d91b1481ec9e69510d1634e45bad2dfe589ba2fa6d3eb5391837904a9bb41fa7bfc8a6472862ae163905bc178fd71d6e60fb92c6ab8c630d3bb2ac7d1 SHA512 7c3cfb4ca95538a51b418ab2d42171883c9c51860f63e6836d42845a43cead825016fce74ed5e866decf0a6812433c3ecd6989161f2303939bbcad8ef4aab0ef
+EBUILD heaps-0.3.6.1.ebuild 537 BLAKE2B 37aa68b3cd18a3452dec3ed6b27cdf4a4049e58dd20ba3042ca649a7674b381bb1847c01a1dce80449e9f345e6e4837feaaf6f2facb3bf5213e2b02202ba204a SHA512 72942317c8e7caf81de15ac8a8e1198f65886181d1135542971d900b22d94c91aabf0895922775727b6d4abcf632ce16e42b588a62b0a07f9fcfc60f50e66cbe
+MISC metadata.xml 459 BLAKE2B 34a23eecb5b4ea42e712f543380f2da9111f5e0231976a7f80754ae65bc5b758af48baaa4b8d889bf2c4f771a2a2c5d3f7bef82d1632735659ed7bb2332c9a79 SHA512 00a08bef5ef8536f3a3f72a7b860b1d29b8ff82a9356c35394e12a5d08b272cdb708b0e1138d87e42c339cbcd0258f9cdd54033ccaeb8aafd7cb1c9abb7b083f
diff --git a/dev-haskell/heaps/heaps-0.3.6.1.ebuild b/dev-haskell/heaps/heaps-0.3.6.1.ebuild
new file mode 100644
index 000000000000..7535de78d815
--- /dev/null
+++ b/dev-haskell/heaps/heaps-0.3.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Asymptotically optimal Brodal/Okasaki heaps"
+HOMEPAGE="https://github.com/ekmett/heaps/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/heaps/metadata.xml b/dev-haskell/heaps/metadata.xml
new file mode 100644
index 000000000000..1fd7401edc94
--- /dev/null
+++ b/dev-haskell/heaps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Asymptotically optimal Brodal/Okasaki bootstrapped skew-binomial heaps from the paper \"Optimal Purely Functional Priority Queues\", extended with a Foldable interface.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
new file mode 100644
index 000000000000..295e9d6f9bf6
--- /dev/null
+++ b/dev-haskell/hedgehog/Manifest
@@ -0,0 +1,3 @@
+DIST hedgehog-1.0.2.tar.gz 66986 BLAKE2B adb4e40bedb3ffa76b39b8ee87fdd4a05d467c5a0d9e225257123ea02721a5bae5146a9e0d2d0fb79ca0d0dd41987559da2ae505662652b9e97aea3c25d362eb SHA512 b34004210f4af480e10e6fd0a715ee0efb7d718a7c0d8b84355639064b105840e59be223e90cc4fa26a9fa564df6d9686e77b03d996a8820955b19a6ef42c1bb
+EBUILD hedgehog-1.0.2-r1.ebuild 2273 BLAKE2B 49f87a7d8ad30197bf46979540dd62ddedb2b77f4f85fad5b8b7f098f44591bf3943ee91082dee991a65b30a6d03612d314148a591622f130a7ad50458f974c4 SHA512 63b375e94b00e847c834c5b857fe5bc8695ee567ad090a1e53498050b8116956bbd965903ede31c250f460477995dc4211d5dffe7466395268fe905e8684e938
+MISC metadata.xml 612 BLAKE2B e9c79854510cac1e5f3d11a701d3d8d478f690183434819dfa9dcf052e9e3b679c1827fbc989339b1e6740ab2dbe756985b502d0ecf28b295ccbd7995dd75a7a SHA512 c02f6852606af839838bfc9395be1d8a09cdc3a4f15916c41b8eac9c6f61e362c42e40c0ab8306ec720c562455b031f5eca0d4fcb132e90a8a707f39e322966d
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..4eb9dc8b0c26
--- /dev/null
+++ b/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hedgehog will eat all your bugs"
+HOMEPAGE="https://hedgehog.qa"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?]
+	>=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?]
+	>=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
+	>=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
+	>=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/pretty-show-1.6:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'template-haskell                >= 2.10       && < 2.16' 'template-haskell                >= 2.10' \
+		'pretty-show                     >= 1.6        && < 1.10' 'pretty-show                     >= 1.6'
+}
diff --git a/dev-haskell/hedgehog/metadata.xml b/dev-haskell/hedgehog/metadata.xml
new file mode 100644
index 000000000000..ac25dafc9a45
--- /dev/null
+++ b/dev-haskell/hedgehog/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Hedgehog is a modern property-based testing system, in the spirit of
+		QuickCheck. Hedgehog uses integrated shrinking, so shrinks obey the
+		invariants of generated values by construction.
+		
+		To get started quickly, see the examples:
+		&lt;https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hex/Manifest b/dev-haskell/hex/Manifest
index 46646b1058cf..db818a2094da 100644
--- a/dev-haskell/hex/Manifest
+++ b/dev-haskell/hex/Manifest
@@ -1,3 +1,4 @@
+AUX hex-0.1.2-monadfail.patch 570 BLAKE2B 70b1b3b549ca2ab19000f5397699d8bb7e33888498f239dc55cb0925d40429f5a56f03aede77bfa541a52f2d71861eb21a29f0ef13371d8e372ba0cea71db111 SHA512 191d6cef71afe277d21694d2185cf0a8beb3ae2e1f6aa9fa1056cdb9287115cad7912e64e8b44297d74632f1180cacba28eb0adb5cfad1ff019ee74850faf319
 DIST hex-0.1.2.tar.gz 1956 BLAKE2B e0552b6278e2be4e8985e9d1e17f653f9fa401a6324dc252c4fc0e6c200564c972541bc9ac37321bff41fa9c52555ff95679a9dc1fdea3e836d88d6016c7a6e0 SHA512 30608035819260b94759d644644b92a7145defa000685de53323ab4e765250ead410010e4ab96e99b97af647e97394c86edaf92cb811aa5df8228669b8ff9b4d
-EBUILD hex-0.1.2.ebuild 538 BLAKE2B 18e41716ee59385b8b7714d51913c8d72a5f35f61c76609d1515a775690362e03fd0c00e4e572c70f98775b3c02d544082f99dcf3663dc2617ae8a3018806b9c SHA512 1747407cfa8df9d96a17dffca02f21a9053e341a669913da7c744479285af8dc04546f110d86fefc51d23d53c79c9c729e26dbc08c56b8178af3104cb98440b8
-MISC metadata.xml 333 BLAKE2B a530600c09444c9f02f4ca81337b0a5842b100967ab980262b8f68cff01ae59e66041be5ef6949de9d774d39a56ebd915b835b7e17d14606593185f4fe540d19 SHA512 156ecbeac95459ddb51076e7c9d12d663574dbcb483f702fa52c14620297e248d4a631e28143da60f810e4d9742e8c893ddf9eff1bf563db3930aada190de5ac
+EBUILD hex-0.1.2.ebuild 585 BLAKE2B b58a52c591dbe0bff6c8d9f4f963e08afdcd305c65248125d4777f8c2fda20558960fcb0a8029c44cd2cefc0b22da828e6142e2a965710e30a96788d843ba554 SHA512 7bb449cfd091b9ca328bb180fdb2822ef6a441782cf6637fe3d96560f698f1b41a3e15c0b3c3fa1353e478480a2e838d7a9a80236f94a65d5b95fb5840e18ffc
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hex/files/hex-0.1.2-monadfail.patch b/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
new file mode 100644
index 000000000000..27caaf0774f2
--- /dev/null
+++ b/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
@@ -0,0 +1,20 @@
+--- hex-0.1.2/Data/Hex.hs	2011-10-11 05:44:11.000000000 +1100
++++ Data/Hex.hs	2020-08-01 12:28:49.166983032 +1000
+@@ -22,7 +22,7 @@
+     -- | Convert string into hexadecimal.
+     hex   :: t -> t
+     -- | Convert from hexadecimal and fail on invalid input.
+-    unhex :: Monad m => t -> m t
++    unhex :: (Monad m, MonadFail m) => t -> m t
+ 
+ 
+ instance Hex String where
+@@ -37,7 +37,7 @@
+     unhex [_]      = fail "Non-even length"
+ 
+ 
+-c :: Monad m => Char -> m Int
++c :: (Monad m, MonadFail m) => Char -> m Int
+ c '0' = return 0
+ c '1' = return 1
+ c '2' = return 2
diff --git a/dev-haskell/hex/hex-0.1.2.ebuild b/dev-haskell/hex/hex-0.1.2.ebuild
index 766e8f4a5a41..af2b7cfe8906 100644
--- a/dev-haskell/hex/hex-0.1.2.ebuild
+++ b/dev-haskell/hex/hex-0.1.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Convert strings into hexadecimal and back"
-HOMEPAGE="https://hackage.haskell.org/package/hex"
+HOMEPAGE="http://hackage.haskell.org/package/hex"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -17,8 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
 	dev-haskell/cabal
 "
+
+PATCHES=( "${FILESDIR}"/${P}-monadfail.patch )
diff --git a/dev-haskell/hex/metadata.xml b/dev-haskell/hex/metadata.xml
index 3154e9fd1185..b7878815d80d 100644
--- a/dev-haskell/hex/metadata.xml
+++ b/dev-haskell/hex/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Convert strings into hexadecimal and back.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/hi-file-parser/Manifest b/dev-haskell/hi-file-parser/Manifest
new file mode 100644
index 000000000000..8d11b6fada68
--- /dev/null
+++ b/dev-haskell/hi-file-parser/Manifest
@@ -0,0 +1,3 @@
+DIST hi-file-parser-0.1.0.0.tar.gz 9344 BLAKE2B 4fc453a2a14c43b59ca060cfe69464693fbb3e2368919a1ccb7a01e3853d8706ae86c4d674fa28b66ef454af1092b303f1e57d774992aeee3519014d1a100a9f SHA512 e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f
+EBUILD hi-file-parser-0.1.0.0.ebuild 670 BLAKE2B b002daa6315c9bacf8929dbb0d6ed89dbb9a1f76e341c34dfe24900b584d3b63457b335ba36c8b83f31942f9d588cbafd47680163111b8f424d6b1fe95ae1aec SHA512 06de7364732c828cc65ac91842009ac28680de1d3f60e68f1e69b9fd5dba244ad80ea7fb3b381dae1267d27eab94dc3fe2658a0ce8d5f96c2c4578abc64df1ef
+MISC metadata.xml 418 BLAKE2B a07555c8dae26ebac34ad43c1023d34f93033ac1e18e39b78303a822de9e865c178bcae12c12c9bf595e16a02637fa1bbc626799f6ec399b6bb0e6dcc04b8b0a SHA512 7a52bdaa380fcd5f48dde2b82c4e4301db6fa356cfaea332a2c11a9902994a88cbb80f08b1755710a9c8f40bf50ff13624464cedb17cfe76d015df98a6f71a01
diff --git a/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild b/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
new file mode 100644
index 000000000000..86a7e0ea8fcd
--- /dev/null
+++ b/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for GHC's hi files"
+HOMEPAGE="https://github.com/commercialhaskell/stack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/rio-0.1.9.2:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-2.4.8 )
+"
diff --git a/dev-haskell/hi-file-parser/metadata.xml b/dev-haskell/hi-file-parser/metadata.xml
new file mode 100644
index 000000000000..f51f432d327b
--- /dev/null
+++ b/dev-haskell/hi-file-parser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Please see the README on Github at &lt;https://github.com/commercialhaskell/stack/blob/master/subs/hi-file-parser/README.md&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest
index 63bb2af1233f..5bd50355a3a5 100644
--- a/dev-haskell/hinotify/Manifest
+++ b/dev-haskell/hinotify/Manifest
@@ -1,3 +1,5 @@
+DIST hinotify-0.3.10.tar.gz 9193 BLAKE2B 877f98091412732656913f7af9e29e34088d240ac88214afd237e2994730f119a80db3960f27ad3a024026dcd8bb232853412aa314f416555e27886f87fda64a SHA512 d22f40bb055e14fd4be6669122a11b36fd7c5a989489d1b8c1e4117672b9f1700197a827f23242c91504b8236c349a4494adf724827001a77a1abdc11a9d6b8b
 DIST hinotify-0.3.8.1.tar.gz 8344 BLAKE2B 6258434aaa02faf35e96c8b1ce8c5bb66bdab2abbfa0689706a657f18cb374a6fbeb83762cbf58dfde6716cecf1b67a07fa2b6e02b3d6d589a7b879066e83617 SHA512 965484ed676985303e0e559985d80e37af3d1cd0d7a0bb111679ba2ac1ead4c541a409630bb679ab70e33c0e2dcb070e17b162ff8a967c65e438ec071b756f87
+EBUILD hinotify-0.3.10.ebuild 614 BLAKE2B 95d51757cf6fba0f541cfa10952b6db061a4e75f1a5a9b794a58e6f6b77e851fbe7d921027007d67275c414d37a5d82925d67a7f730157c523ccffabae8e80bd SHA512 3e193c3b6d5f7252f0a2ec8c709a57b56d122601c333603ee1087634e60f2a6da439cf5c1691b4c26c825d7fee569caedfe525dcbc13f74bd27dd036632cb64a
 EBUILD hinotify-0.3.8.1.ebuild 541 BLAKE2B 41d407b9a433cce0e7dfea0450121478041c6cd8069e9f8e1733bae674e57ddefa7a3d1b436cc9c03bc2716a98570d50d17385552c2e7433676cd37edd2412b9 SHA512 63004efde68cea9a8f2d75262cd1a89c9207502567dd26bb6073eee487eb0f6ae84f8e865a911475d0f6f3a0dac2112bc24e5c5d9f244658275d2908855173fc
 MISC metadata.xml 313 BLAKE2B bab3730bd2a22da830374304d09c0b2b68b09547549162b3cbd7072ea9f42f0689c7f1dd5f9c072162662a3c9d4a94e0c29323064b98195c3301a96ce7e53f0c SHA512 c126a37566ae8dda3d2b87795f45fd5f2e167a68fbb0f73291b19b3e8c355c8d6084187a721fc3e29b7d23fc53f3470727cf0a430774790c0997b4548c910176
diff --git a/dev-haskell/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
new file mode 100644
index 000000000000..83094c3897a5
--- /dev/null
+++ b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell binding to inotify"
+HOMEPAGE="https://github.com/kolmodin/hinotify.git"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
index 053aaa8ef672..f403944818b8 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -2,7 +2,9 @@ AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c872
 DIST hlint-1.8.57.tar.gz 79071 BLAKE2B 5c538ecd36a22d879b0746fa0f3df3715e7d8f85407ff3375f4b850256eb125d0dd01d875fe6babe8c912b62402da7fd88df6d05194e5501c449f9230f33b500 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da
 DIST hlint-1.9.21.tar.gz 88802 BLAKE2B 08708331c50b73433c7fde7c826d976126f7bdd758722f6a8903d18d45da6d9ffcd32b883036f17c74165feb0245199e2e248fee9701c01153736d62f73b9494 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8
 DIST hlint-1.9.35.tar.gz 97402 BLAKE2B ea3bb516769c496be4943ab57a37bde97e1a03fca56dd6c9bdc3da30ac86b1b0538796e868de85049d28fa8286bfd45e0f1fb960e15cf12294bdb74dab08f926 SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606
+DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3
 EBUILD hlint-1.8.57.ebuild 1510 BLAKE2B 301453bd59088ed714cccdb12d06c3778649bdd948cf58404d70f1fa78f927d90722533d2fe367bc4085130d0673a16f6d63ada4d94eaaf25b4232021574040b SHA512 4e3818c8778ff8ad917e5ffa83c38227d475328a5e4e6956304a22298fd30b8cc3f32f0319c90e2ebac27baeef7fc7f654b12072d96b9107fe51398feb2797e3
 EBUILD hlint-1.9.21.ebuild 1681 BLAKE2B 077581279d68813acdced8a470aa835e7ad266ae874b23c9b54bd8a55a813180378825aa43c551bc7ce158f4a08742b474fbee85d34dd49ba7abf6b0332514f3 SHA512 8ac76c9a42da219ed3ac7ca22054346f82f0349d892411d85e8903c0d07b8ecfec0502f397d20e07bfaedd774fadc41893c6a12ffe227ec4d8decac87d0e83bf
 EBUILD hlint-1.9.35.ebuild 1745 BLAKE2B 4cdf84877fbaaa17ab02e3e23b7427eb5ee405578faaac93c09cbc6b32640b5f9c5acf2d8d0d7e31cb28986c2cf1cf43981a895928095c2b3ad7178f35997a02 SHA512 24dcb66f37772594966ae025973e5a1d6c12f75e404794f727de13afc6ba39dc8750f5385e843678ef484c94b30e5de91f7fb43ec27547d7bde40fe8733d7786
+EBUILD hlint-2.1.17-r1.ebuild 1948 BLAKE2B c599034a9b4139ff21d8d493efb4ceae6b072eda74077c6c3e19129dc0fb63506db1c6d438b3117e866e5239a7688344c643941bd271a8296c9dc65b02185a80 SHA512 cda3327dc8192d7b00ff35d0a380ab5c923f1c04f2a9fde8c8adee988d9cdb16570a2053de29b52688febad57acfd8227bbf0dc28d15483e0f49455a55b182db
 MISC metadata.xml 514 BLAKE2B 9d4466ded84b33d243146bf75ecc80aa920dd4d959ed661498d6bc8d51676bea2024441300a79a3c6f39bb94bfc4d9b3a5727f5f79c012ff8ea91ad5596bc0d7 SHA512 09783e5f456c5e5f7c9b4cc0b61d5d45d9a77ba4e582368f75e17fb8cd3b7a94ac56c6acbe1a5eee4a65a53fce1c72bf7ce3d0a00e736aaa249c0211b76926c5
diff --git a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild b/dev-haskell/hlint/hlint-2.1.17-r1.ebuild
new file mode 100644
index 000000000000..e725b17cfa22
--- /dev/null
+++ b/dev-haskell/hlint/hlint-2.1.17-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal elisp-common
+
+DESCRIPTION="Source code suggestions"
+HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +gpl"
+
+RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?]
+	>=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+	>=dev-haskell/cmdargs-0.10:=[profile?]
+	>=dev-haskell/cpphs-1.20.1:=[profile?]
+	>=dev-haskell/data-default-0.3:=[profile?]
+	>=dev-haskell/extra-1.6.6:=[profile?]
+	dev-haskell/haskell-src-exts:1.21=[profile?]
+	>=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?]
+	>=dev-haskell/refact-0.3:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uniplate-1.5:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-haskell/yaml-0.5.0:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_configure() {
+	local threaded_flag=""
+	if $(ghc-supports-threaded-runtime); then
+		threaded_flag="--flags=threaded"
+	else
+		threaded_flag="--flags=-threaded"
+	fi
+
+	haskell-cabal_src_configure \
+		$(cabal_flag gpl gpl) \
+		$threaded_flag
+}
+
+src_compile() {
+	cabal_src_compile
+
+	use emacs && elisp-compile data/hs-lint.el
+}
+
+src_install() {
+	cabal_src_install
+
+	if use emacs; then
+		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	doman data/hlint.1
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	haskell-cabal_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
index 146942cabfba..cf92c3e82bab 100644
--- a/dev-haskell/hpack/Manifest
+++ b/dev-haskell/hpack/Manifest
@@ -1,4 +1,6 @@
 AUX hpack-0.14.1-aeson-1.patch 1088 BLAKE2B fbdac681ca35879fe0cf789cf8f4f8b459e3900a6b56bedb48afd8fef7b6cc890341c5649da8127752a4131402d8e67f50c3722ce9ba41cbd5a97f4976809d76 SHA512 ac178c92f2dbd1e0b498b82363b5c03525597c2f3d0fe834f9e7b6e80312e6adae773861b6c18768cd45c2ea323b10ea65b8e5f2991cd3678e9966d9fd876172
 DIST hpack-0.14.1.tar.gz 38373 BLAKE2B d5c3b900e3e2fd852081934f4a7b4a327f4647608ceecf76ac65faf4e464bed7428e4b444f7b06f8a0e7661458e1817aedaaa2ea2dd8161a362be9f596f7f0be SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04
+DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b
 EBUILD hpack-0.14.1.ebuild 1026 BLAKE2B 87f608e3f3f6406f8058db7e15ef4f49dd354b85cf67015d4e7e1c6811facb2fb9884daf111e883ee9dc186adfb581fbc4186da872a8722fbfbd61c76a64879b SHA512 185578951d9dffbf17004ebf23eb9900c364923a89a39d11d2fc92364a889b9b8e4a685807b4c198bc751aab415e121598ad4a526e764ba0ceb03bad1d5ccb63
+EBUILD hpack-0.33.0.ebuild 1319 BLAKE2B 1ab4afe3df91a437e9cf246fbaba5172c007327a1712e93d477b77f54b9e0126239753627b7b6f425f0f9f7c67734708d9c31e3be00d14d90407cd1c51ac9d6d SHA512 fef932f0f9ba1cd685f5dc61e75ffdcc2b8087e24d55afe31a6677294e6b2a2fe65df85a2c61cb77f4625f9574dd9dfa2f4e828891284b0f6a63755dbcfff178
 MISC metadata.xml 333 BLAKE2B e31588ab4845a712814c6d194bcf1d2b4600011055f83c672ee183f2f8bfdc4d8da339027953a59aabf0765c683a1aaf92f3dcfb8eb6899f2b77c2df856f08e4 SHA512 0de08ff54a63322f19c4b560d10130fe7d78ff9c4880fdac2da4d5ebcdeb1fe3800e8910b60319e4218c8cc9ac547fa4b01885f8a21078da2f4c80e6e84b405b
diff --git a/dev-haskell/hpack/hpack-0.33.0.ebuild b/dev-haskell/hpack/hpack-0.33.0.ebuild
new file mode 100644
index 000000000000..da9f5c70e109
--- /dev/null
+++ b/dev-haskell/hpack/hpack-0.33.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An alternative format for Haskell packages"
+HOMEPAGE="https://github.com/sol/hpack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.4.3.0:=[profile?]
+	dev-haskell/bifunctors:=[profile?]
+	>=dev-haskell/cabal-2.2:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	>=dev-haskell/glob-0.9.0:=[profile?]
+	dev-haskell/http-client:=[profile?]
+	dev-haskell/http-client-tls:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	>=dev-haskell/infer-license-0.2.0:=[profile?] <dev-haskell/infer-license-0.3:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-haskell/yaml-0.10.0:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/hunit-1.6.0.0
+		dev-haskell/interpolate
+		>=dev-haskell/mockery-0.3
+		dev-haskell/quickcheck
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/hs-bibutils/Manifest b/dev-haskell/hs-bibutils/Manifest
index 6a506ffd2f9d..482899876f9a 100644
--- a/dev-haskell/hs-bibutils/Manifest
+++ b/dev-haskell/hs-bibutils/Manifest
@@ -1,3 +1,5 @@
 DIST hs-bibutils-5.5.tar.gz 499546 BLAKE2B c2a83885bf09f9a2b774fba30456e2e0931a37fc77626ac006edf70cbb305253ee254aa09da43d18e525a2d02d282d940c32e2cb0d1395c436ef41cf79880b33 SHA512 cee3c3500213d93b424bf3fd36a6b4657aec3a2787373a55bfee7f4de25e43a801ed68bdb815ba57ca8ecfe2d352e406e43baf40339fba79a061180fa4ab628c
+DIST hs-bibutils-6.8.0.0.tar.gz 751679 BLAKE2B 8e229e6e15ccfe576cc9cf4a8fb44eaaa10bddc5d3e6f13d0fae9f5934eea0817504a1b96d8c131c65502a49e8f4050382d520b8a874a95b1b834dd376a59f6a SHA512 2e19f570e962b6a76ceb08a34eee8ad2533dee06cc2de0860a0b8d4ad02601dc00679ab2292e63a612cd6f0dd939d18c7c80a1493f0e24e05c992cc23c93e27d
 EBUILD hs-bibutils-5.5.ebuild 605 BLAKE2B 7ba63d652281c780d220bb548a05a84c370394dc7bfc1b00aacfe140ee7ab97ba3288b8e50dc9af73d721e4bac97c01ba80440a83e4777bffd2f99404c703c7b SHA512 e54112ce41a7b5b8dc592836ef84fe7be1905a715752d2f7ad1a9dd13010ebd25ed4311ede8a0acc330952dab228f2a613d83eb187d55cecf57bd716b42f4756
+EBUILD hs-bibutils-6.8.0.0.ebuild 593 BLAKE2B 2634fd79688f6eb682a7e5e8dd185e00f4c32bd6b3ca99a849d3e354de65bc358d96bbe4c95335a6f8634cba7dce7280ccc8c459ff133066e85031958b9badd9 SHA512 9b629a53bafb4ce587ec1475cbc0dfa6fb4498c1f62b89c79b02a6e2b400e38056f487f6cd2273a7c7d96ca2d3ab6b2069c023dedf8fce444e96d11f69afe624
 MISC metadata.xml 452 BLAKE2B 80ecec14af0fbd0ae8208c189826a991114d20eb944cdfd615a54ca816ba5f7779156ef939e4423da03734bbca48d871fdbf9349c26ad90f8058f235ace3cc2f SHA512 fc30ac4300af4f68e0d1ee47bb97230f236cb36577933629a63d1f505d69aaa1d55f10ca65e0f608fff51e16c04dbe7befd19fec17490ca40ecdc1b047b2c2f5
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
new file mode 100644
index 000000000000..a545227c809c
--- /dev/null
+++ b/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to bibutils, the bibliography conversion utilities"
+HOMEPAGE="https://github.com/wilx/hs-bibutils"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16
+"
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index 6d41b111fb62..470bfff4a24c 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1,5 +1,7 @@
 DIST hslogger-1.2.10.tar.gz 35889 BLAKE2B 68f18236cfe19ad1f5b6fd8b9fc32dc571fe7aca730c5210863aedc88e32b1094e939c8825730fbf901fc1993c595ed0711f3d2efb041c789d674e4dcdb93723 SHA512 c2e3c6e7c8598aca2a18e507defa7536db7fdf15265b900401f8558b3259cd770531a3a302d6eb9ecca63a9629f0d5796e1ec94d8f21ecf153a1fc49f889183a
 DIST hslogger-1.2.9.tar.gz 35576 BLAKE2B 56c3a917d2db7207d29c304b00a237b7d62a4f8f07d72f7b1ce834d3e60bb55f825173cd8894d2063973df4095ef3409a2c1aabb99d89257a5d8562d58add76b SHA512 6315dd7e6d6769a6a8fb8576b54875fbe79860d1e3158ddbca7f15b286f13b59cf7e817ac5325f31ae82e8f5328d32f22ee6aa37f5ae11e9070f209454ec801c
+DIST hslogger-1.3.1.0.tar.gz 37468 BLAKE2B 24bb750c356f071ee35cc84e01b2483f612b6e7403fe8fe60b8af148dba43107660a36a0e30305666fb76af1939ff00f6817dff98720ab7eef321192e6e87976 SHA512 a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a
 EBUILD hslogger-1.2.10.ebuild 763 BLAKE2B 2fdeab40b20557030a020f43ed742afb933375e0f53cc158744e7ddfbcd1d49c69b156087ae7d7d00c7a808a22c98188d600a66e4096fd363f668e08aeed62e3 SHA512 00d196edab14825026ea55e58082885f511f8081731fa9391823372e8a2d47587128fcd17bde194fa161202a1aac515bc639a099f4287302fcaaf9f0143c1827
 EBUILD hslogger-1.2.9.ebuild 743 BLAKE2B 95ff7e4f4df6dbcc08d603e47b977afd224095eab14f76eda260b7f2039ceb045e350a15369ae6fed0ed51d4f29860cbc61cbfc1d41f359780505bfb03d49086 SHA512 844b7f539220fdb75cc617311f3da2904eb1b3a799ec54ce65b4c26ea595a644c4fc4d260da0d381358381144ee71a9900eed7019e075a86f1176e955bbc511d
-MISC metadata.xml 801 BLAKE2B e5af214c9807a2ff22ebbead5482080e8b8c4931a2d99ff7f43c7523007d571e900279fc01c2f19623eaca57d4613ebf6840f3dc9537e0620494d9c734cf7fbb SHA512 82ef25fd07b9b815bde8b9fda3ad8b441c7dfcce19a26c14a20f1c180f69e35f758d422b3102d58006b536fe329fa0360855930b803f0fbb0c1091c6b8f0c5d1
+EBUILD hslogger-1.3.1.0-r1.ebuild 1308 BLAKE2B 73891c296306463996fbaf192a9aefa8e0b2e49a170159bd4d6347ce87d07fb6787ef8d1f6b1ae0889257705759efe855f1520466f817f7212d65daf5e02c442 SHA512 87fb214c0a79eb0280fb6a1db873fd3d66f50645643f0bfb591cbc455eafa75585dbbf0a9f0864c5707f4b35df3fefd1b0146e8169901c65d433c86b595cdd47
+MISC metadata.xml 847 BLAKE2B de3b709091b3b13f55a7ee468eae7f7c9f24d7daee5f1fb47608cb388d1e4d1bc0ca9d5782bda926f7358a150ba73992932dea824d7e18414b6361a08f979483 SHA512 786700f6779652375db0a2064339aac864d1166e06fe7fcd5f4547eede32a9993c5fcb6bde44487e02fc444be2d17a1044ab9d1457716da85daa7516e9a9dea0
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
new file mode 100644
index 000000000000..b91fd077bbf5
--- /dev/null
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -test,-buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Versatile logging framework"
+HOMEPAGE="https://github.com/hvr/hslogger/wiki"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+network-3"
+
+RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
+	!network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 )
+			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests \
+		$(cabal_flag network-3 network--gt-3_0_0) \
+		--flag=-test
+}
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 188bf6c536c0..08447e480706 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="buildtests">Build the executable to run unit tests.</flag>
+		<flag name="network-3">Use network-3</flag>
 	</use>
 	<longdescription>
 		hslogger is a logging framework for Haskell, roughly similar to
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
new file mode 100644
index 000000000000..79bf6b402689
--- /dev/null
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -0,0 +1,3 @@
+DIST hslua-module-system-0.2.1.tar.gz 6339 BLAKE2B 0019478bf29dac977ff5124e77765eac86876879514e0346a6126574b8ca948a89a66f8417842c45357124e2990e2394275be886b43db59e05ea9065dd2b6b5b SHA512 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
+EBUILD hslua-module-system-0.2.1.ebuild 882 BLAKE2B 55d1d8564766f9d0019cb7d29ae7d3a05760aa7b4e727103d708070cae0d3b2818bb1fad5e7d43c0419837d874ec47c7a16e680901560a6fb5e4481aefa12aa5 SHA512 77d6a2ce165c4f6283926bdd3833502712100be1b5419bbef9f5c0db67f02f928d63bdefab90c037390440796bd143e42051de1ec89dec701d606a03856183d9
+MISC metadata.xml 608 BLAKE2B 84d9767860f2cc5d690c723c4e718652e604d373ac7c955783841b45cb2b4f77cb8edca7d4e73cd7c9579695a0f32b4e7632320f5b4ac1db29e6a7467689cbe8 SHA512 57be331428cd466055136b05dc8834257ae406318d8c5b26da4fa2198d15e1450b7419a64ec1b79bcbc33581fdeb0875f706650e939dbb2d68671ee2b6159d7c
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
new file mode 100644
index 000000000000..9dbc4cc797d2
--- /dev/null
+++ b/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapper around Haskell's System module"
+HOMEPAGE="https://github.com/hslua/hslua-module-system"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
+	>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/text )
+"
diff --git a/dev-haskell/hslua-module-system/metadata.xml b/dev-haskell/hslua-module-system/metadata.xml
new file mode 100644
index 000000000000..286db6fad738
--- /dev/null
+++ b/dev-haskell/hslua-module-system/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Provides access to system information and functionality
+		to Lua scripts via Haskell&#39;s `System` module.
+		
+		Intended usage for this package is to preload it by adding
+		the loader function to `package.preload`. Note that the
+		Lua `package` library must have already been loaded before
+		the loader can be added.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-text/Manifest b/dev-haskell/hslua-module-text/Manifest
new file mode 100644
index 000000000000..815c19494fd1
--- /dev/null
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -0,0 +1,3 @@
+DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
+EBUILD hslua-module-text-0.2.1.ebuild 736 BLAKE2B 3191d844e61a220826f6bc85988d92630fb18fb389d4d2efb0f69303715743ccb690036b25c28dc92700c4c98dc52151ee9e79433b869ecddd00803505e26c3f SHA512 99564a1ba0e3c2a670212837e1771632a0439a98d1f81bb7be71ec0660802ca261439ddb5b05ca6a3566fe521d8e7a3fb22df13e0bd7a540ee8cd9cc70e1c30f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
new file mode 100644
index 000000000000..f0377f866dbc
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua-module-text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/hslua-module-text/metadata.xml b/dev-haskell/hslua-module-text/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/hslua-module-text/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index 2b4b803c8e44..550d22479db8 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,5 +1,7 @@
 DIST hslua-0.3.13.tar.gz 128230 BLAKE2B ab252781f3130557ad25c9c36cbdc260addf58ce64f1b828dd85d3f0765b2604014da88a6bb9e6777bbd74dd869be42341e53e191e7cb46beff3e2dd6e1ec293 SHA512 5a11243f9a1da3a50ae5f30e310b2e661ed40655886b3bc6a2ba01b49fc0fbbc1ea20e24d3c227a8454cbcfd98161ad47edb5c3c111d6df09764f79476a9782a
 DIST hslua-0.3.6.1.tar.gz 127569 BLAKE2B 3738ba495dfb93e32cf62526228fc54f43267500faa283f54683cb0f9ac14237eedfad325345f5b86c3ee94b5fc33e9a534a2beb69407ce9c5699cdfa8a25ad2 SHA512 abe8a8513d74fbdf94cc9486996264c074c6b4df8e21702a03c887772624fe33f86f805275dab11a340d7f14a6f3dad71f06aaf0f7e20951df1ef9f2e670863b
+DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
 EBUILD hslua-0.3.13.ebuild 808 BLAKE2B 27f4f5639ae84fc7abec2c0f486b60c1a0c4679352f3261454e1aa84ceafb6de305e1ac9f18fbfb58bbabf30c2c567b41d079b177a5d26d398665b1d12ce5ecb SHA512 f1904cb32c51c7d84cc6b7f86ebdd04ac024d5a02ce9b79bc2229601cc88d237dd25276dbdf654dfedb643fd8c214622ad0bb27439e344cc6089e90f51af1b4d
 EBUILD hslua-0.3.6.1.ebuild 588 BLAKE2B 76064e1bd6fd52fca90abeb74d353b2b60a91c567f9d3c7fe3c173f5af7e66611757d84bce54b269b5673edfd6d1ac6d7f58b5701206179e2eac96e8b9fcf397 SHA512 91d809ddd004fcbafbce683e2fd6c9bb413b2b7c94639cbe4c76f452274d4913eb3a619c2f70c5a572a4a7342a60af58089373e13f0b5926c8938363d47cf2bc
+EBUILD hslua-1.0.3.1.ebuild 1405 BLAKE2B cf81f09383e91ff08d5e02efdc64c80d4a1b6fabfc282fd5806022becf8b5f9bd56955ab148abc01abee8eda7f8835e8e21bef31d737ca879cdb3604964ffc01 SHA512 683aac87e2cd8846cca263c687b4f4e770d960c92005be242f580931522b422f0e856c6e583c502ef9b3730a54ab79a9d5118638143919ba47784c7b873167ff
 MISC metadata.xml 666 BLAKE2B 79f4d48f058b1f78b5a23ebc273672b9ebf7cfef346294b7a0640884d83756068f721937f29e97b8e4cf3e0b8ae813cfa878f5ae3fa69cadd66a06da246ac22c SHA512 f4ab4bcc7fff745cc935ab20cf8efa1227b72b3e86d13a10327a4713498d533e40869c0dfb4c6a70280180975d57351e80129afea7f7ba466e3807e82cf99cf6
diff --git a/dev-haskell/hslua/hslua-1.0.3.1.ebuild b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
new file mode 100644
index 000000000000..3c60e65c208d
--- /dev/null
+++ b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Lua language interpreter embedding in Haskell"
+HOMEPAGE="https://hslua.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="" # system-lua disabled since it requires lua-5.3, which is masked
+
+RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allow-unsafe-gc \
+		--flag=-apicheck \
+		--flag=-export-dynamic \
+		--flag=-lua501 \
+		--flag=-lua502 \
+		--flag=-lua_32bits \
+		--flag=-system-lua \
+		--flag=-pkg-config
+}
diff --git a/dev-haskell/hspec-contrib/Manifest b/dev-haskell/hspec-contrib/Manifest
new file mode 100644
index 000000000000..d91fc511a6e4
--- /dev/null
+++ b/dev-haskell/hspec-contrib/Manifest
@@ -0,0 +1,3 @@
+DIST hspec-contrib-0.5.1.tar.gz 3034 BLAKE2B 273709b1661fa02e87e8ffce37e91968fd824fca18003f6275233718ab77a6d56417c09a8ca551925a4cfbccc7f0c6086169510ad9b63f21408e44c44846aacb SHA512 cc6ee847d7c99b2607c36b2200bf0bc05ce30437110f216f82464069ffdf80a76d836ad7aace3d69a00cf9da4b28d39491a251c6f60401009a6f9c85d20043e0
+EBUILD hspec-contrib-0.5.1.ebuild 716 BLAKE2B de4a5c7e9ad86cd45abb01833aebb0f162b8440adbfac6a47144324b256c2c68c601adda945e6911e001ff07a1c1993412b03fbf3184662f8e802e6020b1cc89 SHA512 06ee9984247905d252060132175c2b1c373c34a688b8d05a5ebebcd061f9fed0be4621b8e2b4f375340410fc882e6ecfe68530368f7139a1081792949703377f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
new file mode 100644
index 000000000000..1ca03547f198
--- /dev/null
+++ b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Contributed functionality for Hspec"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # test-suite fails to build
+
+RDEPEND=">=dev-haskell/hspec-core-2.5.0:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10"
+# 	test? ( dev-haskell/hspec
+# 		dev-haskell/quickcheck )
+# "
diff --git a/dev-haskell/hspec-contrib/metadata.xml b/dev-haskell/hspec-contrib/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/hspec-contrib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
index c35315d2efee..461ca8f253b0 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -2,8 +2,10 @@ DIST hspec-core-2.1.2.tar.gz 29341 BLAKE2B dadc4c0d71a58fbc07d8a0d41c0822fe0db05
 DIST hspec-core-2.1.4.tar.gz 29371 BLAKE2B 670147b4742ea4baa284bc70eddf615fdb79b338f7d5e2fe3042defe608d5b02ce110a6c123ac641c2ea44006b9ef2a95632227f9ea4ee967d37d21e209a12e6 SHA512 71f23c7b4075d5d48fc91b1394d1d1418f89c8756baddabea27ab09430ae982759377cb9f3fca42da72382c19fd8bfd151e89fea122e91faafb91e787bdf7b63
 DIST hspec-core-2.2.1.tar.gz 31651 BLAKE2B bcb278f103b651937c0f23fe14fd7fdc514e67c9e331d41f04cbcdfa96e925e938f8d2da4b5108e56c902f5f71654feaabd35429e1241a7a002a4a8bf0847ca2 SHA512 fa44e935609cf636ef13025ae03456e74b404d47e64fc58acf0ea1d204e32c145a471c60501e9cba3f8d2d1d211f4c999eb41798c8df45842abbc1befda14c6a
 DIST hspec-core-2.2.4.tar.gz 31553 BLAKE2B 4f5c438c652c20a9f51e6112ed455f4fc7b11713d1ce10df08504367fe4a17ec6637b346c05f519a4514d4cd38cd8b79023df13735804c846bf4efca9c084e17 SHA512 1c99ae88635886f74d1a0a28c7b3edfa4678031f62bb916724cc1efd62388ab24a7db1772955f55c7c5d1be75399a92784a5f9c0b2d2b49c0500d5ac6977b9b9
+DIST hspec-core-2.7.1.tar.gz 58835 BLAKE2B b6fa09a26c6adaf25f99d6fc3b1df80ea5407f6e8963c16473b4c98ccff694457131a9c7c35e5250beee47a03fb1c695d74f33be335623340a2d729b6221cdff SHA512 5ab0925566c3b6f05480bd4e464ca32e0a212b4b4ff439d02b3df5b75b23b45ca0c63bab8398ebeeedce0ba30bb653b1ea85df2b7e6e3a058cb4413dc1c53ee2
 EBUILD hspec-core-2.1.2.ebuild 996 BLAKE2B 6e27269faa51fd1ad9f6268bb19e57e08261db9c2f64e9571c178f973f96acd85f26e94bf920041cf37a045bb010472b4f82859db05d0b146d4741dc80bf96e9 SHA512 5b3ea80872b5e34883fb7e12d3657107010e472338e6c80cc73305a7ade5f79292a130f061796b0f24da97ffc3ca0080c80e2fefcd86016d4ceab2ad8e370e42
 EBUILD hspec-core-2.1.4.ebuild 991 BLAKE2B 34e8ad61d5d0eebb43731b6cb66989929c0ef4e9e52289f8af741ff322c733f38fde9d82facc647ee4276716d9e40af0812cb1be06797f5f14c71b9adc5120ee SHA512 7dd80b4d8ad1240be5509b819a81a4118a3d8c6693e9216da4854f1d4dd3247e52213d597b196864e894f7d4b19881b20658a409dc1cab87bef2a362bd394724
 EBUILD hspec-core-2.2.1.ebuild 1089 BLAKE2B c47bcd14c6651cd4083756cadef3ea0a439000627a24ca91b5d95afe816530940f1cac6898be16a55dd9bed9112ab4d9a9aad31db5d2c6de47f448282870c081 SHA512 033c856dd0b7cfe74cde38a1fc44fe5f34daa2738e810daa7373160031c3e5c5a10effacee01e051eb9db1cdc3efad3c9060831e33273b867d3cdc5035d25dd5
 EBUILD hspec-core-2.2.4.ebuild 1043 BLAKE2B b663676676744f5adde4aa056dfc2e308fc02ab4839d99232ec70a69b292c343a0e139dfa983d07d45326c8c8bfe334c3383a94841e97cacf4cb99dbbaa74bc1 SHA512 d264617bfeeea9e906d2b8cd540659aa92eaa0aa24a5f956a46bfabac52645478dc74e506af695a9eff4e279126348b0d6d4b8b93ff2114bd5576a7ebee726b0
+EBUILD hspec-core-2.7.1.ebuild 1152 BLAKE2B 2943ede4842adeb2f19f73784794ce12adf08751c4d9629d6a112108a097f0e5939f5665aaa1cd849ddbb5ae74a38a5e1593ff4c782ed138d0dd1ecabf200ce4 SHA512 94cb50226a9a082a7d14ded33d9ee904b7cdc4f02461da89f5c52827f19239c14c965920300b9b442100b3d6a8944263111cb524505c70adcdab90450b5f1629
 MISC metadata.xml 392 BLAKE2B 21503e4f536ae16eabc53969be84c5c9573ddd259a43f688a6bc9ef27c1b7b39d4dc1beb38e2b9c13d468a1a8a8115b9cbc4796bb8c5f311f604d2aee0f08988 SHA512 09a01472812d1cdce41fbd23bda48ebbb76480d9f075b2224937480c0ec81b8635c6f4d471fe1613cba5aa8fdbac6d155a0eda68e6ffae4c19de1c594e4ec755
diff --git a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
new file mode 100644
index 000000000000..d93f992ae506
--- /dev/null
+++ b/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
+	dev-haskell/call-stack:=[profile?]
+	>=dev-haskell/clock-0.7.1:=[profile?]
+	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+	>=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?]
+	>=dev-haskell/quickcheck-2.13.1:2=[profile?]
+	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	dev-haskell/tf-random:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-meta-2.3.2
+		>=dev-haskell/silently-1.2.4
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
index 806dad3cc384..5222a0853475 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -2,8 +2,10 @@ DIST hspec-discover-2.1.2.tar.gz 5365 BLAKE2B 935070852def9c9de8059ba127e779260c
 DIST hspec-discover-2.1.4.tar.gz 5570 BLAKE2B 40d84878a528df128f38914fb0fa110e482dcd138f0479364f887dbbf15f01cda472e4e490138067150b129c12a0554b90fdcd11ad420866c59db0ec48f572f1 SHA512 f511fe71ab380b640baa4e50fb5fa00089141aaaa53f04a2c24e48feb1d9d2b82dce95e1c55763f880eebdb89cc04707822cab0e9d3f69ee166a9afd7b84bef5
 DIST hspec-discover-2.2.1.tar.gz 5630 BLAKE2B b561b5f4ed0ca7e0f78dbc495422b098e2775822e4e2c6a6257fbb47206a0106e00dbbd7b313cb283bddd0f64b7bae441df5efedff3c8b208003a89d14a06c85 SHA512 cc27b6e8cee362c031a87c8af4b264824c13bc147e8780d601c7fc2390103447aacab187eb57e8079b558c0d5e643d796141ff44f079fb6b9a83fd3951f63cd9
 DIST hspec-discover-2.2.4.tar.gz 5878 BLAKE2B 250dccc3c82e0b7a4b1505d1a8a47cd8c1fc0454f545102d4db0d8f43057cdbd1d8866c933d461efc03773c89f5d9def75094c4868955696f4a11505fbf68255 SHA512 217ecedaaf35e28f270cd0b2933fb8818ae82e0ecc0152affa6e71cbc1c5a62897ac6421c384dc91567fd5e911ee02047e3b59a5772a8a5533115b0708fb7e76
+DIST hspec-discover-2.7.1.tar.gz 6755 BLAKE2B 009f49090de3d79c7776e8b9b22eb975f276081c39980b49e157dfd50c97f3253140b2d66c8f392f53f83976d01d4302d78afc1ec95df45cb0a61d4c7a741234 SHA512 b07e7be5bd81f2e116b63f27e307ac628b6d678cc24dfb519bed7dcc1c27f772ff5d4a18c801474a425d4450337e809b9563b4ee1ca397830dfc7f9a92d7359f
 EBUILD hspec-discover-2.1.2.ebuild 562 BLAKE2B 738b66d3360315f6ffca2fbc3df283fd19af4c40bd2b764325f51a554d418af079863c6b95fbf77dd4a0a495c67e7ede1ad8998c20b6e6ce8ed686c401fb985c SHA512 ca1230c3478575c39ad0abda58fbf153118b262b4c995b2fc8ae43e97cc5a33940c5601e7c14679b784bf0a49046b33c388be5862b786ac3895f40f16c063f17
 EBUILD hspec-discover-2.1.4.ebuild 557 BLAKE2B c48127406ed52522629e0e120838d7fa74ac463cfec55e3cbb07264741735179e400ea1e017920dae34b55b15117b3bec0f881fca8efb903adc0e6ffea4279fb SHA512 a7268db0f2ffa6b155f523adb906ee6e4230342cd0f24f7d2119ac8072c433d160638cb61878f6daaff7c74fae18ab3899c2c298c71363b56c43b876b77d5e90
 EBUILD hspec-discover-2.2.1.ebuild 563 BLAKE2B 22012516235f8d7fd07321ea3d26b1f1dc766b3a4cd0281e6904da1840b76df5c0cc13014ea14d2383edabf5bbf825533313361b61104efd23ee3f6ff0caf31f SHA512 97ad53dd621bbdb05f1ae0e53317c37d8188e3af6e2e8d61019d659258c709d898d2bf0bdc62dddd063b8b2c15c3ca8eacb9f45edaab62e9f794ba77b09155cf
 EBUILD hspec-discover-2.2.4.ebuild 581 BLAKE2B 67421e65c792d97ffe67892c3b9136b350c55eb0de7f39afdfacfe76c14b009bf876054516a2da6ee8f72ea274c86ccd893afbdbc35335ba14344801e235642f SHA512 f0ea587cfa624b9e8a6fb2b976b9eb1dcdf4557205d3b8a2e6ae6aef6ce81bab3ab4ef9b5aab119b7d138f16e843d46af96ddbf53c912a8ea12074015961e6ee
+EBUILD hspec-discover-2.7.1.ebuild 614 BLAKE2B b159f52dfbb34bf9099090c6f0b78fc3f16066ae008e599179b25dd8c395bd410ac2199918e054a680fd27cb44a8ec23e478dc57430a6c2b033a524c221b25f6 SHA512 65698fc1645c255271e117af7b86db209eb4da0ea7b98683e8426be3c0846548f317bc047601e30c34283a106b0c05bdf65597c42a3344166b7fa528af919f5b
 MISC metadata.xml 389 BLAKE2B fe21f0084f5a7f2cb5ed9b1bfd7187ae41efeae05a3e53c0e4dc6b97cadbff63c4ae53117d98fc6e899187924f9ca11d0774fc1d6b1f8be5f291129c7453811a SHA512 d6832a55f8fe0b07c71522025f6c35c722c02ca0c5bb1882e4c7136b6e19a015973f1dd7dbb8d08e797007a09434b8bc62b87acc6d26445f0788fcc5a621a167
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
new file mode 100644
index 000000000000..f1dbd5de681f
--- /dev/null
+++ b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatically discover and run Hspec tests"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/hspec-meta-2.3.2
+		>=dev-haskell/quickcheck-2.7 )
+"
diff --git a/dev-haskell/hspec-expectations/Manifest b/dev-haskell/hspec-expectations/Manifest
index 134d3110df40..5831a2ceb1cd 100644
--- a/dev-haskell/hspec-expectations/Manifest
+++ b/dev-haskell/hspec-expectations/Manifest
@@ -4,10 +4,12 @@ DIST hspec-expectations-0.5.0.1.tar.gz 3971 BLAKE2B e63f58bf28739d0fa4ac575ba1cc
 DIST hspec-expectations-0.6.1.1.tar.gz 4553 BLAKE2B acabe7c00f5fa05538ffe3b16ea0a95c237c5a67fad98896bd7a65801ddfda5f26a791a03c3298f35d1e8edfc986208b037ba8053c58f3dc06d9ce56e6260880 SHA512 37804b7ebe3fa134e005f4cc34a980b43a78f37a50b7aa668762086e125bb46e84dc3ca2b2f2c8a9dff31f1c89d7113c78d9a0fc4c787c746d9d5315d8938973
 DIST hspec-expectations-0.6.1.tar.gz 4553 BLAKE2B 233453a972c85e9599beef759df9bb391eb1472085ba2d44ff5ee67a1e9a6646dcd25db9ba72a35859a7552d91a5d3c8e29682347d41b7ca3e38b08007657425 SHA512 dad4bdf7f10241650a5d59e0131aa93d52040d1cd7aec63ba8a9090919d2d7f49f9f5a7ead7da3d79e619f37ffed2323eb62f68c076959f58c8e2208f8fb46b2
 DIST hspec-expectations-0.7.2.tar.gz 3993 BLAKE2B 1bafd6d3e9ee45d05885b81de6a5bce2137a2226dc49bd8459293df65d123f95531c0f2d1cb283da83e828186276e06452c25b33a76d8ef30358b81feb93e701 SHA512 0c66b0997b8b751529b3f72733a3c88f6767e564e2ff60aa5ff231c10d47295f01f747d9a2955b678fc7658fd0c5cad8647ca8a4da68e607e78397028f53de09
+DIST hspec-expectations-0.8.2.tar.gz 5492 BLAKE2B ee1f50d390c2d72f50596935494b6d617d5a582376fa718a294ba33838951787d4afd1654733e6f590f166e1e36c0b651d3fc2c996ce5886e9110375af8a7750 SHA512 482799adad2a70f891a61227bcf28e6712e65fa7dceba13da15a101a6814bc0d44aafaeda360a06dcdbcdbb96e5539f15135753eabd63efdd6bf56b8994a44c9
 EBUILD hspec-expectations-0.3.2.ebuild 675 BLAKE2B 9c8de9d799ba2dd4ef0dc6093973afc84d1dc0d5721537c0e27c5d1df6ce39a536df33950166d08910ac4476c8c99915d9d31a2d65524b57fdd95c7a3965055a SHA512 42e72c41f6b1c1f3e5e43a38854ff8f316fe1a56f5baa3606d05f3ba2f58f9474a2cb4246e5747936cdaf182f59ae5ea0b3bd3809550a0d7c257b6b2e01e1ffa
 EBUILD hspec-expectations-0.3.3.ebuild 670 BLAKE2B d66250b4f4f521666f1ae8c336284c9216347d8575639aeb0e8160311b71ddfe544e1dee4b5d5f89bd281b444cef6dfe677e2a6b812a1606399d9225445243d9 SHA512 8f5beb0b5fe2ac8aeeeda8c441ecfd9125a2d257ea46d133681e393e95db6c31e13242ed480f32ec7c42d0847228198c148f3ee1a24f77525603ffe1b0966301
 EBUILD hspec-expectations-0.5.0.1.ebuild 670 BLAKE2B efe71935590e391407a6efc8b0b515e66d5f2d6556e7cfa5218f30043dfc8270e2c19c186b3eda8180a414799badb17883b3335ae04c95232cd2f61c510b45ee SHA512 be1e0bbc8ddaea96007ce2da81eec394b6b485058c08494a0e754cf34ac2739a8e18d36c72e158d1d7607da1012f608886685d4e6a05fd56bcd58fd4f15d56be
 EBUILD hspec-expectations-0.6.1.1.ebuild 780 BLAKE2B d5cfb7f6d39360f8d4a798c8cbf5960043daee3c899655da173d5802980576c2cba3f60a023b0b10e4883a4dbf5f6a0c4f438a3f0a682e0c9258ff36217a380d SHA512 6db25e2d7651adf0bf570cff9b6b4f4d077614b8c5a6bc19780ec5c2363720e5fccff8ece3d19862640fa9b22025fb256438824f5cba2878f9ecd7b8e64c3e07
 EBUILD hspec-expectations-0.6.1.ebuild 669 BLAKE2B 71776450fc5b8bc50acf669115badf01353d98f99ffbb1e447b31f238be0ac09c5b4a46da1098d0a21b55599c5731694f81fef73d9b37f79855e0fba5197d31b SHA512 ab7e057daab0f01c3d1c8dc3651c3ec8c515ac17da80c9c23c15cbd4f93dd7d69899bcac75b51056b9a779ff699894f46766c6a85af131711e0b24d41bcf7419
 EBUILD hspec-expectations-0.7.2.ebuild 572 BLAKE2B 744a4bddaf20774aa0e07f2a2a4d5f11e3fceef14857b21398d0e520f2cad16b869bb8b5a2cdb2210d0961cef72b62fa4e23b5588dc60df773ab9b9a32bf2be6 SHA512 dafc2ea6f09f18fbdd5aa70262e8aba74184d6c7c15a5930a15ff4ef903c6335c5f2af6e5ac5d8778d1e53cb66646084421cb6d31f6ae47d23904be7e4bdbd97
+EBUILD hspec-expectations-0.8.2.ebuild 683 BLAKE2B d663a30705a3bb46641d986460a399aa8c295a221a91bca48a894b6893822f3a00e57918a68b2501eb4a8155fde5c922f8ff332b9b618a186b1de7819b8d8ab9 SHA512 38f0c1c70b7820038ac4b4a1146a61e1a809836862966ce9f2330a349cd88bdec735e41f5939e68f64d8515f43cc0dabd3f804ca2ae1189bbc8d839298ff98a8
 MISC metadata.xml 471 BLAKE2B e8473c3d0b1919312334f324da57f409ce668e4b364e70e74fc2c61830e039b256c0c7251c4e29f2c37e9182df8b75ad455d56d23383b4803ccc48603dbc2da4 SHA512 51d1288db4d4c64234cbfa82fba10c6b9bb830fc7e9e0dd58eab31450a03d6b2a8f265121009f039064c917dbb46a235e425c1ae1c4a2cfc526c6b818e6ac97f
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
new file mode 100644
index 000000000000..618abe1e2f74
--- /dev/null
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Catchy combinators for HUnit"
+HOMEPAGE="https://github.com/hspec/hspec-expectations#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hunit-1.5.0.0
+		dev-haskell/nanospec )
+"
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index e261108caa62..456a61674dcc 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -5,6 +5,7 @@ DIST hspec-meta-1.8.3.tar.gz 20877 BLAKE2B 7840d09c0fb00270a5d79af088e616a271abb
 DIST hspec-meta-2.0.0.tar.gz 23370 BLAKE2B 402999f1db24d8f0a79f7b7f999d2c39aa6be3ade6e6daf99b58abe5c573fe0dac39fd09d454ecb34ac29e4b5354933d729951d7d5ed200bff92a50e4da8d325 SHA512 434bf1e181cc41780f1367019e200b330a3d793232774188552d893197c1e86731aae73a4d8f44faef2289c6eeb26398481cc0b1aa8a23a414dd849655d7cfca
 DIST hspec-meta-2.2.0.tar.gz 24918 BLAKE2B 903a7dfe4b5f4f8d644fadbd8b5246b252173b6b04a319d4a7af798f1db5ffc02c66c45954c42912f5814ba9017453a5f78954a0ecf166281021e4335bec3a2d SHA512 2c2f928523d38d8b8a53ad64abcd3e612d2de3cd443197653283e02f19133ff91d42d47a85819f03189d02afc515427a0c88f43a0ae6ab819644674b30bae1d2
 DIST hspec-meta-2.2.1.tar.gz 25104 BLAKE2B b7a39dc75fd16f08d01c4ddc68b5e9c8ac81d7c3eeecd9b9d93be46802de5d2d6f7009e24d2a99f104c7d498ed405b68e6c9f916542bbb4d38e429b3731672aa SHA512 836532f58896993c83aefa57c3e0643359c02aeb208321421a6042c60a9fd7e75a80f53af2d1929cd284cc82e0d5a7b5cbf7baad175a9cfd1b742932d364b4c1
+DIST hspec-meta-2.6.0.tar.gz 49275 BLAKE2B 1c79dea90807e4cec62fcec6f894fe57639e1f8f46e360d9a668bde1cc04c9c172075dfc2b605d7d3b6399a8905920ecfe2cbd82412b8f0224e059717d19013d SHA512 c35d09f84c093ab5fe7ae31cf004d485cf6d15a06ee7c98270d3f5c471da6e0c9a71c8ec6ca0aa87e7454c9470b218c24538270711677003dc63d316fb23dce9
 EBUILD hspec-meta-1.10.0.ebuild 938 BLAKE2B 7b7bbd70604a5fa1e5fc33d7ce678424d984212731ca1436f38674216d4603e5e5073f79730269574567bc7b3fef02b6f4a6d0852a0290b6c6bdcc0604c2a8cb SHA512 144341bc7f7b9f402063c3ca0c9ca886a501a895a3de0eb74efca3f9374ba7b52c4ceadb0759c08789458ce8e5502f73224fcf37454fe12719064fd0eacfb709
 EBUILD hspec-meta-1.7.2.ebuild 1016 BLAKE2B 339bb645cb31d6f4dfea259a3e604356e08543c0215b4c810d1d6e4a0803089d4d679f923b84bda8dea69095ae333948be02f7641553714251f42ac7ff1a7468 SHA512 ab9d951da8b8d2bb07d06e231904a4d4459dabd0ec3feef9fd8b0d867b20a2bcbca63a8f9e350983659fa198dfdd8caa8e4234606443e610b0879a1e8a0764f1
 EBUILD hspec-meta-1.8.1.ebuild 953 BLAKE2B 195ebec5bf780b8ebc6f48726745b6660c4f9febc6f751530d423ed361943013b1b897abfa393f2adbc55ba86b0fd99b556e1e15c9124d7d2fe3af84bb8983d1 SHA512 81bffd0f59101544d7ca43257f7a78f53c6a06779453569ae5945e26c8abfbaa5ed34c48400732e335f5be27a14a5fe0d45efc9237c8be1f27f69bd551e8a7bd
@@ -12,4 +13,5 @@ EBUILD hspec-meta-1.8.3.ebuild 953 BLAKE2B b239c84e7ae83618048e9c832a9eeeb99fb73
 EBUILD hspec-meta-2.0.0.ebuild 886 BLAKE2B 589e9cfeedfe31af2d12618656f7a1ac8c36f27724c7ede082c034f8eda5849cd06ca0cea540d12f1207002681b73f56f01a9a7cbf89db2658465515438b8113 SHA512 a4dfe0f8114edd31228a8d7f313e50962cc45d00bfd84ce0c557e50ee7ba3d442300837dd169ea3ad2edd033e551c108aeb77937c06a8704826f2be451142f5d
 EBUILD hspec-meta-2.2.0.ebuild 886 BLAKE2B 0f03d4602690e48078d46e379aed48e5ee9ed2133899c54623bdab3513ff59ce549531d9b636ac8941594ee6943512a4269fa1e1fc26fd8f72d72cd5122b6902 SHA512 689792c9b48b6eb024b8c16aeb2ffc532533c3fd88232dfcf573efef39df9b46ff1d0171dd2b55afe01941279029368dc665aa6576027d6f88ac9302d0a0b94f
 EBUILD hspec-meta-2.2.1.ebuild 886 BLAKE2B 60fa62dce2c0ebe8af37e9a7e371bf3b81ecb5810125e8fcc5b6d51625f456a4ded6dc359528a6cc461c9be5ba493886ab59c5b08a012eb286abe1571f7a4950 SHA512 726b4bf65e44ee7e49451b9802dc1429e8e5298083b9b7d0b9ab20b431ed395e9afdd831af6dec0310cea34e778c8fc021ab33b7604e30ef8201e2060d0876bf
+EBUILD hspec-meta-2.6.0.ebuild 966 BLAKE2B c23ccd0386783bce410ed74238a4c8eb03521821d739f3a61d88e04892dd05a45d1ccd9e560e24fe341f3112e4b8084112e37b708a11355c69218852f2fe9152 SHA512 ef35ca7a8ad6769120c836f545ae27338f9004ac24d882674755227f5a33ba28e0d3dd980d9e314b4b312aea74091e75c5c349c09d0090bfbcd40dd8493271a5
 MISC metadata.xml 377 BLAKE2B ca726852abecbdb02e2fabc55495e7d0392fe74d87ccf1e20c3ef47979eb94c7f36733c4735d3a8e833890ea6d8cbc1eb7415f198c394a0dafcbf72d55a30896 SHA512 70eebf5c6ef843e63ffc25ce6b9f01e7c4d85561998b795bc856ef8c94919b7c26cdf6a959aee25575b44bac02e3e2fe28c22203f77db8669e98b5c4914b91eb
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
new file mode 100644
index 000000000000..9b5b1040a23d
--- /dev/null
+++ b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/ansi-terminal:=[profile?]
+	dev-haskell/call-stack:=[profile?]
+	dev-haskell/clock:=[profile?]
+	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	dev-haskell/quickcheck-io:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index ef90c587869b..8784fb1d5800 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -7,6 +7,7 @@ DIST hspec-2.1.2.tar.gz 5200 BLAKE2B 387a3f54bb55b805c6a8b437cf814ffdb800cffdf57
 DIST hspec-2.1.4.tar.gz 5201 BLAKE2B 056e64b74bcdf8ca0ad5c1b37c67b5a9b921a1ecd06627cba31216c074afb8304fb03e465dbfbd1deaaa0d0977d11b48d5864836ba21d9884f3b7aa3f5165483 SHA512 04def062e104e939510fba9e4d386df40f964abc07bd0c6aefcd2dca0b4abb8519073ba1ebe6e47685eb558c30f9be0986cce30fbc1cef83e0b9daf66f040398
 DIST hspec-2.2.1.tar.gz 5398 BLAKE2B ffd5cc2195aee1b6226ed6f67aaa742bbc03078a8431dd46b538bf333d3a3f8e6a3c2d2ec2a7438ed62e87f6ee903a4ef752096f9bfd58d9d42e8ac5b345d674 SHA512 47af2f1f129c8d045305e080f504c469332bd9c50c0f98a3a165bd8fd11772a499b13e223067d59a959d2e83d2858447d89bf9b83ce4c4d857e7d39379bb07b2
 DIST hspec-2.2.4.tar.gz 5438 BLAKE2B 29f4e53c8bde62314e0d351c25afb93219783b3a071fb77820955ef4dc812d206f92de43d621a05eb83070c04dcc873f82fc1100f6bfb264d7510ff755aa820d SHA512 65a76857fc6e46b1f94a419e4541e14addfad78e0cd72355aa00ba0cf035479024abf6b970e094ad86a42db6e303662a55bf25e81384ce39f00eb7e07259582d
+DIST hspec-2.7.1.tar.gz 9270 BLAKE2B b4cd1433c0e5eb0075c1560c244767cba9b0d34591fbede96c6ccc4f3ccc55f414fcdbcc943a21b7e42254ed091b4f2d496af5b42999ec8802468d9bd3c83965 SHA512 64e69444d447072ec501b745c7c8913f38bb6b540db4867ed4cbe4752e9d147e8a7e75538c15be7d8c65f9f8e7b48654e8fc2b53ae733a28236074fbafe9a6c6
 EBUILD hspec-1.10.0.ebuild 1122 BLAKE2B f26b23944142eb424e5e596398fb0b9349447cafe4ed1a5f7f35e81d2ebaafa1b07911dc9f6fecd66713ebdf4fc0e5a93016e5d9188ac70cb288ca228c1fd06f SHA512 7b7016bef6a906fd704dbf95ae3af8a1998036b1e18fd3cb5958a1b70858cab9d65bdaf86fec31b90c34076c314a3ae14b280be800ade23c74be968f42549843
 EBUILD hspec-1.5.4.ebuild 1069 BLAKE2B 7a056ad4aef1c2bc2745bf19b5614afb217b6dd1bbf013f4d67fb9f29c06e97b51c458414b022fa61e9b918a47d26fec4be89a98be743bacab0454b2c8637413 SHA512 e098f78fa6141f6b240d0ea3198a6102b18e47d5af3e90ae4f291dd873d316df2c19b85dc0b28c2699b786e3efcb7f01cb72d43e608c746b730a239730818898
 EBUILD hspec-1.7.2.1.ebuild 1142 BLAKE2B a3b4b464224c136f7b998c17fec2bbac630e40a81d38e73bbd635f8d87dccca3b872f857a4e47afab1ed6fc1ec5e32d7c402d7b6865226c7c59db8f38e9c6ae6 SHA512 e2a7c9af2a732a6e76b785dee63b0ef63dc3e2e63225bfd1dfe5fdcbd30cfa7819842309e0ffa9657a6269beb7f4e02e183e661504c0c53e8ae745e32ba4f25f
@@ -16,4 +17,5 @@ EBUILD hspec-2.1.2.ebuild 948 BLAKE2B 6efb9b03f8f0e9a8d6771369575b9d4b7918ba7d0a
 EBUILD hspec-2.1.4.ebuild 1016 BLAKE2B 556e60747648e564f8a8b64ec9d354a9534a59f332932f3db1f8605e2463dfa2140d305fafa4591e612eafc4db16529c1b513d3e48ba9a05f16888d6f63b69ff SHA512 57eddfc1740f188bfa3c7784fbac3814fad58d962a8c86a5f4c0c938b6cae753534f7786ac50fc3e7938b2d115d2372face1c6202357d0d6b9987d56b17325e7
 EBUILD hspec-2.2.1.ebuild 990 BLAKE2B ada3cdfa2843d94eb34aa04a884eeeb28995bba50685f6b3c9821f17c1894e0340fccf0ffe07c1bdfbebd3009695d366745152ca78a92b86b0348d62080d8425 SHA512 f1951c719f5891babeb83b6f881b219d86883882f6a4193f92ab117ab4ed721ad2d07b83ecc47c0ad0cd35e59aa3dfb6fcc5f17218faef210181aa1f8ecd3cee
 EBUILD hspec-2.2.4.ebuild 919 BLAKE2B d2a4654e01b0eff2e6c899143f2ae2008b2a4b41a0d0e515853d3db53a965faebb64b259a4c14ff8b1015c89ac8a5e3e5e8ac1a814bc6e277bafd233d025c2bb SHA512 ae18daa84aeb5f13601ed91f1319e35036dc6c7a54f9823e7f81ac0864bdee13c7feff3c3ae6ad13e4d35f9cdde87c1d0935d5a897b1ad44594e9bac60c3ac9a
+EBUILD hspec-2.7.1.ebuild 755 BLAKE2B f76fcacaaedb033a7d697a55e998ecbd79f5e0742d501468fdc111a6beaebeac1260c1a3f3e1314bb1b6a0c5a03d46bc546a0ed8f639074e6957da769b28b8aa SHA512 b8da1c861cf44af2308bee033ba12ec6c9116d99aea06d2a886989866cc15db6edc679fc5ec54c3ac9fda3a71c3023d0d979f5a4444525a952c4292dc72be4cb
 MISC metadata.xml 555 BLAKE2B e95567c7dfe51abe6b4dbf29a28f22c7165a4ffca7e4c854855a1bcfc69e54f9f989f5f6fa50caa304a3d2460ef92a28a5b9a72497f990985b965d52470a83eb SHA512 fda12d5aed53f2c99effaa133127b2811a3b502e405f60a84effc3e340b567d6315e3ec54b2a7c98cc28d3df80bc2fc6091c6b868a7c097fc923d91ddd189005
diff --git a/dev-haskell/hspec/hspec-2.7.1.ebuild b/dev-haskell/hspec/hspec-2.7.1.ebuild
new file mode 100644
index 000000000000..4634717e59ab
--- /dev/null
+++ b/dev-haskell/hspec/hspec-2.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="http://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~dev-haskell/hspec-core-2.7.1:=[profile?]
+	~dev-haskell/hspec-discover-2.7.1:=[profile?]
+	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
+	>=dev-haskell/quickcheck-2.12:2=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/hsyaml-aeson/Manifest b/dev-haskell/hsyaml-aeson/Manifest
new file mode 100644
index 000000000000..12c4ed38d38e
--- /dev/null
+++ b/dev-haskell/hsyaml-aeson/Manifest
@@ -0,0 +1,3 @@
+DIST HsYAML-aeson-0.2.0.0.tar.gz 11095 BLAKE2B b168c5d676718c99567835aaaa53321ccecc7b089e15850676a0b600f6ea2280facd4cf22e0212807c6c952287b125d52974ed19240390c0bc22d54c7047a641 SHA512 09da59c38e9fead3b11bbb6752cef803ae2d60392b710ea3958091d6256ff267f0b0f9b27293bbbc96a9d3af08464e463feafcba4a7caab6fd78286127f91527
+EBUILD hsyaml-aeson-0.2.0.0.ebuild 1078 BLAKE2B 3cd21eb6465fcfff1b4627bc7187cf473610d08b0cec145232f9ea8f37e6a1c868fde5c0df4d2ab5ca9b500c7fdb54db7f7fa0c404abec6f92af75ed735fe57a SHA512 83e3b91b5992196449ee7482ef1a54058c82df2e28502be15658826b77877ee6c618a245c89358b0c56f19d0160d593b3ad3c106d4b86809f1cc30b71d4813a9
+MISC metadata.xml 1037 BLAKE2B 02d3095ac849461220a7d23a88b68e0fc8e1da8bff6c62fd2e2b784c43d541fe14a7204664c6f2faad73a17a3c7dbb3c50a9fec96bf91eef2bd0b51de283bf3c SHA512 532f80ba57e402f5d124d05a0c70dacf83415fb0fba132f89c064a79a01256802aab028da2fb8262b754807d4142e7cef517f4126c845cd34acb945568f23ee5
diff --git a/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild b/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
new file mode 100644
index 000000000000..a6483a89c316
--- /dev/null
+++ b/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HsYAML-aeson"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="JSON to YAML Adapter"
+HOMEPAGE="https://github.com/hvr/HsYAML"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base         >= 4.5 && < 4.14' 'base         >= 4.5' \
+		'containers   >=0.4.2 && <0.7' 'containers   >=0.4.2'
+}
diff --git a/dev-haskell/hsyaml-aeson/metadata.xml b/dev-haskell/hsyaml-aeson/metadata.xml
new file mode 100644
index 000000000000..a66d30e2a063
--- /dev/null
+++ b/dev-haskell/hsyaml-aeson/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		The [YAML 1.2](https://yaml.org/spec/1.2/spec.html) format provides
+		a much richer data-model and feature-set
+		than the [JavaScript Object Notation (JSON)](https://tools.ietf.org/html/rfc7159) format.
+		However, sometimes it's desirable to ignore the extra capabilities
+		and treat YAML as if it was merely a more convenient markup format
+		for humans to write JSON data. To this end this module provides a
+		compatibility layer atop [HsYAML](https://hackage.haskell.org/package/HsYAML)
+		which allows decoding YAML documents in the more limited JSON data-model while also providing
+		convenience by reusing [aeson](https://hackage.haskell.org/package/aeson)'s
+		'FromJSON' instances for decoding the YAML data into native Haskell data
+		types.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest
new file mode 100644
index 000000000000..978d1ae00f17
--- /dev/null
+++ b/dev-haskell/hsyaml/Manifest
@@ -0,0 +1,3 @@
+DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+EBUILD hsyaml-0.2.1.0.ebuild 1342 BLAKE2B 6f7257268c6ad56894b24d0f57a59bea526258f2e4b19e0c5ae57d8c697a930e087c6775e136d091b6b965166fb57ec23c4a0198f603d3872cd9050fdbd3b1a0 SHA512 e3074431b4c0a2582da9a738d0273f6c51242979ff069f28b06fbe81a93cf394f4d8bda5b7cc03c84acd340255d82bd5169fa52e721fdf39705f768843899b86
+MISC metadata.xml 1257 BLAKE2B 6517367f3e13c4ad4d47af8ed098b9aa0a53d38150ec5777fe63197c0e0f5f03bdbe4154aee763735c72c5bd407559d1b9e1af1231acdcb65de7d75efd0c1764 SHA512 c070e085bc7682ce4b2f6abb37a9804898e81e10228573f975a33e0dad6101b834ab7a873f8cc1b04884fe64f322c59024b210af79de5d9aad4a4980c5de7aba
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
new file mode 100644
index 000000000000..756bb6481b97
--- /dev/null
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HsYAML"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure Haskell YAML 1.2 parser"
+HOMEPAGE="https://github.com/hvr/HsYAML"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14
+	test? ( >=dev-haskell/quickcheck-2.13:2=
+		>=dev-haskell/tasty-1.2:=
+		>=dev-haskell/tasty-quickcheck-0.10:= )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base         >=4.5   && <4.14' 'base         >=4.5' \
+		'containers   >=0.4.2 && <0.7' 'containers   >=0.4.2' \
+		'QuickCheck == 2.13.*' 'QuickCheck >= 2.13' \
+		'tasty == 1.2.*' 'tasty >= 1.2' \
+		'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10'
+}
diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml
new file mode 100644
index 000000000000..4fd3981c32d1
--- /dev/null
+++ b/dev-haskell/hsyaml/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		@HsYAML@ is a [YAML 1.2](http://yaml.org/spec/1.2/spec.html) parser implementation for Haskell.
+		
+		Features of @HsYAML@ include:
+		
+		* Pure Haskell implementation with small dependency footprint and emphasis on strict compliance with the [YAML 1.2 specification](http://yaml.org/spec/1.2/spec.html).
+		* Direct decoding to native Haskell types via (@aeson@-inspired) typeclass-based API (see &quot;Data.YAML&quot;).
+		* Support for constructing custom YAML node graph representation (including support for cyclic YAML data structures).
+		* Support for the standard (untyped) /Failsafe/, (strict) /JSON/, and (flexible) /Core/ \&quot;schemas\&quot; providing implicit typing rules as defined in the YAML 1.2 specification (including support for user-defined custom schemas).
+		* Event-based API resembling LibYAML&#39;s Event-based API (see &quot;Data.YAML.Event&quot;).
+		* Low-level API access to lexical token-based scanner (see &quot;Data.YAML.Token&quot;).
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/html-conduit/Manifest b/dev-haskell/html-conduit/Manifest
index a5a350324c07..0cda62972c64 100644
--- a/dev-haskell/html-conduit/Manifest
+++ b/dev-haskell/html-conduit/Manifest
@@ -1,7 +1,9 @@
 DIST html-conduit-1.1.1.1.tar.gz 4004 BLAKE2B e38440a26bbe1d0f888dc4e773647f6e5df3982ba139a7dbfc2b746122045763f8986bf73a13d89331dda9cb2de4891ff6b8cb002cd21bfa16a64e8dbb5246f3 SHA512 fc69c595f97c952d624cc8a22597d6f966ca343dd8f6b9c5da8085ba9a7609e1bcfa803dbb705e9911c5a86de7456331226080869a04a56b69ec36f4ab5bdb50
 DIST html-conduit-1.2.1.1.tar.gz 4125 BLAKE2B 6bdd59682118a5c6724f360142f89577aa1c19502a3896b7b8cc59978c05cf13b1a626e433d4ee74348792ccb12927f10fefb49f28644e4997d54675bdb3d067 SHA512 601c1b840ab194b6a3e89c1a7af7335a8a8e2a9c01bdd4d19914c1b512bc1d56dfa199855072b9e0406f8744607bd3e3efe3a480d2dc824048b67cfe1034e9b7
 DIST html-conduit-1.2.1.tar.gz 4117 BLAKE2B 9eeaa5a5a336c9ff9f43224d4dce2f92f5c2ebf1ed6a4e302c3a0891f8111065ee4cf0eeeef745ef83d8d23dfb38b964b0089302cd8a16d517353d985ee60f60 SHA512 557dc27479cb83cb958839ec29faca4997ff52f848430b5a3c20f17dcf388c76848d0c83db376077f8a6f192312e124d5b0e6b86589d40053e1a657ca96ee5ac
+DIST html-conduit-1.3.2.1.tar.gz 8976 BLAKE2B 070f6f0bc2c47c5e884d81cca1ccd5c72fbfefc39fc4a3d937d9a10ebf496b405b3e4f46382a882fc96cd12247ee00a834e90d2d06256316c96e2d3e8f2d3147 SHA512 94e9db8db839c5368f5a042a7039d44e3fabf5ffa30426894675317b985288c0d5fa94a6d1864b94802ea2fda3ff2728c4578759405dacdc64d8e2cfbb24aa70
 EBUILD html-conduit-1.1.1.1.ebuild 1232 BLAKE2B 5a20a6b610c5af08872bf1c4d1effd6f39cd2943688251c287307f5404870c9d9d2d50e8a7583d48cc82fa0b42c0652bc7e38f2d489e677dff952b6cac548e2b SHA512 b4c6961683c5eb6cc4af45da2d9baac692d272797ebbb7fb6093e4d312bab4984c4d1d3f8a1ff45679ccbacc25bd0ddef23f51264cca1a1fff9a9ff92d495f08
 EBUILD html-conduit-1.2.1.1.ebuild 1109 BLAKE2B b06921f05257d0883659446c7cafa6645da82e16fb00962993b182258ada11360304a78dddd5557cb98397f5c7e105d022ffd53e8e4d3ef016c2ae2c8015d5e8 SHA512 554d466373d2eb479992f350053af7c8e37be239c68d0c24faf763eeb3bab5ad94d79b2ee0837add4f4d2ea388f835f50519f86013f37309f47d5d6b40103638
 EBUILD html-conduit-1.2.1.ebuild 1144 BLAKE2B d177b3e9ad75326031cca56d7c4c39a01c3034a99fdce95ec98a5e238f9ad3d7e74d383993f9041200ff160a72368358447c16da2a80047c7d908367cebebcc2 SHA512 b6515417388e0cb153dbcbe07b9af6f844be8a560b3e3bfb725d7deb059cf37ae7356f336343087e6138c512b56efa001065dfc3d32b46d72e70ff68264dc4d6
+EBUILD html-conduit-1.3.2.1.ebuild 920 BLAKE2B 77ba57850988b9684684fc21af7befed30d48256c6e1d0e12dcac9cdc79b580d4edcc87bd134133f9e242cb5c4f8ce6371fa548b1a93a7c13c120980eacd6da6 SHA512 9bbb290cb8af708ae4baa0d866d3faefb19f08c1a6da48ef683da73d314848b7c203a8bd763d0cda3530f3ed01b32d86bfdc75fb5123c5f4a01bf929a9086b42
 MISC metadata.xml 603 BLAKE2B 2e16ecb493a304d9b03caff945ba91f4e6b85f15669947c1a6e30c9c25fc8629aafb03318e77c714396f523fffea98cc687efd9ea8f23d89fab984347cf666c9 SHA512 5a83ca04664dfd65f6e9a8987695cd7936c4b16d4774adfc9599f71bb64360fc1b16927d82de20881447a64cd9c63bee50442514457f6b079ceddd2480be93bf
diff --git a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
new file mode 100644
index 000000000000..eb613fbe946e
--- /dev/null
+++ b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
+HOMEPAGE="https://github.com/snoyberg/xml"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/xml-conduit-1.3:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index 07aace468ac3..80e9c228ddae 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1,3 +1,5 @@
 DIST http-api-data-0.3.3.tar.gz 17668 BLAKE2B 8b4dfbf237312cd89413d45d31fd0730eecc4459e63d3e6f66bc1fb128f5c1d0358c3726df453e805014f5607373b2883fab0e38b54ede83ac4417cc6be81296 SHA512 125240fe0da41ff118937864cc5386d50b58cba98fa9d463202ac73a07b2d530563c3a7c41f81be42f25d99bcfc12ed01dca095a000f0cefc655d8046c3aa00c
+DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
 EBUILD http-api-data-0.3.3.ebuild 1308 BLAKE2B 93af39eef397c13d8af3b71a8e814cf61799b708e58ae5f95f44d461fcb5ff3304e0d1cb64ef4175ea2d9e0d3f97ea53ab23a8b7d3dd05630e99759e670ac371 SHA512 08b6ddf8c485dd42b48f9dafb6190279f97f9ae96f6c8af7190b5920516b97e85a30d8e01ebc615f0ba39fb60cb172a9e20c470d2c75620d393dcb0a308801c8
+EBUILD http-api-data-0.4.1.1.ebuild 2235 BLAKE2B 76eda71dd0eb62a2ac7ecc8e455ae7d75d21fd9144b8654ed93fcf5c68fe23071640a034fdaffec1e6acad3f0297730efcc10da9cf2147f3b424b53bbb9deabb SHA512 c8954f6394dbf3b3911adfb9208a686de9c51738178408cf47ef60bef421cf5ae31d18c0fd837c86811acde72da27d110b3b9b70c819e0ac387d311a537b09e9
 MISC metadata.xml 451 BLAKE2B 8c5f2ff5dd8eb41a933d14573e09c78963212aeac180065cc12eb69708f76d5fe7d7843384e4ff2095d3daf5764388a9cb14b96aeb37bbf3da7207178b3c28ca SHA512 c1d1bbb22c5eda41eecfd560624513271598fa334ff36eb58fed7aac29e1631296ca2ee53fd05b1157615a0d394dfa8e1dbc23257d4e7f5ce8d0456ebf342a7f
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
new file mode 100644
index 000000000000..f64232f9c25c
--- /dev/null
+++ b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
+HOMEPAGE="https://github.com/fizruk/http-api-data"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8
+		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base                  >= 4.7      && < 4.14' 'base                  >= 4.7'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-use-text-show
+}
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
index 9ec3eea13021..e7b1fc3a1c45 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1,7 +1,9 @@
 DIST http-client-tls-0.2.2.tar.gz 2962 BLAKE2B 40a3a5c03425fc26435de089c58426e25923ac4a14528e05b0b0d9e82867a9e3673a7d3db4bdb21a1838fc19f79acec8323d4341c8c8a63b415b2ad39bed7e66 SHA512 fe750f8c89efd6f65ff4f80ed2e56caadcbd6135fe4dbe500c763994773d91924cbd12073b84dc175ec617d76077febc790a45e293a2a4bb6ca840d0f223629e
 DIST http-client-tls-0.2.4.tar.gz 3555 BLAKE2B 0192b1aef91c4023692b0ecf2270e38a5b4edc0bb32526e993e8764d593b112e9d04b3f93d1b55c5eca6de1f6cb95b2d5c90a9f4b5307feb763cc49b992a38d8 SHA512 3394b4cc6d8d398c17b3f06f6e1183103fadea0527c4fdab963a7e7cefb3b22fd0f0c3dc285efc7a8a1a902edc30f52a2ee35596dc173769c7fb9be6d033b24c
 DIST http-client-tls-0.3.3.tar.gz 6154 BLAKE2B bf7558a56194a21ee4829a679ecbde612de7abd922cc83fd941948dbf4e9f80163942f9d564479af3e1f49e49e5c22476538c0d33ebfb7f0fbecdac1a2325007 SHA512 eb4b094ce8c70154554564651dbaf57db80338b3fc88938a67fc5d7425d9f1793e805aa62cc90c0eb2d8a168d89769b45963b0382729103850920eac5fcd267e
+DIST http-client-tls-0.3.5.3.tar.gz 7679 BLAKE2B 490fb9af14ba814528560bab7cbf37bf348db38078d08d6be07934e52754741bc3b0ed91e614598ab8b26e19a67d7c6121f52a59b0b9ee47481e5c9bdf3cd36d SHA512 df4fff9fbd6736a52d54bf04669107b24e3d31c22b0f7882310204ca4ef1a895e9f79cea289423341aa575759a2667ff9ca86b889567605ad3daec266a1bbb14
 EBUILD http-client-tls-0.2.2.ebuild 901 BLAKE2B 6c85ff72c12154c33b0ae26ae57dacd21cb91ae4ab1046652778963f75565e88f501f293bfa847df772835b37a2dced6c64b9ae245b9182f5ab3b9cee87fa397 SHA512 76607ed2304c1320934a21fc31d2b9b8c5eaaf12b2fb3045876e49c63328536b373074af8882502a29fd451f4e33b214d195412ccb5ea1b251bcebd67e2bfec8
 EBUILD http-client-tls-0.2.4.ebuild 834 BLAKE2B 8dc9b7c641198bf1c60ba3086c288c13e20f4311318d1c1e1f97cf695c466d3e9673ee215fc5cd6799897ab2e9b15c0b62226cac9504dcc1ad21d7654334202f SHA512 6f682499f8e5f8d16c0fc24214514c083cfc1132264bdc3e6230f8fa38f2e018fb357a6e0f8cb93fd75443b358bc083d5466286e896c4b14096dd79e447bb7b6
 EBUILD http-client-tls-0.3.3.ebuild 1028 BLAKE2B 958cc91011ae9b67e301234fcef3992e6eb3a1737a5bcf0256133095f3728c02d0ee6a5f6d3a4190e7dbc4e679f038bed829c77ebaf045eb47a4998de29ed2c9 SHA512 e7fada98753eef18a7533a0575f94f3439789b5c26f26a0657c65b11b1831737077c53f048500f3b7fad009ff195daba7232fc7e7109830b52c9cdc5579f766a
+EBUILD http-client-tls-0.3.5.3.ebuild 1100 BLAKE2B d5138409073bdf15f18d2579f4fbd2ecb81d5b9b746f6c7970c287167742ea83fafaef1307559478301eeb37ff754400fa1ebc794df278df66218e98bf53960d SHA512 6a6f410bece26bbe2735412912d5e27ebe92fbc9cfeca495969e29f1679d9f561f1c58933b4843300a4b85a0cda11cd10ddc77f0a47f8111c1fcc27d693fef73
 MISC metadata.xml 441 BLAKE2B 33456ac8ae2845eed00ed66ca3d754b83e90c33a57f6e84dc0ce31dedd9f2fd2b711397759b8024629dd011e18b5942db3567093a3226bced39a8abcdd6c6d44 SHA512 dbea66c32c3fface3c17b221436091de83efa7368384bdfdc76acc36672e6d7afbb3c5ffd08afe627c43d0e891dac4fc8053ea6de6294e0d1a7a0eb87edf4988
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
new file mode 100644
index 000000000000..a75058c75742
--- /dev/null
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="http-client backend using the connection package and tls library"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs network access
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/connection-0.2.5:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/http-client-0.5.0:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/tls-1.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index 5af0a4d4e213..8b167b90c485 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -2,8 +2,10 @@ DIST http-client-0.4.18.1.tar.gz 75796 BLAKE2B 07e1f5dcd898e1e3c2f3d6d172d13256b
 DIST http-client-0.4.30.tar.gz 79327 BLAKE2B ed2819a51a888c0d09e71791b3eef1ac947138361b21a036810fe949c5a7368dec8f88b7dd86334c845777bc28b85fb78e50ad5813c48d7636e92c25afa509df SHA512 d8e9a2dc9a2f999d5d2ef313cebef9d3e88ee98225ceed64fc220c16d6ee1bf5174e1170bc1f3d02f8ca1dfd4d63631ed204c238cdc9e4a751aa232e5dc42224
 DIST http-client-0.5.5.tar.gz 81369 BLAKE2B 58a7fcb03ab193d08965242d3dd267f2e0de7b82b6d29868a77a52977846e78c9744c3a650e0373c60ff533d6fd5fe08ceb7b1f8921e5f04e62f47d77728b905 SHA512 3289f9e0efe3fa03a99885d12ceb0e2cf881c339f69cd0812ed65d47b00401ed4959fc19c27492de7616395a04b412cbe443af47cd82afdaafcf92e52fdffac2
 DIST http-client-0.5.7.0.tar.gz 86010 BLAKE2B 1e6f938c71d270a3f28457dad3e12000c08ef880f526db764bc06810f01440448a0071181582c3262953c2aa1dcd6d64929c7ae0ff297cce84b832db048433d4 SHA512 5a411fc6b709becdbdb727904851ff1348c39430d2358f780677fd00f154cc85d94f776f120f4435c2e9a89bb9f0a00858df0d5c7b250772c88c50179bd30275
+DIST http-client-0.6.4.1.tar.gz 89702 BLAKE2B 845488745e7429b833c92521be7abb6e03ae90fa81f819995d9fead467fce1f3c43ece8c4f5da1f8242d79086556b0f86eeea3da931a0a613eb49966ca9cd60d SHA512 b9595ebf3cb48c5ed288934976b78270a3092a35ae083853684c848301ee88a18e0e41534180033df071ab87dc9f9cbab99da37cbc74d538472409c13dcfce7d
 EBUILD http-client-0.4.18.1.ebuild 1665 BLAKE2B c32cf159a95d431dfb90caca477216a5ec599813de9c9ff9e1826930a1a6b201a07b2b950accc8fc144bffae368420a4cb5e23c4c9de50664ca91316d405dc04 SHA512 a83ed45cc58a5ad5e72166b194d135e130f85b749733171bb1d96f7057e09ba94950c1d9ced8c2d4fda5b0525cec3d2578f5199290edc7c755b67f128c9a35be
 EBUILD http-client-0.4.30.ebuild 1663 BLAKE2B 23246398e82ed744863053cd6cb0c14420ce1f54ac547fd7b059f11347fdbecaede68ca2fe07f6682c133c596a16466753d14b99e13c4b5ecb813d58fd7148fc SHA512 9a4d07e9b0a1aa44f1017ab966b76b44bcb7675523b46b501fab95dac0d442097b35d9193c75534f9d220719072a3c52375b12b9aa9fe5b06b4ebe0ed45a4c3b
 EBUILD http-client-0.5.5.ebuild 1529 BLAKE2B 03c943598e8df7e27815c6ef96f265efb91954e0a6119dcd6545927ba962188e708ec531c52d2e61072ace8f4394aef729fe18d36c9a5c6140dd55d1b3a0da44 SHA512 3bd77198b7ff832bd4bbfdc4c00691c956ce09748093891f3c820c41b02017f314ceaccb0f10fc3b0de04e61e0d65ca913effd8e97acee41b1fd9fba4209074c
 EBUILD http-client-0.5.7.0.ebuild 1567 BLAKE2B a16924dddb5a9fb034c18399004f363ee27d2b8c0e9263e44f34844e41a8ea69c92c712536cd7484b129ca78b6bb16285f80d68c21684abc15a00b898cdba00e SHA512 3da9a594975d9ce27412456c69286fffb8e42dd67a33686981658eda22b0d51f40a590eea60b6d011f6503354ab2ff7b56e529b21e48e2e205fa23e05c9b4ca9
+EBUILD http-client-0.6.4.1.ebuild 1604 BLAKE2B 47a4b3503232150aafe3fb35566ce5c6a76349bd58aec53c2ba594fe919f290b817bcb99b0288f592ad10b410f3daa1e75600e51b9b03bab39da3b0daaa5c297 SHA512 fd0979e106b669b260ed9b76bfa82aaa39f03a883287e76804211f03dab039161088de6a824ff196e76e5bf2b64b11bbde1c864834edc9a8c5d75b42494e7595
 MISC metadata.xml 523 BLAKE2B 35c8929a44f77e2666f278d83984c519a93c21eff2a3f887dbcbba4068f6321e12514b03f6532f5c89c627543af431e2ff1888cc64084004d1ab150e74be5182 SHA512 ba4e9d6dee78cc9b803646be59d6c32b10bf13c5398305607722d4a3095e4e37fa6ef67d921544e34bc95e0348794d54178d5498f3c447998954db118e5eda8b
diff --git a/dev-haskell/http-client/http-client-0.6.4.1.ebuild b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
new file mode 100644
index 000000000000..023cfce84a64
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RESTRICT=test # requires network access
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/exceptions-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	>=dev-haskell/memory-0.7:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/async
+		dev-haskell/hspec
+		dev-haskell/monad-control
+		>=dev-haskell/streaming-commons-0.1.1
+		dev-haskell/zlib
+		!network-uri? ( dev-haskell/network-uri ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/http-conduit/Manifest b/dev-haskell/http-conduit/Manifest
index 8f6415a61ce0..aafef31b9e78 100644
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@@ -2,8 +2,10 @@ DIST http-conduit-2.1.10.1.tar.gz 26897 BLAKE2B ccce9e4848649fc53305acc51544b259
 DIST http-conduit-2.1.7.2.tar.gz 23333 BLAKE2B 6346e1872ee339585d8b92d1b20cab06ed892c7fe861387ebf2f547400c991e792a4d87e570be93671fda9d261cde157d5015f4f833abc6138069534637b440b SHA512 020eae7a5846a880270b24d85ea4e7c2742c0f701e9e895b4dcaa1856f794fd00e09951e171104a173679d062789e5214ee24e0d63984e7d94d2cb2e5e7fb0ce
 DIST http-conduit-2.1.8.tar.gz 23331 BLAKE2B cf0c85991a8220f1cdb4bab34e42d58bc1fdf49a48048879efd22d6a1fb78a116edd2475c3165bd0cffb8cc5d9d9c92af2a60fb5ad28e330255daa99279018ec SHA512 a5791e9cc9a5d8a077a54286e163cf16b388e1c1a71f31989e731ad724de887d96bd985805380b3ad7ed8d0570c8577c38bd1a36567ee38924487c7a200d304d
 DIST http-conduit-2.2.3.tar.gz 27457 BLAKE2B 411dfa2858a6058baef12f8e120648df7dd7eef0880f8a5e6d3bbcafa879865b47ddc4b3c76b5b651d1c3d7629a35ff8316abce62b0e6d61f6754c96e953de7f SHA512 675e5d81130d670377d2597a583f2ea8185604f115317cd11493127086b837d0552014fb3feb53b7930ef3b063d6339d2556f7a8f3f5568dcc5332e3b504e659
+DIST http-conduit-2.3.7.3.tar.gz 28227 BLAKE2B 9cc2583809410bf7e52244140eda9152d4021699a287a8f99cf5501f854965893b03f661a8f0d266239978e48518be386ec3f3ed5bdf44030638b94b9a95d26c SHA512 0b3733ce031299ee3b93ca44d45a913e384dbfcd43efe5c65076efb5ff8266058ecb07e90f699ebb54d2d37f4a299be79717c3988e72cce631d417ba21ed4d08
 EBUILD http-conduit-2.1.10.1.ebuild 1698 BLAKE2B 1dc4c29a28a8f4891eb1283352dbdcb3ff7a7f10b764bfac0b26e7817eb609a163417e6dd4b7f314dcfb124e7948de7e15ddea708007a61afc0cf1f1ba4541b4 SHA512 411668adc309de2af973170c7d36d574e6fb8f87b7b1c99fd66bb02967fc493a2b5d3165ae7795233b360ff3e1ff4369e7ece9a943dcd39d1c3444cd81a75775
 EBUILD http-conduit-2.1.7.2.ebuild 1566 BLAKE2B a474f2dbe8d0c81ed82eeca109b299d78b97aaf3cfd2aad3b6cdec3698622cc667319462614a4ecc1d88fdcdf3ec2a37bee8a12838459136f89207b5e63e6351 SHA512 27882bdc77b60d5ce3ed11bd880384214fd3b2e0d4ecba87a017be9630169e5c273d65a2af3419b28768322f5a883e5eef69585f77309415f2fd06d704daa97d
 EBUILD http-conduit-2.1.8.ebuild 1567 BLAKE2B 3d31eda6bcc31fb3d8c55f5de72c9787818818c08be18d6d6039d8ea4dbd4c426b4ba4c5eaf5378f28e5a7085f1c7ffa4f3859affdfdf7dfffec3aa09831140b SHA512 4836af254e107f080b06de96ae527a9256f5307afb67f8dafa072d83cecb57e3b1f722389f5842a8e18420a075e0d82bf9382c2d51f4e73f9d2715c2bf9f118a
 EBUILD http-conduit-2.2.3.ebuild 1685 BLAKE2B b7ccccd19de11ac3454df16f20efd18e51c6c582ddc124fb32da55323a579679bce84b5eef37ed4fca8aba1a2e1dd61a7e611d3cb7f8d16ace3a45577dd65a49 SHA512 cf5d4fadd48518bd0de6a9df42b251e7bd4038e39cf49a970452d2b88d99c67630a12b0cc451a335da841b0cc2fbadfa0f8cf983d79fca41519332d3468e4888
+EBUILD http-conduit-2.3.7.3.ebuild 1622 BLAKE2B 87e88033458a3195f932a46980ef4a2aeeebb4b877800d4dd9ad5a723feb0ba491241482605f46ceedbe907b6738a345eeb6873cbccb3b4e9c5bd25845c3b2f9 SHA512 e5c5d04e91e82c93fd0629363a32cfd734c00c4985f6804d239f3393179af27904fe80ceb5a522492da3ea69859be1935dd2f72c08e05457be7ccc50df619ee2
 MISC metadata.xml 542 BLAKE2B cea164848b3bd81887d7602613e58d13d956e032e95c017a46afa50770080f3f6a7d2be6336b219f10f6ab4516891eb7999739fb6a776717d6fee3e6923357fe SHA512 9a41770d1e3ddc412628b81458d37ea70e716c849a5c8b14db1b8f4da810515217f856e3d17ca2156cc2eb9e6bd459b702cfd4da624bf3e2b0b50fa09d78dd14
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
new file mode 100644
index 000000000000..804e775f1c5b
--- /dev/null
+++ b/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
+HOMEPAGE="http://www.yesodweb.com/book/http-conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs network
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/conduit-1.2:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?]
+	>=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-haskell/void-0.5.5:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/blaze-builder
+		dev-haskell/case-insensitive
+		>=dev-haskell/connection-0.2
+		dev-haskell/cookie
+		dev-haskell/data-default-class
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons
+		dev-haskell/temporary
+		dev-haskell/text
+		dev-haskell/unliftio
+		dev-haskell/utf8-string
+		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
+		dev-haskell/wai-conduit
+		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.4
+		dev-haskell/warp-tls )
+"
diff --git a/dev-haskell/http-download/Manifest b/dev-haskell/http-download/Manifest
new file mode 100644
index 000000000000..9fe74350873f
--- /dev/null
+++ b/dev-haskell/http-download/Manifest
@@ -0,0 +1,3 @@
+DIST http-download-0.2.0.0.tar.gz 8946 BLAKE2B f8b52744605ac8bd9bc922e23a5ffa02d0d7c10af7109594e0273cd46fec8afd0e20e2cbffed04ac206234d3635b2c53f6adfc8e11467e05f1b3544f02c7a271 SHA512 b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae
+EBUILD http-download-0.2.0.0.ebuild 1203 BLAKE2B d62a805b6bd1d8f67dcb0fd30e5efe879a227551af7ae421ac3699d75c273820f787a91044c279cf0f441be057c81f0d396bcbd0134a874575093fdab397bfee SHA512 f102f63da0e427a304c3a66c6d9ec8bb1e1e004e1dbc01bcc2acf4e28daf37663f3ad5b58747567d61c630360423753454fc864982108684956a373069d200d6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http-download/http-download-0.2.0.0.ebuild b/dev-haskell/http-download/http-download-0.2.0.0.ebuild
new file mode 100644
index 000000000000..5123c9182820
--- /dev/null
+++ b/dev-haskell/http-download/http-download-0.2.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Verified downloads with retries"
+HOMEPAGE="https://github.com/commercialhaskell/http-download#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test #requires network access
+
+RDEPEND="dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/cryptonite-conduit:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	dev-haskell/http-client:=[profile?]
+	dev-haskell/http-conduit:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/path:=[profile?]
+	dev-haskell/path-io:=[profile?]
+	dev-haskell/retry:=[profile?]
+	dev-haskell/rio:=[profile?]
+	dev-haskell/rio-prettyprint:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/hspec
+		dev-haskell/hspec-discover )
+"
diff --git a/dev-haskell/http-download/metadata.xml b/dev-haskell/http-download/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/http-download/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/http-types/Manifest b/dev-haskell/http-types/Manifest
index cc7b3b1869b4..7ab1538190c7 100644
--- a/dev-haskell/http-types/Manifest
+++ b/dev-haskell/http-types/Manifest
@@ -1,5 +1,7 @@
+DIST http-types-0.12.3.tar.gz 13547 BLAKE2B 1588845844fd4c346473fba2764e3d8714743af948c41d4163c0d039aa9840769674b6953ee4a8a80774acbd876913503992a4be611bf34a87fb3f695cc78a48 SHA512 fdaf95cfd29ed47445af4ad6349fcbbf4dcd8341f3963da453f8be5eccae4757904d3c4e7a8719ab576a7e7857aaa035ecfc1aa8f99f4ec6fce950c7ccc76597
 DIST http-types-0.8.6.tar.gz 10796 BLAKE2B cae66579a8aff76c97e4663ac1aece38c9fd0de72df7581febffd8db0c77e30e3659139aee4eb4812f0fa7011c5be89397657c82bcb3c0af563bb8470d7baf07 SHA512 c31dbc3e61afe42e6b279463b6c156dc343d1ca163a0c0b3f7e9afc0eee55cba31e655cbf7e615a62f32fa7ca1a52da288310c3b749e2d11b9c27268191cb8d1
 DIST http-types-0.9.1.tar.gz 12284 BLAKE2B 8e724b4abf896678a495fc21d942c93287e11480785730a8b79b4d158cf01ab9710c6cddb5e5287ad327f627d4eb7c1478d22c537fd9455aca5e14a0adebd18f SHA512 b51c0f6946d1952fa0e91db1164d77ab12e0709fdf9555b53f5c25ed7c55365b433733a933dd2765ce14d0ca2685edce7573c9dbfb75ae49443b4f177d170c40
+EBUILD http-types-0.12.3.ebuild 840 BLAKE2B 06e2a6fc4665d219fbc8e2f4dcff0715079d3873c6f25c6aac5afadda6fa5b18a7385b9d65fd0a732d332ecc7f5cb1e97275c2d9b8fca1177075a343241114f9 SHA512 dd1c630b6196ae6547df8326b6178c69924404a22230c280df635e62bdca9ee4701e1cc7842b06323c161ceb19c2a8462bf0b3d5874e8aee4eea5232fdd15819
 EBUILD http-types-0.8.6.ebuild 929 BLAKE2B 28cdabce8c4a213b8cf54c25f7365656d72655c465dd672938ded59fad6df79ead8eb56c45999824c15c8e2672bd75026a7c2ceec63565a2326af1879d3424ff SHA512 d95f2973fe232c421809c765470db2654c130d7a5d69c7875fc3d4e25a42571af45330190be8f8e22d94023883d25a4fcbebd15d56e56228c669d20e38c3c8db
 EBUILD http-types-0.9.1.ebuild 929 BLAKE2B ea86a80e2729b89749ef470714c88504efdfc8fb21f8ed95b15ae4e20bdb4563beede07bebb83369fb1f9ce0e2a3d2a8ee2b40f26f64393d64d708824f815668 SHA512 1b3e3a6cab5da93a87f2d88e88645c671bdf8968a1af4c560060c2c857cecf2bf7b985dbd49b7291e918e926b4c8bff10853bdfd3ba6f63326c135e03545a8c6
 MISC metadata.xml 440 BLAKE2B 9fdb72e1574ff398f9d96b4cfb8b08a65dddca263a16b21de2452bb63fbba0e642a131558b1781ba80b72b6ac8fd3f0be45ed0f03571c885c7462024ad50a5ca SHA512 02b64578c5df0d78fbe83d5f8fdaba84cfca92d267e220b559fc2b3f0341a2d1978b4f0a16f32c596d2a1aa31407206b96e802d6041830a8d3b5551c2141c3c2
diff --git a/dev-haskell/http-types/http-types-0.12.3.ebuild b/dev-haskell/http-types/http-types-0.12.3.ebuild
new file mode 100644
index 000000000000..91be0dd4f5f2
--- /dev/null
+++ b/dev-haskell/http-types/http-types-0.12.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic HTTP types for Haskell (for both client and server code)"
+HOMEPAGE="https://github.com/aristidb/http-types"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/text-0.11.0.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/doctest-0.9.3
+		>=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index aaeed266a5e8..c9b1afc1cf5c 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -8,6 +8,6 @@ EBUILD http-4000.2.17.ebuild 1567 BLAKE2B 6aa842f4ebd5f20ec415e06b6a65298ea46238
 EBUILD http-4000.2.20.ebuild 1823 BLAKE2B 3800ac75f245c58128be89da500fd7291203102678e9c0ee3f3c75b0eb7470be07654841c02a6ba6a8a3c842044bac82375a9ce5f608eec23049d83a872794df SHA512 77ae8040317aabcc5a40d0b40fd544b5f0e321e95c1739f90af4a2faa59994ad8ae368439bb5209dd1cd935d0b96b8f99e736db34f29235bfdb8e6ccccd5dc40
 EBUILD http-4000.2.22.ebuild 1827 BLAKE2B 044313e1a09269974c809292d9591fd0027c1d0368aa22b8b7e106cee6a3e2391e5b5ef780b25e36c4e401b95f299184910f972eafdfe686bb9cdf089a8d06ac SHA512 c2210d20ba75d36eba64bef7b0b33a6ea769b6fe5556648ccfd33e4ea8c8ee09d19e83b559d3e9ee4b94e5ed1d7d6594bd4bba9d05814a6fd7ccc7c07801b482
 EBUILD http-4000.2.8.ebuild 1597 BLAKE2B 40f55f638fe9ee677a57801802538010a334a15c7f8a8b0b1c698840186f4b7e2cb8899282ab1e2b7e6fdbd876cea7b7b90394ad2064c8a4c54f1d7f80d216b0 SHA512 11bde48005ad36921edc12eca3e8e3db1a3023d448cbdaa260fd52855ede20a21d76a2b79c4156f9f281f27bce640da66daa1104c4782b089440083b61111032
-EBUILD http-4000.3.14.ebuild 1725 BLAKE2B c776222548580cd98fccae313fd7f51120ccffc1cbad34d5c96a8e3c04c6b1df80c7ea3292291a5b1f81d029147354063557103ad7e0f44310c32ffdad1b0022 SHA512 0f5a0b5f4261e1f4fe6a8c5ae8229b0fc1cea0e3ab3ddd421b74ad791d98e29e5007ba70bf7081c8d38f8479f91bfc29c4ae3a42f4dc8736efea767bc66cd325
+EBUILD http-4000.3.14.ebuild 1852 BLAKE2B 3899ac0746efa3f2670a9d23ef6a1a5aee738ca4c88b5dcb358d639deff3150ed7904496f952a3d776bc4945b75a8e57e124777141b1a99c360b9c5a218f4f70 SHA512 b94a4c6605121be20e8aecb08814a5b5cb4931d6f56d2e2461d3f39f2ca113b71e6f8cb26bf1a631821e7ea8de583a41e66956ec447156baef63accbdf8c36e2
 EBUILD http-4000.3.5.ebuild 1755 BLAKE2B 9f164bef799a7b2a0c171046034cfc5d4da81669bf951bf51baba4e162925157f776d7990540983123bab11057d7d49bcb391f2e2a785333b608f8af9fe32abd SHA512 6d265117779af058a440c8b8d0d563aa4f55bdc082497c24fbeae897129a7132a161a876acaa6e47505cf6118dd39a72b356f8b8e074f1ae08d5bcc3762312ef
 MISC metadata.xml 2129 BLAKE2B fcca60629e838303b2e2a690253d81709730e1b2db996f983e083079aa7beec30d0885d2b1066c335e5ed1032f9c11bddfd1d0de11014a9f1958a0c6b1d4c714 SHA512 f9571e122a4ba9ca247f51c7900621dae1831fe15f6dd298b8592291c53fbe4dab61caf975b3c4ff7d0e12991904d5eb298c5c5f3e1d2294a80ade4e93455af3
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
index 3d0ac020959f..c2e843e563e2 100644
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ b/dev-haskell/http/http-4000.3.14.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,6 +21,8 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="conduit10 +network-uri"
 
+RESTRICT=test # requires network
+
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
@@ -40,6 +42,13 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3.0.0 && < 4.14' 'base >= 4.3.0.0'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag conduit10 conduit10) \
diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
index bd1cf04f7f7f..caf9212e7a0e 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -2,6 +2,8 @@ AUX http2-1.6.0-even-less-deps.patch 527 BLAKE2B 0a86191247c3b88b6fb188dfb9a963a
 AUX http2-1.6.0-less-deps.patch 1584 BLAKE2B c4411d643e1dd44cd82373750d998b42f6ccb268b0864b4cd3be7be2e9b2262490f80fc3ba204cb7dc9e9aba4a0630102337b6e3090aba88e1ad68e516c29fb9 SHA512 6e626f5412e6e49462d3676e44f410e280e0f0c1b4458d9e400ad6c193620a4b939fd0e80517c503e16c68610c42429fd89761ea7ac88f8c124a7bdc62c61371
 DIST http2-1.3.1.tar.gz 39493 BLAKE2B a1a94de5d35510d02c9c43638c9193631c04277e1c53bc6d7ae2cfe93176eda72a700f61606220fcdf349d375c4e888380552193ff8a40b9ec3ca64de04123d1 SHA512 7d47cb35ce55743ecdc19ea52a1e230c8c3d608348f658ed7b3eb4f86a93ad4aa16eb23e4294dc1752bd99da8027e61a0b575ee9b89fe182d6582f6b5b402cee
 DIST http2-1.6.2.tar.gz 5138047 BLAKE2B 7febaa42b0c50cd89bfc5e9acba558bea9d7e0e8c791c5ea6e6de17ed938e431b3ba4a94375dcc5858881920b83a92491a5181a13d23420d586b13fd24222535 SHA512 c9df89cb073b57bc379857aedfba82097b805f8c9452b5a2b9cfff2ff096f185f9b8aa2dfaa5b0be7909a214a67d8ba8fb93ddc8a19f8afb43f9f5d5bf67f0da
+DIST http2-2.0.3.tar.gz 5211934 BLAKE2B cc1fad663650eaa1514e5f94737966ac86a92c2cc15f47db06c057a78873ca7d745aa77280cf451e11a9c2e328cad2a89d965bb7502d6b2e0b9b808b88570a8d SHA512 ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20
 EBUILD http2-1.3.1.ebuild 1143 BLAKE2B bdd69ebda0fccabde040829fa88297df81ab10be665c37021dfa1965da7c69b2b63d78435b0a6ba90560ca2b2555132c68d8a20c87804808ef45597fead6103c SHA512 1d42242266e51ee570c7f2d3de8a3a135b84864f1072aecdf46b93d8ddfc5083dd566e89a5af714ccccdea63071c8283ae66dcc0ac84685f77503c7a4a7b2871
 EBUILD http2-1.6.2.ebuild 1232 BLAKE2B 456750cbc877a0529a28ee69ea8055d68ffc060fe9d61eb46e6043ebe23ae0954b5ce7cbecdeeae1d6bf6d9d733a5b7604c7da9678851da21fdc77be2fd4cd1c SHA512 13f37e85217945f99c942b93a8cd61368a05e5339169219d1755352df1f36bd2bb74c38957eb3641588936ba3b951f9fbc709aef9c680d65df59b032c91ce1a9
+EBUILD http2-2.0.3.ebuild 1163 BLAKE2B ccad55c77abb3de14a78e23f88cf6051241efe0720d18b013f8a7d81b656c59b23a8bb28c63385a42393983933d6f164b499004b52d90fece71510482f8ae626 SHA512 be4bdc104d50a2fe724c765cd59d1758d1b0d0146798bf356ac655a1b7b86027c94a1e97dbd366ba40a8197c67c1aa8183bdaf995f2e8c0687670de95a064f26
 MISC metadata.xml 392 BLAKE2B 30170fe16036b33d7e8d83fe7bb3bc04ec51d2fe0598f34dfb8b8bc21727496c191e0178bb267018320eeaa9beedabd4463342f35ba9b98b682a1af9d3ec15d2 SHA512 5515590e5ff7b56f8ebd033611ce8d3164cf6c267ae26eb5b177ff47edee607d04208e123f982140b1b40438fc3b0b12f0fbe33788e4da448e316944ccf9a1ed
diff --git a/dev-haskell/http2/http2-2.0.3.ebuild b/dev-haskell/http2/http2-2.0.3.ebuild
new file mode 100644
index 000000000000..6d153aeb24cb
--- /dev/null
+++ b/dev-haskell/http2/http2-2.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -devel
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP/2.0 library including frames and HPACK"
+HOMEPAGE="https://github.com/kazu-yamamoto/http2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/network-byte-order-0.1.1:=[profile?]
+	dev-haskell/psqueues:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/time-manager:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/aeson
+		dev-haskell/aeson-pretty
+		dev-haskell/base16-bytestring
+		>=dev-haskell/doctest-0.9.3
+		>=dev-haskell/glob-0.9
+		>=dev-haskell/hspec-1.3
+		dev-haskell/text
+		dev-haskell/unordered-containers
+		dev-haskell/vector )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-devel
+}
diff --git a/dev-haskell/httpd-shed/Manifest b/dev-haskell/httpd-shed/Manifest
index 3dc74d2a2a2b..46121ddc5cbf 100644
--- a/dev-haskell/httpd-shed/Manifest
+++ b/dev-haskell/httpd-shed/Manifest
@@ -1,6 +1,8 @@
 AUX httpd-shed-0.4-network.patch 931 BLAKE2B 50e9423d10efffbf3dd01b3aeaa349f7f564527e81a20d76d8ce0808485e1dce83ad2bcf0cec97b828f1c997eb52bc1ad421a071a71f5d5e3272df9f4eb01599 SHA512 2d964bfd1d9f6bec763229c5fd7b04e01993e8dbffdfc6dd49f296aa78efaf26b556c3debb64d707553fd06ab9072ab8c2c69329dcb9bc5177dc8a68b2f04859
 DIST httpd-shed-0.4.0.3.tar.gz 4308 BLAKE2B a7218ce790ab3902b94a41c97bae27517ea4750ba80c59ae1eb38953b93606c604912f19327d0e5990c4aceb6f0d7c415a871916e560e0a32cfc6df6ac6ee3b9 SHA512 4fc4da5dd42194890e4201129c7217191cc1c8f82a366b84f42f9129c45fa5cb40211674608c84df420f8d8659fd60908880d14176a36f6aa0f89c01a8c1fa6c
+DIST httpd-shed-0.4.1.1.tar.gz 4457 BLAKE2B 0b7452c8b60517055a4ab9eb56ffcd289f66671f9d9e73ecc57adbb0861797df121f96ef82d924782a691fce83f87c32fa0b65317db06bd6a42780bf5d373b8d SHA512 b168fd18f4d476fc6d903d8dc17a1831645049dc6ae57e977b97453f69c98dc3a288e2c8d0298283bc2b8dd0d4e994fcec27058bb36b9ee0d4d4aac2b9de3b97
 DIST httpd-shed-0.4.tar.gz 4065 BLAKE2B 1f5b3f2cdcc4e5bd2d6fd933dab625dbe8c4687cb1d53411531daa23d8427b263c8c26b992ef432165e943701ebd67f0ae8be363ace462713f3a451a0e0e77b8 SHA512 71b3fc8038e5245589aab99b9fa3eeef0ec13cc78bba33d88b8c7569f30b0ba18b645a939771b3d325d3e666b99c3c4428403ae016d14df55ce8dcba2e9d61e9
 EBUILD httpd-shed-0.4-r1.ebuild 681 BLAKE2B 3cf8e58e321c7519a275f641d9fc263108e84d30ada9b81ef22a255ddb54f9d73f0b3a964bee3f0c45869b1fe7e8e94b340bafc099bed9b4ea177d3bc2d5b26d SHA512 2da36b97c0babd7d72b5ba45ebad68d067e7999288f0a7625aa379de13ab24b42b0928c3b72858d68837eaed409a7bb0b7d3940cc9abdb6ecebf26d50c12c2f2
 EBUILD httpd-shed-0.4.0.3.ebuild 1117 BLAKE2B 85637be7235e62933161ba0ea367d9ebe58dd81d5663f21ddc0e329dc55db62c9ad338785265e8ee36f37c531977dfc7acd3b78bd0d08e52bd5d4edd41e0f8d8 SHA512 147a2de8a78cc02b5855f8f77072dd3a59f4e154980c553c770ddb6f4e5d9c0a8d317137c6d8ac62212ffc95ada584e8224e6ecaab6cc38af92e0f9bbd5cce92
-MISC metadata.xml 643 BLAKE2B da63b1c9b1c926a88d2208c9eb901cdb43e77495ee0d48ddee2509cbc64899302c37c0f0c0e71d54876774134c47042e65979ec59b765d8d1429bf3fc1ed38f2 SHA512 a77669c1625b85b0e4204f9f1212e96cf660214b44a1e31770bb088c053406537adb6d4568ba9e3eed3add5c8e9545035e24cf5ead0c8c1779ad903646bd5eb8
+EBUILD httpd-shed-0.4.1.1.ebuild 1339 BLAKE2B e8964a193b174a6b57c20ec74b03f95b8a6cf4940563991bd8891f2ca7ab584b9f79770bf81f15457fc17de0cb5d0bbb17634c6065932277c0f36ef36a3adc32 SHA512 623bcd58d6c28f08084810cbd48880880c611a4c80503f4fbaccc77a275899890bfa835cca501069272537545781bd64ade6305ea821144aac68449cd44be00b
+MISC metadata.xml 723 BLAKE2B 3df886c9a8647e3c053107bc1015ec1fbea17fe01a2890e1712220c99e2b463a3cff61d2392d7e2fddc4b0fb322c88348c51ff3bd70f219bb3b9352b42428d5d SHA512 de553849e24a4504ed455724231bc7adc8d6390b499ae87e0d8e220eaeb05285b0d339db687a328fddc6d3f5b6a0bbccfad48c28b95ba7acc1799f2c69aee797
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
new file mode 100644
index 000000000000..9b2ee6086bba
--- /dev/null
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple web-server with an interact style API"
+HOMEPAGE="http://hackage.haskell.org/package/httpd-shed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="buildexamples +network-bsd +network-uri"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+					>=dev-haskell/network-2.7:=[profile?] )
+	!network-bsd? ( <dev-haskell/network-2.7:=[profile?] )
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?]
+					>=dev-haskell/network-2.6:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
+					<dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildexamples buildexamples) \
+		$(cabal_flag network-bsd network-bsd) \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index 3c478f3b1e1f..f1bb3e790432 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -13,5 +13,6 @@
 	<use>
 		<flag name="buildexamples">Build example executables.</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="network-bsd">Get Network.BSD from the network-bsd package.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 72a3bf833c51..e52a6e584dec 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,4 +1,6 @@
 DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
+DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
 EBUILD hunit-1.2.5.2-r1.ebuild 643 BLAKE2B 2dba73ebe83997f5ccc185b00a270a8372341c84b6c95b4bbb870c2fedfc8818bb87971db7358b7d53a110fb7958b9470c78792bf1f4682aaff63fe7fdcc19f4 SHA512 44f80190645228bb6efd76bc133988201ddc160a07938de0059c4533d2e11b04b1f3369d98bac186414e5e120c0e11e6e6b578b6ec89416bd31b449f60030624
 EBUILD hunit-1.2.5.2.ebuild 642 BLAKE2B 8ac003868c160a6b3201e93f3145985e103a58c58874ea40231c211cb5663cff9e60ed78e7ef80f48ef6e95fa03eb808a2f0b7c5fe725311f8c5daff8f9e3c36 SHA512 523bb3a87d74cba175fb3faf73abfb0e9b87df915be12a2dd026c2b46802f5aee1f792c1cc18f716268a50688a6b1efc3bd9467d9e6a8b2e4e184c0b1e00f06c
+EBUILD hunit-1.6.0.0.ebuild 652 BLAKE2B 472fce29515d2d1203e7fc7766d2b5f59103ac02a76e3b96f51caa36c8ac38fde84dea1c8d82a0ce2ca382f1ac57505600cc435d29ebc331354176f05ecbd4ae SHA512 e2205f22bfcaf6c6781a01006ef89d5a39c7255b03a0b9941ebae6eecd4ca2c1968205d36c36e877ed0cdb81369efd6f8cd0da683f9bc33a4de9366f907921c8
 MISC metadata.xml 486 BLAKE2B 18f74bcd495eefbadc28cd818bc80f712da01f0380894f098bd6ef646c79e478f99656e83e5e5e0da503bd05e994fbd2dce8ee3c621b8684f059644f1302c340 SHA512 b26653c15af05b613bdd1b8a7743f6570800bcec2deedd3632d9d2bab3042c2ab5928a58fba2d355890f7250b4682c1a7122bae82207291d1d5792c114ea95bf
diff --git a/dev-haskell/hunit/hunit-1.6.0.0.ebuild b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
new file mode 100644
index 000000000000..7b7e1242292f
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HUnit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="https://github.com/hspec/HUnit#readme"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
index 8a841eb2b550..73c4f570e878 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -3,5 +3,5 @@ DIST hxt-9.3.1.16.tar.gz 223814 BLAKE2B acc0ada43249884c2da06adb8214827b626799d6
 DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
 EBUILD hxt-9.3.1.15.ebuild 1366 BLAKE2B a53bf00c3fe7fdb95744e73b29ab257849d53174eb52a8c7d4b60aa42c63814f9d8a007b2ce57e319280f5a69bb052252b9e8d6ba72e8b30ea6ddd44da7df9eb SHA512 79bf78c0c5effdcda62758aa4f6cec61089a5c55f6a92c7dbc3ce448950f9838c6a5be30a433ab702baa7b222aa084cbd045eece905f3f11dd5011be31a41d3b
 EBUILD hxt-9.3.1.16.ebuild 1092 BLAKE2B 9b66542d14d4e3930573f1e659f9f635558866c0c570473cad4e343d97d291a5a64bf4f859d24fcf414571da677db19b20c2c3d02d64dc0391bf4fbcb23f8b3f SHA512 91d5728a9ea84dd244b565724f42e69fe86e4dedcb03589116f7ee2c066bd00553ae016d04a8c835c4af2975e1933f99c0733ff11489b6724d5fe4043bf54ec1
-EBUILD hxt-9.3.1.18.ebuild 1092 BLAKE2B 8f31fdb26e5f4aa4810adee73d1490b64e9f71a37407a03c7efd00ac0c55214b2202cfc21b99e563ebddbd514b03646d4e82a211e6471089c22caa392f8c5e44 SHA512 410e13de1722b2da36b4dcfde6b2386fe622942f386884611e281c2c33c58344c2bbda6b98dc26764ec510f5e3b28cc41288c48dfe5f215918c47bd06fb0ee45
+EBUILD hxt-9.3.1.18.ebuild 950 BLAKE2B 2ccacd53c502b487624b6e59c3c45080decf227da4bdbb4259f5fee1929e4cfd5f13dd40fdaa35a379461b11dc4b923a515cdf42e8ee22ead732ccf87564330f SHA512 7df9944c51d796da4fa1699b45fb91fc0ffde4b817cceb71b793a2006129bbf52959aea57553e9537a110530d906219205f637324ea5e83171605563e44d500c
 MISC metadata.xml 1388 BLAKE2B 7931219c94c280c4d205630f0fdfd0bcc6b41b74fa48ae4545878a19ba026ded8e5d41a7dda91a0cc5e2d8aa4bf114c2f434e42809c0950385a17660a6966662 SHA512 76f78e92e34cf2431c3c676ded65098f2be331cbd6aaf91c23314c9c037bd6d5981c39c41d47e82c47e709a3e7adaf475a1efac26e27f1022d2ea2815ffb236e
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.18.ebuild
index 1902e81622f6..2a562ce245da 100644
--- a/dev-haskell/hxt/hxt-9.3.1.18.ebuild
+++ b/dev-haskell/hxt/hxt-9.3.1.18.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
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
+IUSE=""
 
 RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
 	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
@@ -23,8 +23,7 @@ RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
 	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
 	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	>=dev-haskell/network-uri-2.6:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
@@ -32,5 +31,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
+		--flag=network-uri
 }
diff --git a/dev-haskell/infer-license/Manifest b/dev-haskell/infer-license/Manifest
new file mode 100644
index 000000000000..cfc26a506efe
--- /dev/null
+++ b/dev-haskell/infer-license/Manifest
@@ -0,0 +1,3 @@
+DIST infer-license-0.2.0.tar.gz 48173 BLAKE2B 27b7adb74c897c03d6e8795d580d165d41ffd527ea4d6b6bed4c730a46d23177babeb57fc6e33ec379a285a76a89727bc10557f925bcc81f4bcb6c50f10bd989 SHA512 266651d9890ccbd9281ef3f9cd16df10f9c6fa8449990b63e956bd13559b1ef773c9dee92ad80de5b9d03599ac6a09766a1f4f3425884007982ab14d01697d45
+EBUILD infer-license-0.2.0.ebuild 748 BLAKE2B 486be5b73b0d6b995f5f711eafcd638b10cf65c408c6e061dd9cdbc3055d48d1ebd3b60ad50bfbda6284371c191e0305c0f4568a9fcd5c8ac1e3468eec314538 SHA512 c3cc255c00bf3515c8176f9fb606e54c968424e39e6ba0f6a40c6444111030043b9fa0520b891d17f88fb2d4f9aa5383fe73718a93ee7c959622cc0d7e1826b6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/infer-license/infer-license-0.2.0.ebuild b/dev-haskell/infer-license/infer-license-0.2.0.ebuild
new file mode 100644
index 000000000000..dd1e3ed8f13e
--- /dev/null
+++ b/dev-haskell/infer-license/infer-license-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Infer software license from a given license file"
+HOMEPAGE="http://hackage.haskell.org/package/infer-license"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-haskell/text-metrics-0.3.0:=[profile?] <dev-haskell/text-metrics-0.4:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/infer-license/metadata.xml b/dev-haskell/infer-license/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/infer-license/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
new file mode 100644
index 000000000000..82ed81f994f4
--- /dev/null
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -0,0 +1,3 @@
+DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
+EBUILD integer-logarithms-1.0.3.ebuild 986 BLAKE2B 3342fac7f8b3ba3b019249e9766e2cc84febe55dd4c7575cec22cbe5750a90903741ee6cc5eea87b1064f2955b53641b1fb50f6fae893fbc1a8b5ad06f7993bd SHA512 9dcbad03dc721de0757e18b39c62548ebdf1f75402b827ba4ee7257964e0b448040aa6e170b5756a88ae76729f00544d267866fd18059719c06f95b0eb1d9ee6
+MISC metadata.xml 589 BLAKE2B 76de72281a61f80bb438d9ab8ff0624c80ae6b947d275489ae30931232035fc16a65b0f61b9c08943a8d07b2967a3b8677afdbc9b8184582d20b3246e8b8fed1 SHA512 806816183d7c86a1102b3e8591631464c38db3f1b5af355f5e0967eb630fc11ad6340f05eae883b0eff1ce16d50187df184d31807e151e5dc43539d2cb468974
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
new file mode 100644
index 000000000000..baf54225bac4
--- /dev/null
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -check-bounds,+integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Integer logarithms"
+HOMEPAGE="https://github.com/Bodigrim/integer-logarithms"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
+RESTRICT="test"
+
+RDEPEND=">=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3 && < 4.13' 'base >= 4.3' \
+		'ghc-prim < 0.6' 'ghc-prim'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check-bounds \
+		--flag=integer-gmp
+}
diff --git a/dev-haskell/integer-logarithms/metadata.xml b/dev-haskell/integer-logarithms/metadata.xml
new file mode 100644
index 000000000000..d1bc98b5a57b
--- /dev/null
+++ b/dev-haskell/integer-logarithms/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		&quot;Math.NumberTheory.Logarithms&quot; and &quot;Math.NumberTheory.Powers.Integer&quot;
+		from the arithmoi package.
+		
+		Also provides &quot;GHC.Integer.Logarithms.Compat&quot; and
+		&quot;Math.NumberTheory.Power.Natural&quot; modules, as well as some
+		additional functions in migrated modules.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/interpolate/Manifest b/dev-haskell/interpolate/Manifest
index 681893655977..304e4a19acc1 100644
--- a/dev-haskell/interpolate/Manifest
+++ b/dev-haskell/interpolate/Manifest
@@ -1,3 +1,5 @@
 DIST interpolate-0.1.0.tar.gz 4894 BLAKE2B 1b8438ae6e466fddf66161314e5046dcab862bea29fe136e0c4f7b374c8c337b310d546ff714aec4adb00ed63385a600f04f6f3d6b8313f068299ee2a827c032 SHA512 5273195c77ef22919dfcb8df9e6db4a1ee186ca0d218f24e94a53236b0af20897d01273e027307a7164bf15a66ebf47afcc9ecc35f6e867c3c2a0e1572eaf435
+DIST interpolate-0.2.0.tar.gz 6889 BLAKE2B 548418c34af569e4ed0f4bfe5189f4d2957e99a7e11d70dea18f6584cb497a89b3ca458d933301798fdff29e98ba90ae75fc45aa454599f1709bab5f7f1319c9 SHA512 adc90d7da696c4aea0935c5f85dbf37a1738c89ff3b940804cd7bb4f888e28a445c51db9e0f2e1e66f98646f60964c10d135cef30c13efaaaffee3c65b93c89a
 EBUILD interpolate-0.1.0.ebuild 707 BLAKE2B a47eee546388f8e9271ca425d797b106420c511e7cb83560366b958c7b2c48a0d3a857ae9d02993a0ab6f221d02f1d99b0ee3a459e6e3039ee9c6637d3d1678b SHA512 06acd512f80f876b3c491796ccdcc43da218d3dbe14e57352560266dc12570eac72169eeee4248d2886eccfa8f7ee1247920500a7258573768a37043be10d8a7
+EBUILD interpolate-0.2.0.ebuild 736 BLAKE2B d7cc4299290998b497774b5d598630a2be305e35c92a5a7631847c6c8ac2444d5d0696ed383d9df155f6fa73a45f3ee8469823b9a560f8d64d49118f81bbb00c SHA512 90d27c91f6486f648c01e1a41be01f99482a9b58ce8d9589ae46e6fd7210425eb5d868e8957615d3d5a5787d327b300201a3a01af5cb8ce829c370c3f510256a
 MISC metadata.xml 322 BLAKE2B 144c22e9f15b4a7be4c12a279997aff47a750e714d5988759d3a707b46f452d01e130d73a50acb389181f522b03a14b1b68ea68e316f3cea81bad8ee640a91bb SHA512 8a4f5a1abff94cb57030095f6efa0ae7ebcd842c6f9e4403cfc440f10ca6dbb1f7d3a9c67e8261eedc005c7aacc1aa0126ec24b0a84dd89c73daf5ea0bf66c9e
diff --git a/dev-haskell/interpolate/interpolate-0.2.0.ebuild b/dev-haskell/interpolate/interpolate-0.2.0.ebuild
new file mode 100644
index 000000000000..934b9f9e4085
--- /dev/null
+++ b/dev-haskell/interpolate/interpolate-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="String interpolation done right"
+HOMEPAGE="https://github.com/sol/interpolate#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-src-meta-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/hspec-1.5
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		dev-haskell/text )
+"
diff --git a/dev-haskell/invariant/Manifest b/dev-haskell/invariant/Manifest
new file mode 100644
index 000000000000..10290884063e
--- /dev/null
+++ b/dev-haskell/invariant/Manifest
@@ -0,0 +1,3 @@
+DIST invariant-0.5.3.tar.gz 24394 BLAKE2B 5946f6419c74a0697f6017b1178f6a5a99d62b26e7bbf08e9a08430ae22f4e15fae032a5257d9c5589767125d1a5f53ce9c16e1d6c15c90081b355ca102c8149 SHA512 0a488a800b0eec85e865b100e3944d5e9dd45e6c12a411f67b4ba7f40de6fe0b8e37900f72c83ec7b92033a3d15e754dc11d991ecafe18d8f257afdaf67ca9be
+EBUILD invariant-0.5.3.ebuild 1749 BLAKE2B 38106fb4eeacc5b39a1a29402fa94dd0d79ccf029d35cbc260b6211c983d21f61dfb9a44673c43a3a006f0bd42ee83ad4b5842dd3cb4db598dd517141ede4d26 SHA512 5d9fb4f1265a380b763f0a43fc04527ef719c1245dad486e406747d66d3174ef663fb729579e14461877397e804bf2d0ee4fdee7ba4f3d5fbd4e2039c991ba52
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/invariant/invariant-0.5.3.ebuild b/dev-haskell/invariant/invariant-0.5.3.ebuild
new file mode 100644
index 000000000000..8708070bba60
--- /dev/null
+++ b/dev-haskell/invariant/invariant-0.5.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 invariant functors"
+HOMEPAGE="https://github.com/nfrisby/invariant-functors"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/th-abstraction-0.2.2:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'template-haskell     >= 2.4    && < 2.16' 'template-haskell     >= 2.4' \
+		'template-haskell >= 2.4  && < 2.16' 'template-haskell >= 2.4'
+}
diff --git a/dev-haskell/invariant/metadata.xml b/dev-haskell/invariant/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/invariant/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
new file mode 100644
index 000000000000..c18149a13a17
--- /dev/null
+++ b/dev-haskell/ipynb/Manifest
@@ -0,0 +1,3 @@
+DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
+EBUILD ipynb-0.1.ebuild 965 BLAKE2B dbc398168a589a4c53d4497f35ed0323337a7828207afcc2dbb26009f9c47b2a02a71da81b61fbe404d708ed3628969a67ee7b033d394e45216ce99797ab014a SHA512 790734cda2e70fb7ce049781487510ad13d13a14354a8aaac9dbb1ae6c659933974c86d6fe134f8e66eff11affb11880e81b87362d571ac4c00b8a0be4207347
+MISC metadata.xml 448 BLAKE2B 9973c51fa4b31ff8742dd025a10be5f223efae66a8c103394df79bfc4f6e024713b32462288b9d9672f70ad063c834df472e0f84409fbcabf32d2231e19591c9 SHA512 be28c16e95e70c12adfc77521257ab2daee42dedce6b560584679b18be0d8c0073cf5a9aa8f334dccd2202b3fd2b4f569ac858c4b563211ed54c5c35b4cdd6d8
diff --git a/dev-haskell/ipynb/ipynb-0.1.ebuild b/dev-haskell/ipynb/ipynb-0.1.ebuild
new file mode 100644
index 000000000000..f72cfdac7f60
--- /dev/null
+++ b/dev-haskell/ipynb/ipynb-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
+HOMEPAGE="http://hackage.haskell.org/package/ipynb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/aeson-diff
+		dev-haskell/microlens
+		dev-haskell/microlens-aeson
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/vector )
+"
diff --git a/dev-haskell/ipynb/metadata.xml b/dev-haskell/ipynb/metadata.xml
new file mode 100644
index 000000000000..57e585c9e972
--- /dev/null
+++ b/dev-haskell/ipynb/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		ipynb defines a data structure for representing Jupyter
+		notebooks, along with ToJSON and FromJSON instances
+		for conversion to and from JSON .ipynb files.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/iwlib/Manifest b/dev-haskell/iwlib/Manifest
new file mode 100644
index 000000000000..1d9edee2edc3
--- /dev/null
+++ b/dev-haskell/iwlib/Manifest
@@ -0,0 +1,3 @@
+DIST iwlib-0.1.0.tar.gz 3393 BLAKE2B 32df17beb4b9df6dedb12b729249883846ca8975d41d34dda047264d5b8544ab646877705d0c02fa8478ecaad735d67dbbf3d1bb86ca463d3f811e5179c1e80c SHA512 a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93
+EBUILD iwlib-0.1.0.ebuild 552 BLAKE2B 8f67187288d5ca791828d49eb38b606630db3c68161d25daf047e439120f893081e14f0f239da00afbba97ce882643d7cb56b0fe15a06f9a104d2d62f4267ece SHA512 4deaeca725d01de0c9d2ee215d799d83df77f1dc6c4c8b8c8e8a410370eb1debc3e2b3788ecd0af70dc3642328ccdac984337c313c7297c523bd1b00e5f1bbfb
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/iwlib/iwlib-0.1.0.ebuild b/dev-haskell/iwlib/iwlib-0.1.0.ebuild
new file mode 100644
index 000000000000..8669ea262872
--- /dev/null
+++ b/dev-haskell/iwlib/iwlib-0.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for the iw C library"
+HOMEPAGE="https://github.com/jaor/iwlib"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	net-wireless/wireless-tools
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/iwlib/metadata.xml b/dev-haskell/iwlib/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/iwlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
new file mode 100644
index 000000000000..e521a12ef34c
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -0,0 +1,3 @@
+DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
+EBUILD jira-wiki-markup-1.1.4.ebuild 835 BLAKE2B 7ea9a7f709e4575923a82a2b5c849213b44e626dd68db079dfa8224a59770fa6a5bc83acc12bfd0d1fbe4c9a675e6d94de31323a0d93b8c40f304214ec4313fe SHA512 3ea322122f948cb3542be50ba85165034fec5ce6362d47158cd6bc0685ff4f30f63223842316bf2b91d4442ebb7f7bece8fab536961f570c1847bef0d2fc2316
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
new file mode 100644
index 000000000000..3bd4d3067c1a
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/jira-wiki-markup/metadata.xml b/dev-haskell/jira-wiki-markup/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
index 501eca5397c8..c1a56105e3df 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1,7 +1,9 @@
 DIST JuicyPixels-3.2.5.3.tar.gz 116074 BLAKE2B 19ea3ee666503bbf87ad8ff03df685cc7e3d1661f17904059ddec318be36f8ede53fe8aa531f7e9fc86bd48e773d525b7830b88975340f97883a190d1d1f2f34 SHA512 e5c0b0442b1b79aa751afed9a5df23b9fc1f3bfddd0d7b0f3751053018f4434331a0e0ecb16d2fc36a87d3edd3fc06727cfa9557607a02d7040ead623a5917bd
 DIST JuicyPixels-3.2.7.tar.gz 118647 BLAKE2B 5542e36f7b1a7e084457f9d18a4fb7647c8ffa854bd7a8ab09f9ca27b4d34f0edb47adfe42afe199ea5a99a71f2c96d8cfac7b28976cd0837afc989694f50cef SHA512 418d887a799fc46f4c73da1ebae0288e0f25e21c943f38dbf0b2519096e4ba145711a05d9da7bb1e588a5183e91ab09dfe3a209a6728c610eb5771a5d963ee6a
 DIST JuicyPixels-3.2.8.tar.gz 125254 BLAKE2B bf373e0c595b0501d0d871e55f61bcd62ca26fd6bdac288816af6d9eb52c53d8d70aded3b93ac782580505d549654250ce5b45e4761ddcbb956376513a962893 SHA512 e0800730660e087fc65d65872ff794600436cdc421ff8d578bb0833b885a988eb468b0b90ada0badd10439919199688a43ae51c42aa2552f9cf39184c60e60f1
+DIST JuicyPixels-3.3.5.tar.gz 131914 BLAKE2B a541f8052952e9a757fecb7168a74b9cb6aef152a1913aad36ac47d4ea2dbdeec9c644a0d2edf340986bd179ba4e925d3d284fbe73725e149e2b87866a8a5865 SHA512 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed
 EBUILD juicypixels-3.2.5.3.ebuild 1194 BLAKE2B 747a4984f6aad756f99001f9812db7f0e7e3b4d2126695328311a0dec640c8c7b6e538ce5fe225f694f5b02bedd6b68e347335cf6e69247ea99241ff36beb758 SHA512 dd5e0dd922cc0d560b9b6b2de1c0c7200d9289332114dd24430229c8bd23fadeb74a34162433849d7249cc5d5687e6fccad66f8c66227614621ae0905141252f
 EBUILD juicypixels-3.2.7.ebuild 1194 BLAKE2B 3c1aeffe832ae75eb08fd5c2af9060ee22c031110548e0d9e583f13a91e6ea8cda2ba27dc1516cf11d5966b9c3bf5f82392aaccbd852382035092bd759fedede SHA512 f7c9fdae8205c2be72bf88b5d26783892954374f1f65af961845b23345d6ffd1687dc876e5f69c4ea220fe97f0f2f825130bfc08969653ec052130d78fe501da
 EBUILD juicypixels-3.2.8.ebuild 1079 BLAKE2B 779e076ac5d8a170b3f0089eaf8d52b24736f7437f50d1056aead0d32776911e2bcf303372abd661bacd389216ba69f318b6ae59199dcae331d22df183ef5214 SHA512 a2a22631b411d1808e48702f60a3ebae42ace0076011aa854328b85dae5ef328621262408f0761be77942c2489f815d4a04183efe1d7a026b1e720b3268994fe
+EBUILD juicypixels-3.3.5.ebuild 1002 BLAKE2B 02c8e3ff11f2a07f971174e86a85230155697ead326a353ba2bd07aa8e2b53094a61a26a1f9c4d4b3fa622bc6ad409960a705fe250211e3dc2a0185d21b35572 SHA512 611ec1eaa6910c7450e5f87a1ca711b39f4cf1abfa3d3d4e2bc77e238bd97d840b1b0a9899bbeba3023d468497a68d3b89a3f6343117807673edae148bb5799e
 MISC metadata.xml 944 BLAKE2B ebb529c021a893b62eb25444d07a46badb5b035ec4df50dfc9a327e12e097e0870acd5fa5f9d79a659be7556895ea685ac724576cce8935e344270308c1ec117 SHA512 0d3e2bfbb46f7c691ef48ec9456da3acc2aac056f3beaddfcd952247df836e2eda429d12bcdad44c204b481cd7363c9d03764b83e367138137c1bd62a65448ba
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
new file mode 100644
index 000000000000..7a2fbfdee5af
--- /dev/null
+++ b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="JuicyPixels"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
+HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="mmap"
+
+RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/primitive-0.4:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag mmap mmap)
+}
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index 7917ee3fa05c..5c8e665eb851 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,5 +1,7 @@
 DIST kan-extensions-4.2.3.tar.gz 20604 BLAKE2B 5da1194f30de5a05be3e42b32abade6fde3717f9c8b3857011f830fe645e7128154ea82f29b513c4fba26e2b3b26c292481a41924e97fefb648046908cf2789d SHA512 a06103748320379f4182e3b268fa7015a1ee67c8e62cd8eb2ad2cb41f2fa7f820a8bb4f27a7393027bdca842d924d2a3be4ba141b572f548e6fac6befc5a1beb
 DIST kan-extensions-5.0.1.tar.gz 19306 BLAKE2B 020c87999a465523a903791542bd2da82411dbea516fa2ecc77efce6c75b542cffba99c6e87ce0e4bcc48bfcc09554278860d1f82db922564f8e7d2fad4c8456 SHA512 ae3c30cbf49307bbc9d0186894486427440435b92f1158d2f00791d693acb5db43beb83d44b82eb7c92e3221fe95b6a231d55dc818c573aeb0f00ecd4c0044b1
+DIST kan-extensions-5.2.tar.gz 24151 BLAKE2B c36692fc89f4bd378a1e2a12368cc0b34548b40a56ac72cc744dbf37a6832ae8970549adda42b3b5286db98f9cb8474ebeee2754503a52caeb223ce216e7874a SHA512 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e
 EBUILD kan-extensions-4.2.3.ebuild 1285 BLAKE2B f34cdc8a957c4d183f4f0312d9f009c04bd37a36431795b8b9a7bdd4c0d0f9ce77b447eb734fca928e3c554729094f68e785e21bfa5cc8d07aef4a18f5bcc9a8 SHA512 a80c9d55226e6612c256a8ed6862db0e339f7c724db23c0e797c99f94055e07018a6fc40249337def7b7feed68a683bea3cbcc2b211d76e72b47742688ac1500
 EBUILD kan-extensions-5.0.1.ebuild 1285 BLAKE2B 1d7df079759cd6b00b6ed7967a1a684d1de6c0f61d6f0feb3b0395b6e1eca0f6ca8001b0dfc38bfe9f76d82818c758762dfeeb53d15e1054dee52ebd39c084f3 SHA512 084350cd31f4009e67636024b46c42bdeaabf9f742ae5e01a2f1f9537aac4f7733d5218e43f823190c250f589f29e108534744b460d8072f922b8ec843685a45
+EBUILD kan-extensions-5.2.ebuild 1530 BLAKE2B c6be6710ec48de6d236303602655a96f4cb6f565baa2b1a3b4926e9e3adf2f333296ef3e9cdb87f03d364a9c26f4757bbf746beed7f9580e6e113ec90d995d5d SHA512 00f94b1ac53e9e2f4ac09f0ad4c4f26e489e29a0958781a71f61215a1e70a566ce319825e60c35e1627f6639ab70f202135d48bafae348feaa44252d7064a64c
 MISC metadata.xml 437 BLAKE2B feb81adcd7f334bf078ebc3264271a5ce60914f5006726c43f405ce7aa1661c506ecc59a30efb298961ab427a2d939eac741912e136b182d1726050686205445 SHA512 29a3341b85b34272ac06f64ab048b36eeaf0bcf0c3bbf651f1c878a4266913adfc14d0f688651346037b620914470ddd75e646f7d3eae79f5bc2c5c8dd937ef4
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
new file mode 100644
index 000000000000..d1b82ed4158d
--- /dev/null
+++ b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
+HOMEPAGE="https://github.com/ekmett/kan-extensions/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
index 77083420ed1c..c39a21099f21 100644
--- a/dev-haskell/keys/Manifest
+++ b/dev-haskell/keys/Manifest
@@ -1,5 +1,7 @@
 DIST keys-3.10.2.tar.gz 8635 BLAKE2B dd664097549fd57c5956935d5790cdacbc51b58ed9fc6d2470f3b8b3ce5b6983ccf342a5fd2327a88a53f8590823a79c49a6adb740fc74c27552247d0fb5c109 SHA512 c595dc1201d194aca61e29aace7799f2e08459212a96b1b51922008b2dcd3dae77954ac706ef44aab05ade89933e273a4147a717a4c05bda19bd7ddbdec96eb5
 DIST keys-3.11.tar.gz 8674 BLAKE2B 27f5fb7f26631e54050bb90c04b1c6fd01e1a0798235fbb29de577b464c92602c2a802ed1ba2a369613e2545f71df092cdbd1c9b7350e059512efea2a99e4d8b SHA512 027080dcaa59f364ac5c043586f54ed42a69cf2c2fac7955ae11029e01d2fa0fa2805286e4bf70db68f1f22467cd98f68e942ec6210524c1cd71609e44f1a1a6
+DIST keys-3.12.3.tar.gz 14378 BLAKE2B 0c2c4599dfa9234e9170a285206ad94f988246a9d56440ea5a89680e17cabd488372ec7b444fd997deb27f6315f9d843494dfbbdd4d2a09ef0525829e7340ed6 SHA512 e0bab964eb38388dfb2fe7dcb4999da0263a2162f171f7ed629a2e1de33eb1cb99dc37a6fe32045f136466cebb5aed69e533417256877316c81a02abc700c28d
 EBUILD keys-3.10.2.ebuild 1100 BLAKE2B 41935f96df807307273e152ae815e04207ba8aaf6ef41125bc24324fcb3ac1d28a065edaa86db9f9d04c48e4e2f4de02498627926621dba311f313e538666a09 SHA512 6bea04bd1025200e8e514d4f42ffa93b7a47f342ca9f15d5919a7235a27186979c487a6df37319ad6d0ab6a8bf9781e92ffe9a418fb5b1a0647512cf52635e7d
 EBUILD keys-3.11.ebuild 1200 BLAKE2B ba2ecff5db079a2b654da054363fae5d480b4f126ea21d2d39969b688a6f3322bbc23d45751795241c273e3ae33009a99889343c6c607a100c57c6020a65f0a3 SHA512 5e295072eb4fa730c739c8e96d2f5e6426026af0f0d4094363913a9c0fea48a8cea6fa77ea527f76fa94eb989a4f176dddd44cc90ded35a91cc6b1704afa7fd8
+EBUILD keys-3.12.3.ebuild 1348 BLAKE2B 1a684bb5dd33fc1ad37f34557b7020d7eb501521d5267a9ac8da6e0febefc24fd7b30ca60bf853d6139148d103d986c702301869db632a740c3d0b13f142a3b2 SHA512 e1a951c2aedf98d87fa21067915c3677e448712754e2376d8316545f3eed1a130552e6852116ecffc84c35c138e8eb327de62e4625f28575b3e08ff143f7c28e
 MISC metadata.xml 396 BLAKE2B a515485a38dd0c04dbeafbb2bc08e79d62f2311028428fc907af29f88c20bd236bcacb8ee519599f2e5182194483d849bf813f8de426e52e8b0cd0c2bf17fd04 SHA512 041a590c10a1b3549974f101ef9a597199bab1004ac468a8f9d9dc04b06bf16ac4d06bcbd54f0c8edf242b6a3d3a01077b660a98ad24026831119b9b57cd982d
diff --git a/dev-haskell/keys/keys-3.12.3.ebuild b/dev-haskell/keys/keys-3.12.3.ebuild
new file mode 100644
index 000000000000..5d1ecad351ff
--- /dev/null
+++ b/dev-haskell/keys/keys-3.12.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Keyed functors and containers"
+HOMEPAGE="https://github.com/ekmett/keys/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index c11fb9a7e8e2..ecdef225d8bb 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,7 +1,9 @@
 DIST language-c-0.4.2.tar.gz 167052 BLAKE2B 8f1b5192470a25eaad5be8c0a0f374163a91f840b6b184496d1adb45c1239a666214950fda939bddcd8617becc92eaf461b564ded29ebe3b852e16900700b772 SHA512 e2cd4c2871c04fecdcdf82026c79edf7681e00bf632fcff6c119cbd95e53905695bd8f08010d2662e10d883b2fdf6bb114a199b0eaf7be31ff65aaa29df6083b
 DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
 DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
+DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
 EBUILD language-c-0.4.2.ebuild 684 BLAKE2B 525a92a4be68840ed8457195d58c515259d1f798f8f19117094e56727f4e980cb46e4c1c6771d5cbadaa76ff77697d8f6dbfffb3e81a70926de3da5d8d6ef664 SHA512 538f29d87b70c51afe3a406733d1a68153360e8f27248681b9883dd9dad09bf0016d92afe1a9f561c3f7b0ee8846be289be089a38e719a506938c059ef45c1ee
 EBUILD language-c-0.4.7.ebuild 787 BLAKE2B 502543fb7e25e47b39e950bf79cf00adcb87f71b709610cb4c38860213e98178b0128cef385750e655a7a325219c95350ff79ba6f63561ec90d6d4b45b659024 SHA512 a5e26876cb0c1581bae152843239444f171391df4827ba7b11e4f33edbc1e863eccbbb7bf54fafa472707621501c4dbc8525a7a8bcbaba87cceddda595bead9a
 EBUILD language-c-0.7.1.ebuild 767 BLAKE2B a01f02bc85e8469524048409ee21ec787a4cdb57ef0e39bf2297f10755c580e2013dc6f2e8c62b244a32cf13e6ecb4b03f2e0637ff9c3699b1ebd7ee56a22f54 SHA512 3377ebda4c970081458abcae97f6964b6bd1be59e64e216d02d196142e872994eb992560a2fb9b61bd573ae2ebe547b32d85da81b338002ccb3cfc5ed8aff799
+EBUILD language-c-0.8.3.ebuild 880 BLAKE2B 23133b59ad9880e1081708ff62f06cbe63a41b0fd7ee238402f6ead4877ca4cffb1b936196764fd1601a7fbac4ec66f9cee73b31b01528ef3c7353cc950b0c0d SHA512 585bc9f8353f008140c602bee9335b3f4724908e1dc09d7c251d7e4983010f01c3d4fbfea41a7a715c4214d7d4c28f8b42ae0774e2d67697eccd67a30ad40597
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/language-c/language-c-0.8.3.ebuild b/dev-haskell/language-c/language-c-0.8.3.ebuild
new file mode 100644
index 000000000000..9fa1ef71fc32
--- /dev/null
+++ b/dev-haskell/language-c/language-c-0.8.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Analysis and generation of C code"
+HOMEPAGE="http://visq.github.io/language-c/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/syb:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.22.2.0
+	dev-haskell/happy
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allwarnings \
+		--flag=iecfpextension \
+		--flag=separatesyb \
+		--flag=splitbase \
+		--flag=usebytestrings
+}
diff --git a/dev-haskell/lens-aeson/Manifest b/dev-haskell/lens-aeson/Manifest
new file mode 100644
index 000000000000..7ce1579bd07d
--- /dev/null
+++ b/dev-haskell/lens-aeson/Manifest
@@ -0,0 +1,3 @@
+DIST lens-aeson-1.1.tar.gz 11022 BLAKE2B 4291d060db6e6da1eac5f9ac11dc700effb3df8bdf91c4a0ae34c443cbe4655944f210bd13de78c9185465d9bf814111a649e98a7863cc1cf40fc737ffa66961 SHA512 a5e1b98cc50342ddbaf36a9c6f7a87cdfd8e8abb66852777ef8fc3362a3cb7bac473c3dfd7a4ad2f57f3318c5dca6ec7a07e2a4eae05bdcc34308d188d791460
+EBUILD lens-aeson-1.1.ebuild 1532 BLAKE2B f087c4282661c06a2dfe037bf9f759da7115b687514f7a283595b07ca69209279cfe5a285b4e959472d11c68eb0e0b3c84be9685bb9daed27d1cbd8d33e12077 SHA512 03a89919f8adceca02414014354c0636f1024c244b445103a0fa32b2ab5e602dc62b336e2e1b61f93dfe5c8acb11f25248dec2461d41ad67ff51eb4794693791
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild b/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
new file mode 100644
index 000000000000..6d0862a5b3d2
--- /dev/null
+++ b/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -lib-werror,+test-doctests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Law-abiding lenses for aeson"
+HOMEPAGE="https://github.com/lens/lens-aeson/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # doctest fails: warnings of "is ambiguous"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/lens-4.4:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/text-0.11.1.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+		dev-haskell/generic-deriving
+		>=dev-haskell/semigroups-0.9
+		>=dev-haskell/simple-reflect-0.3.1 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-werror \
+		--flag=test-doctests
+}
diff --git a/dev-haskell/lens-aeson/metadata.xml b/dev-haskell/lens-aeson/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/lens-aeson/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index 1b94f2e89694..f26d3de6644b 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -2,6 +2,7 @@ DIST lens-3.10.0.1.tar.gz 455039 BLAKE2B 8be7cb75d2576dd65be0f91ad0e7f0b56ef1ccb
 DIST lens-3.9.2.tar.gz 454678 BLAKE2B 0c637a1a00279339a697b04d8204c14f598882e0cf222ab6d5e45cd096fe34f132cd0ab1133770ffcc857b4b02c7c1987d00b46ec0f6ef72c44801c78ff8b8af SHA512 63e3a39d0d0ad16d27a8e2319163f333b67bc9df2d89d1b7fbc4dd9944cd098f0ba4a571a66939a640143c86c2f3008d5db3619af14f11a8cbcc07c424349f7a
 DIST lens-4.11.tar.gz 964787 BLAKE2B a3fefd1dc8fa3667c28b35ecef29219dd299e103d1138aa888fe610c4c1fe9b90802dc1dd43c3d8b3df34aa30cb3b0c9994550c6c6d745b7336320b6f959275c SHA512 9dc49c7a4c5cde508a5021522b41cdbb3c32b9de4be706fed189d16435828c03382cd6f069b4a17d13bcd0af390787e9f3343eea14e98662c3de3bbd5333143a
 DIST lens-4.14.tar.gz 972873 BLAKE2B 4fdea38830b8d1c4b08f5818ef5a81e7534dc31e3a07a9dc64c91b6b1ecbca8b3fc3ce561abdb8a85bf57c63f4f092687d67780d6a48a0febbbd9ad1983ca2c1 SHA512 d27999472d281832bbf56c3dd762e1a6c310d07a21af4351e64a53d7cd197e538f30955aa108ba2f56bbfbe8612ba4b844a41667e36497f03c14797e23c9c01f
+DIST lens-4.19.1.tar.gz 704985 BLAKE2B ddb9f660ff6a1930f356ce915f653f81dfa4814f4956e89d1df213dd57e2cab85eeea7be9efb46553c36448b01579319e8bf1d4c739cdc3bc13608d54f9e43f0 SHA512 50a596ce919abc93b453189453abdbf0f455e0531e5b83397d1e61308842222433fd7d4c6c6f5ec74f98d8dd26eefe861a0d88d5faf56a7b896a0b083b920a10
 DIST lens-4.2.tar.gz 767603 BLAKE2B 2ea1d21ba0f5a4f741869aa7aebab8999c28bf14339fbaf1ed493e8f2035217f0ca62502cd5b11d1c3bbb1e577ed45d807b61b6ac363a60cbaec04add64fa32b SHA512 b1e583d3400c076f1e3648aa758b0d30d6a4e3fd9776eb9e115fbd7372b990c3aa3e5d8119de827b132e0e69a255b3532f3f044e936ac4d320cc146a6d04f7bf
 DIST lens-4.6.0.1.tar.gz 767614 BLAKE2B 96e328e8b248de223cfda1df01d418aaf2e05edc2a70556805a408b32227c9246a69479e16085e7ac3abe632c702157cb31b07c94b4c92aae4346d855b06127a SHA512 0dd233ade1c5f0e3872711ecd378b69ff98353caa33cdbf1ec87bbf0356cd54842fc83870bb51b913abbb2dfd767414ebe79cec0e058cce16c29468a69880662
 DIST lens-4.9.1.tar.gz 964188 BLAKE2B 3efe4f86e592d997804c1976c7c3cfdde5cc52ef2379d531a7f4c4c43b6c834d4aaeec86309d73b5074d961d681aca36f8d0bb12f9953fd1f760a9bca72bd27c SHA512 f77d1c46a53b65e65bec4c993db087cee720e5a63f17d8beec38fe49b713bf36f4c4ff1564c6533044b8dfaaf5f5729ec98dbb55687f70fff1344e5112e8857b
@@ -9,6 +10,7 @@ EBUILD lens-3.10.0.1.ebuild 4046 BLAKE2B 8f620168be0c48ead8aaab519c4b0671e7dc444
 EBUILD lens-3.9.2.ebuild 4325 BLAKE2B 424fdb8e8d3f5819ddac761acaa8db0c16ead618bb80797d9530ce099757da185a7dec2fbb03a914b7943df18680b854a7313150f478fef5fdfedb0a69bfb7ac SHA512 356b6269cc6a8d47782afd80d88985aa32da3c9ccef7d6f5a9d0505cb324b50e332f049a80cd1f7ad067e05b67c9619d0cc6f9e18810a829865e31cd6c3e0169
 EBUILD lens-4.11.ebuild 4327 BLAKE2B 8048390a91fdeeca8fe7548cddd33b05225973fd1d6241bf57828f0d6173718aada0dfd6d9379a76c4a1be60b8cf941380c1e2fd88363b2eb1c8943b59e03f09 SHA512 f9699acc7a94e279ce0ebb1dd85ecaabf4c6ff16db8814475927bfcf06fda4961ddfd87c4f694fbe90b8d507da56a6ddee405f1440aed3e43bc99e2fa9db2de4
 EBUILD lens-4.14.ebuild 3409 BLAKE2B fdf038ae58abc8647a9355ea9c3ad3d12be28dbc3bf8707ac17931427d2c5883bb5bd39d22a4d106f69f0abeec0b29afe32f12afb91441dd1b4cbb48a3bbc7f6 SHA512 5156d91329aa58d80256013699ef224db1bc90e00cb8b7efa21b158519d86a0a8bb475838ab2731d2783632330f0a8c1ff7f8cea8893691363a44343d5f9f431
+EBUILD lens-4.19.1.ebuild 3812 BLAKE2B 5e66709f4a5fac199a05d4518e765f40fc50304e3c21342d92f2d96c5f66ba0b9095126bf8f492ef6eab803cb969cba884f8d1403a03967bb413294969f73ffc SHA512 4604209b82e270587c2c7ee593bef145e6ee51d45407b015a17e57e93dc07008672973ec6a9e4775f56a199fa72c34eeeb33cf7374c4541a5fde5a3fafe67c72
 EBUILD lens-4.2.ebuild 4697 BLAKE2B 71759c879bda8b7ce3a57ccbf94c05e19d9e391d3cb9428b899e4f78e83d36607e385d41ee523a76ec565bef8b3db19a97ee90f68adb641794aaff8f713f21b2 SHA512 50a37a77dfa8dcae665cd412ac0c7b23297f3c5c8a99806b4ecf8d7c5857d2795399440ee355c6c69cac24f99af57cd0398521e9c36d5b8e2c6f2d14f817e718
 EBUILD lens-4.6.0.1.ebuild 4398 BLAKE2B c064fca5ddad33e15d0c8b7c8dfd71a69a2c381a29c9eb3cf74bb0ed057a7b0810e6752cbe862c637a29a5d2a06588542af0ec674701290efcbdfa3c38f107b5 SHA512 a10fe37d6e8be409529e03e6e2b0fdaa25cb8eb309858fb4783f085bb31e8593f0aa003fba1e042b1b893693a632f399e600fa9b2bb3ffc8056a40a05cb8499d
 EBUILD lens-4.9.1.ebuild 4337 BLAKE2B 089157379a489ae88be495d33ca2e5bb7082141de065724a9386d2639472852f321afdf15116dfc495db9326fd861c8dc2ad4fbbde540e36e66d663622a15f3e SHA512 2e9bf72439b29468268a6912569a6db96d9a0a9a3b07efbe1717b76b2230800bc25be46e6b19eba967a4c2935917aab95c4c34393b660e4c55eec0c7ffeb584c
diff --git a/dev-haskell/lens/lens-4.19.1.ebuild b/dev-haskell/lens/lens-4.19.1.ebuild
new file mode 100644
index 000000000000..c4a5a24ea015
--- /dev/null
+++ b/dev-haskell/lens/lens-4.19.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -lib-werror,+test-hunit,+test-properties
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lenses, Folds and Traversals"
+HOMEPAGE="https://github.com/ekmett/lens/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.3:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/generic-deriving-1.10:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/test-framework-0.6
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.2
+		>=dev-haskell/test-framework-th-0.2
+		test-doctests? ( >=dev-haskell/semigroups-0.9
+					>=dev-haskell/simple-reflect-0.3.1
+					|| ( ( >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.12 )
+					( >=dev-haskell/doctest-0.13 <dev-haskell/doctest-0.17 ) ) ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
+		$(cabal_flag dump-splices dump-splices) \
+		$(cabal_flag inlining inlining) \
+		$(cabal_flag j j) \
+		--flag=-lib-werror \
+		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
+		$(cabal_flag safe safe) \
+		$(cabal_flag test-doctests test-doctests) \
+		--flag=test-hunit \
+		--flag=test-properties \
+		$(cabal_flag test-templates test-templates) \
+		$(cabal_flag trustworthy trustworthy)
+}
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index d32d566b36e8..4d5b9beead4a 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -2,8 +2,10 @@ DIST libmpd-0.8.0.4.tar.gz 39996 BLAKE2B b35dd8ef91bbde333c64ed904701bade2541b19
 DIST libmpd-0.9.0.2.tar.gz 38392 BLAKE2B 80b3afb64eeb5b2ff242991388c25c1581c066b7fd4700487b1b472692f1890b3299fc2e0fdbf27c035e464ee2f28314d034da8dc31db862ca47783f9042fd59 SHA512 0dcafb2085e833608c68b83bcb08177ecb68f08110c1d25e8ea7b2f69ff9fbb85e581280528d1c5a4f3a6c9077ec70105ba9d28bce4276863e91db776c698d1e
 DIST libmpd-0.9.0.4.tar.gz 38421 BLAKE2B 5679d556f0c3324225da80bbf9c6d44a928c9218fd4119b9b09a8896ea3b7f26437757bd0757cce3c831a367dc057a651d282f04c189a5a22d78cb4da4a56fbf SHA512 f2c5d300f26d9101cf248c73791f45b26803d13f39472c47109921c82c941138804a80237f359629419001f1d228c2ea199c69cb4421aaca23012d5871b796c4
 DIST libmpd-0.9.0.6.tar.gz 38707 BLAKE2B f6d11eaf7c260d375c949c0cbeed17af95397d99141a0b879d7f00e00a06dac6de302b0918f3d64ee16de740f418be22ce84fbc6ffbb56af3b1688b411a3d4e3 SHA512 87601afb3ea71675793087277c8dbd02cac596df19d8e665ccae4111f87c3f5d39fff33f7c26dba9be22d6569cce9bcb039aa6f56e8542f26c699d8f0930371b
+DIST libmpd-0.9.1.0.tar.gz 41332 BLAKE2B 16d4ee3ae4edeb647927ca03ebcad0ce94cf0e5dbcd15550843ad7a56f92683fe6e5c0e265875d4df944493d7273499e8ae0a8127d75a1b16416965d95a833df SHA512 f8fb657c4eec2444aaa6ec58966ea9fc8f4944ce13e4dc380f8fbf3dd87a39e1db18c563a25ac09ea1c6f3b5c8596a25dc0e81d8b7d2771c970d85c06d208496
 EBUILD libmpd-0.8.0.4-r1.ebuild 1342 BLAKE2B 7c129613b8909af37bee63ef4e8b9aad4fca3fb2e70eae359e1d9716a89890d68829b27c8b452af78a93b1bb5da0c27d37dc161619bef8be397e94746ca0a9a6 SHA512 5307eb141334a571dd8f17a7819d99a104301d40fe41df2c1cad6f7d57f9fabcdb9ab9cb2c2578e765fac81b23063038b8e31d33e1ad594b2602d7b500f3a0aa
 EBUILD libmpd-0.9.0.2.ebuild 1210 BLAKE2B 8307db616393828840ecb61c8a74ddc5ec9269ab541a15148f913058a1279f9cff39c9825cf248811f25b204720deb550056b491d3e9598891e3b7b5a92cf8f4 SHA512 5127d6b30df6839b313e2fc21f27ec665b5fe6fba9c2d66361693a009dbc33256289c1ed4a0370c16ced9490ccf0893b5816f6b865afef27efaa03119d3805a3
 EBUILD libmpd-0.9.0.4.ebuild 1278 BLAKE2B e719225871099cc4625b1005768e89d400cf751296eff3d34a19a38933a065e49369759d084abb02ed6e53ed80b1389e230de048e633329403d6f28c42d9c2f4 SHA512 a3e56691150a047c2fb5fac9644957b30416de4e48e15079f60ba40e2242f924eeef6c94eebd203d6de61dc1ce5f19e6a72b4d8e109012eaea023dd346c94420
 EBUILD libmpd-0.9.0.6.ebuild 1161 BLAKE2B d1bbd6e803e44beea91742a3528b0275eb3cc8d24a5985262cde2db44c4b3d731f2b596b53017db03a82fd8385801a86f9f05af1f2094a32794ec9fed23bbd7f SHA512 02d1ca5ca0c1d432dc7b8833e06cb249d03de70ecf352a72dddbc9afbf6589224a8c23f02450dba13c6c7384c434a6e1774121cda802de8266cae2157133490c
+EBUILD libmpd-0.9.1.0.ebuild 1229 BLAKE2B ec69b85cb4a8efeb7d7279450c9c9d2f92b7cf822962ff37766aa0dbe7707ce999dec0132b09e8c0842c6dcd8924929f8f61b0da5bb51f9f024ec11e760050f6 SHA512 36d5cea449e7fdc83e1b55b34f87cc1e59a80477d025234a2218a50f7fb57784e3aa913e28670ec6a44d9decbedfb1e483602b9bcf9676485964cbd4eed39307
 MISC metadata.xml 470 BLAKE2B 36a2e27afa2db06d05ff99bfde367a0189395b11bd73bb0f7db3a28132f1a6b678839059ddb85d8defcf6c1d720c2726390dba07d6fdee539c900ca2e5d5ffef SHA512 0dbd8d050cbf5c5f9db61997b1f637c6d8197a99dd92deed7da9919f738f35747fa8265d270724bc9a2af16325f9c71eef29decc81de80f3846f34c430bab708
diff --git a/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
new file mode 100644
index 000000000000..8ab931fc2ed5
--- /dev/null
+++ b/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An MPD client library"
+HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2.6.3.5:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.10 )
+"
diff --git a/dev-haskell/libyaml/Manifest b/dev-haskell/libyaml/Manifest
new file mode 100644
index 000000000000..d8367c28a7f5
--- /dev/null
+++ b/dev-haskell/libyaml/Manifest
@@ -0,0 +1,3 @@
+DIST libyaml-0.1.2.tar.gz 63635 BLAKE2B 36f702016e5646671c4f56d4b717bf99307bc4c27b73f9d136558b1a95c5c1007553a89a256540cf32bed30399d886f18d119cf4a7f7067e318ca2c44f94c991 SHA512 0423fb36f1fdeeb89244a81930558ad272f8ffe8161ced3cc542e180937a1e5f264f188972786830b0bace6851adca796756abe100dffa8cb969eff4cb0e3121
+EBUILD libyaml-0.1.2.ebuild 897 BLAKE2B 2e1fabf7d920cf988d55518ea29e3f52c50f9b201c2b19a7a4b622573de3dbbffeeeb1fd4f3dbbb084958515236b69e9bf35b92b845e8f6a5e0b7c5e22f8c763 SHA512 56e8804014e4cc6db7cd0d75f2f92d411c2e473010d2d14a7262fcf33f3bd377029674856e6318869d6ee164e7a9c6368356471d6a9c5148b42ec02a0da398ef
+MISC metadata.xml 464 BLAKE2B d791c04a3723484b5bb2651d7a3f8930ed5644a207414c179ea7ae62e6c468d5086ce5b2f9c1dcf5c55e65ef97d9446daa15f8d008aa450c5a884f01d4c411d9 SHA512 423933e76fabb74c9111f6b7625e94af9d7d909e407371d2ebeead3cf2190b5e444094bc52b4497f85b63b1c2b4c4299d77c30b8fd8a3bf6ec87dc4dd62e2bb0
diff --git a/dev-haskell/libyaml/libyaml-0.1.2.ebuild b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
new file mode 100644
index 000000000000..be4c94e648a6
--- /dev/null
+++ b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level, streaming YAML interface"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-unicode system-libyaml"
+
+RDEPEND=">=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	system-libyaml? ( dev-libs/libyaml )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag no-unicode no-unicode) \
+		$(cabal_flag system-libyaml system-libyaml)
+}
diff --git a/dev-haskell/libyaml/metadata.xml b/dev-haskell/libyaml/metadata.xml
new file mode 100644
index 000000000000..f4381ff218c5
--- /dev/null
+++ b/dev-haskell/libyaml/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="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
+		<flag name="system-libyaml">Use the system-wide libyaml instead of the bundled copy</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 42c73f81e255..165f58baac97 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,9 +1,11 @@
 AUX lifted-async-0.2.0.2-monad-control-1.1.patch 2298 BLAKE2B 3a76cec4560fb618f7d68568d668e6baa8ed555befbfb9f0e778c9a2911b6a86d835ede634654e7665d292e23155e2234b6d5bd09c384cac4f66c3daa4d2aea3 SHA512 fbcd9e1c4dc34162fa928f4a528b16cc58d6b3a86ac3aea82dd33f448e5869a8d48add1c5b6c574dd588be6e68285fae98fccd8520adbc2e782210d70b4a8618
+DIST lifted-async-0.10.0.6.tar.gz 10308 BLAKE2B f9718ed3d97d4cb17b87d49efb594a7b61f11b6be9819b44bd8382a87bb247b754328db07417699f5140f6168d42c3d51fceaaaf33da748f9aba8683101cd6ec SHA512 9e5ae5d906df2577453c9b86f196f4bb4ec4d7766c5d9bcb7d2fa66be62daa44c033ed1475bdc004e1540da81f645a4d39db35142d32d09b33cfe9c01412f1ce
 DIST lifted-async-0.2.0.2.tar.gz 6907 BLAKE2B da3f85064197fe4dae8f54f28d040d05d4acb9d3bbc638d32af61edf0e361ad9b9398d858d808e8264caace4e88754aa75dab32fa60ae0837f8d9619f7dbf14b SHA512 a69e3f93c33ca76889afd894fcadb3f0d53fae05ff47bdbaa5d164deb756c60f7282671bdfa14d092b0a985f5cdf30746fcf847241aeda08be553f7c8d90bce3
 DIST lifted-async-0.6.0.1.tar.gz 8871 BLAKE2B d4629501d4696487a703b08216afd2baba298b100a4c1664e0dc43d29642b1b52fbf817a3582e3d9124d9bbfe896c18f399fa19877e10bad939941127ab9bc4b SHA512 afa436919bf50a343739ec9ca1e492cdac037df1e286812e77089c939303ce00a0f8681303eb41ea476df5d4013be6ef45c63c161ab0fa92b0ced4a0c4e57120
 DIST lifted-async-0.7.0.2.tar.gz 9096 BLAKE2B 48203cf7fb41108a37b236c827e5fcb623e3bd82b43df7a1ee6f8e47363bfcb08a8feb9c5908471e84df0cbb83480a2e1fb4fb4a94e906f8a63d71480a1601f0 SHA512 7dcbc10d0e5c055b3b1d3f4a2a69304b2b66413cb0ba99d1abb03f067b6f898b1aa0d9ed9deae0016fd1198717c048b8ba5b40e60ce3c1bf888c876dca15a222
 DIST lifted-async-0.8.0.1.tar.gz 9453 BLAKE2B f74d017f8afd51f08e48225b590d6b88899429214cc0a33fcac2bc5e1e67524d43e7d78830ff0be9258dbb333069331b18850968d1b896cd26abdf66943a472b SHA512 529a8c2c88f6277f5618d89f62d99318c9ae059c650f40e6cbc61f70621f073a10fff0ce3f27936d71a0dcd222afdbfa58d0922ae45075753d74c3e7bab5bcfa
 DIST lifted-async-0.9.1.1.tar.gz 10077 BLAKE2B 13132800149f014add45245ef3a2988fab4e1609b5f0cf05284d73f584e0a541d7eccc8e7a6ce5117fc374ab2c4c123adc9bc6fbdb52a5fc2662913b986a54f1 SHA512 c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad
+EBUILD lifted-async-0.10.0.6.ebuild 1264 BLAKE2B 6f4a009cb1f868dfcc3c7b08c621aff0f86784423d3552d39dc9599e48f4481cb06341c8bc697a55989d4183e9e112c34356b349dda2e3854d52ca3b9181a715 SHA512 b765eeb33987645ceaf6732f70ae8aa0c02f30e6a1e4b0b1a1c4ab8a734a758c717d78749e1ed27ecb0752bf54cd8cb954442c2d07bfc8daefebc34b2cdcead4
 EBUILD lifted-async-0.2.0.2-r1.ebuild 1047 BLAKE2B 629a2767424f499923bbcca3cf918b519c53897dcf9ced7a66c5ea6725703aea717606e5023822eb9bfb75b66b7a130e3d82c252d0f58b2dfa3d01f1af3cf2d0 SHA512 6cfb1dec33df8e95beebf2834ccf1299bfc4974e3bcf8ebd8db578d9e7a6c52d35a2efb592553e29a284a3aa3b278b35adc01b38ba8d99501cc72e09bf8a860c
 EBUILD lifted-async-0.6.0.1.ebuild 1396 BLAKE2B 8a25f5b31294e6674bf23da75297d725bb559fa6bcf41d661ebecd6cd20b2133f90d187fc671dffa4f37b1cba9e936d98c213c7214f62a02f079082f2810e25b SHA512 b21ebde7055e771efa3a82c91517ed8839ee853dc5aa0d2bc0709c2844c4fa39cf7f91c901b04ace7ce0312d1b9614903d032d635d7e50f6a61aedd780fc9a3c
 EBUILD lifted-async-0.7.0.2.ebuild 1401 BLAKE2B 2ed9d7fd30445b76ac8e01141d013017546c2da3bcd57ce72c4151612c70f4a0c7c06416b39cbe13f86c71a8e9db59134f54ca10ef4de50161f3d58b0a42d2f2 SHA512 a1e0b033f41fe260da3effe5ef6c4b51a79cc53f4e40edbbc332cd1de01e22933ce990a4b0c36278ea1b82e2d6c3b0cf175bb5f128f18d71c7b19da1651a216d
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
new file mode 100644
index 000000000000..fd66768fffd0
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run lifted IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/maoe/lifted-async"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#beware: hackport not reading `constraints` upper bound correctly
+
+RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?]
+	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		dev-haskell/mtl
+		dev-haskell/tasty
+		<dev-haskell/tasty-expected-failure-0.12
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		dev-haskell/tasty-th )
+"
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index 1f409f213ae7..de7d62ee3c15 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,5 +1,7 @@
 DIST linear-1.20.5.tar.gz 44886 BLAKE2B 54b08c4c9997ebb60b4f46d9caeb9d8630a470cda04c8096428eafd6ecb3be1c3b052c59d4825d27199364f17b693feac64b4c6e0313fb4c37b889630703f9c3 SHA512 a45e38d5b25f53b809a67c17e0b532b96e9766d0e81d2da0265c93a9976cdbb183c60dce79eda17259d4169cc25884cc4831a24b93ccd43709df374ce5187600
 DIST linear-1.20.6.tar.gz 50036 BLAKE2B a81e762e43be22a8eb7f1ad0118275f8fadde206f60c1160eb40dabcd8674bb1217d73a4b67626e8392ddbd644cd4d88e55bb7038c17ceb4df5384053a175811 SHA512 40ca3f855664a86c9c70fbe398b2ceeceaefdc5c6d5d66c36c6fc60a8252c70fa0566d9eaef61b0559d0eab0d30cde207640d738a007dd5a0ee6cdc72c1c9690
+DIST linear-1.20.9.tar.gz 49250 BLAKE2B ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d SHA512 4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
 EBUILD linear-1.20.5.ebuild 2257 BLAKE2B 84178f2623d60a80c90f1ea3e9b9390c86140273dd4b6ff4b7345a29dd53fe115197988474a00c8df4cceeeb84b458fdbd9ea7cec8d51a52841cfd6bfd3294b1 SHA512 0c2e71b6ed3d812782328d69e471d6d3afeb4efdd12ccbad6269a73dd027c782c21356530f6e699d28f551e139280276b4ed284912c699118a0a004f23248b03
 EBUILD linear-1.20.6.ebuild 2169 BLAKE2B 184e26cb3d69490d3225a255ede59843ade923536c5ef01da7bbf6b373586a66f34057ca7a204e52f9d3bc3f80b4e87060c621becefabd8814bfcf86b00f5db9 SHA512 1879d0b27cfe439b616ef343806721822d06dd6398e8904cf6ff3421f4ca6ca191881f46759aa332b5cb2816e8adc10a39023d50149623bdadfa378c7ac5e30f
+EBUILD linear-1.20.9.ebuild 2211 BLAKE2B 432075936c693e678a568f85155f0dc47b6e3e8fad104ee9d02ee81214ff1f44e348147b7053314cf91d56e8d8f47e2960860577c2afaae6a87fcac2c6bd0151 SHA512 2d81f87e5b427eb1904ce0d164b262776cfebcc24a1d04be22aadcb39ee83501eaf6f3af05b5c1d7a43cd6037dceb9dbd7868861773e6d74d048495789a339b4
 MISC metadata.xml 712 BLAKE2B 0ff72ad30139d749ba6073cf8d1105adf62101843c31c5a1d6c0540b1988a0d0dfac05a3cbc842d204fc4f231987f20ea8b2a094440100fb3977a452e7889f15 SHA512 0c7f6f7a0420ef96e558a2a59a119781089aed365ffc60628e97d685b399731a967cdd35d7edfe03a6c5a2f3ba1b4b61582a88fee1cfa66a6f872e487cece39b
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.20.9.ebuild
new file mode 100644
index 000000000000..ebf29418bf02
--- /dev/null
+++ b/dev-haskell/linear/linear-1.20.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -herbie
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Linear Algebra"
+HOMEPAGE="https://github.com/ekmett/linear/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template-haskell"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
+	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
+	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+		>=dev-haskell/hunit-1.2.5
+		>=dev-haskell/simple-reflect-0.3.1
+		>=dev-haskell/test-framework-0.8
+		>=dev-haskell/test-framework-hunit-0.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-herbie \
+		$(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/listlike/Manifest b/dev-haskell/listlike/Manifest
index 5ad2a5c419fc..e2efe8a2fdc8 100644
--- a/dev-haskell/listlike/Manifest
+++ b/dev-haskell/listlike/Manifest
@@ -1,6 +1,8 @@
 AUX listlike-4.2.1-QC-2.8.2.patch 478 BLAKE2B 974c6b65457fbfd19802c6ba8190d85a80f0939636ef65d32ae0e684e62b919c5298682fbcca851103a3969f00042449ab53f44671f5bcca76cb37b9a80d6e6f SHA512 204905c3a34da9c1acbb2be70264304e54f2bc6e9f457217b1d8b5c93380b842189cabb8082e100878b06f6852e02875fc253185c4b1e6f8b6af47b1244b2bee
 DIST ListLike-4.2.1.tar.gz 26970 BLAKE2B bac409776f37ba43f1e1bfa06424ed823866735cbb7b05d30cb98a9620b05891d651e10fd0a1c2c10642ad6215e2de9554221ab3edc6060c7f7cef51b4561c67 SHA512 dc245b4c2bc4fa0ea24efe55434eb8c7b2f2ee1a078fef331997bb0311260732970255fc8a18c9a7f22d90f47f661e543d18e6ad60b8d46992a6e973ccd375ad
 DIST ListLike-4.5.1.tar.gz 29600 BLAKE2B bc6b54b91e95ea8340db305975ee3b5ab5239989db518930353fffb643d29a23d8634d2760cd39729389fe983b553a3a7816a939d583f9470cc56284150d1568 SHA512 4e59eb8cdade42ff63db9f90a7ec524dab674872960bd294da3195c280e0f488a3c0acb3827def8a071e5ecd820bb2bf0d5d68c22b8388adc933accbb0bcc630
+DIST ListLike-4.6.3.tar.gz 30538 BLAKE2B e43f67bd5838eca31b4169b36dc33f872c21396e01e15ccd61db26f5deefbcd7e9a1ff596b95425a92edc1740b51c7a8dbf728f4801298d848fa79419008b447 SHA512 9a5eac3543e62d33b433b809f119b0394d71dfee7f6442ab9e436144367e5745438d6806263a8e8658a28dafa11290d5ed50f2aa9cb5528e1762c23efe3cb705
 EBUILD listlike-4.2.1.ebuild 1139 BLAKE2B 34552ecdb40e000ddfa8b433bba47ce24a6e2821c6d7c688e248585a3360f341951d9f9de926e286fc12cf1d8121413d19115b29a4f4b3c4760e1b50e04bd8c5 SHA512 12aaba6c078bc6e5b700eeb71560c64f5dae3f1eb3b692309d19b3ef26269c33674c6b712d6d1b014f141f6fd17419cafb4022015853aca6b3ef3f841a9678f2
 EBUILD listlike-4.5.1.ebuild 1114 BLAKE2B b3c0835b93c85ef334eb7c681822d66b2f64eb9c4e319f945c790ee97857a50f5f46ff8dd7531eefbff623a70a9fb53d56abf22f83e15d1e569b0e9e5b57c543 SHA512 7ef76cd1e694c24f4a90f8f453d5ae4f9bd74d8250546370e1bbe0d74eeb6f0794f5e721d8ec71a526fbc75644213fe95e938484b11b118d744fe5edff9e0f8c
+EBUILD listlike-4.6.3.ebuild 1191 BLAKE2B 325571fb94b8ff5277364cee9a42babbe0202808624234529f950b823ce8f180f5713ab052a634c1ae39b1628022e123c5d6f0163f2ba5da32a78d2e35348b1a SHA512 5c9dc6c754663bc50d16b929f36f70cbdcc201486473b17dfcded686a02b5fa612c66c1e978b4a277230b1802b8fc3274f2d016731764a8b7a9d5731f5fdf452
 MISC metadata.xml 783 BLAKE2B 3c3966a1f248069416a91328590f1ab7f279f3c4d6749f6036fca194c012fe13688a9bbaa318cb26e538e7071d98e134f62db06d5c9f338e993d15b0af5f558c SHA512 379416d891112c98837e72159adf825753c340fdc0147e64acb7ab2b9c03052452124e7c1d2f3d585c545f0b92a0a8d4bc865c19256847b4bd0b702c72d20499
diff --git a/dev-haskell/listlike/listlike-4.6.3.ebuild b/dev-haskell/listlike/listlike-4.6.3.ebuild
new file mode 100644
index 000000000000..9f80458f817d
--- /dev/null
+++ b/dev-haskell/listlike/listlike-4.6.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ListLike"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Generic support for list-like structures"
+HOMEPAGE="https://github.com/ddssff/listlike"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
+		>=dev-haskell/random-1 <dev-haskell/random-2 )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/lrucache/Manifest b/dev-haskell/lrucache/Manifest
new file mode 100644
index 000000000000..6fa032ebc074
--- /dev/null
+++ b/dev-haskell/lrucache/Manifest
@@ -0,0 +1,3 @@
+DIST lrucache-1.2.0.1.tar.gz 9224 BLAKE2B d29cfee3d21fcf66318f272011551a1a04e17ccac5ba58da0a80591502488ab7446a5b2137c57c91ded80b2486d95c28f5449c5417c88a99f2e121dd17841eea SHA512 fae5c8a10bb7ee781ed84ccf9c342bd583e112eb840d07aa72803affe3fa7dd394b3d6b73212e45005ec9155a409539902c4893ce20dc0a2a0e3f4a44b2c715b
+EBUILD lrucache-1.2.0.1.ebuild 610 BLAKE2B e22cf7559c1decb103836df9825714fb208981bb9a824aade38d89fa9461f630f00b57018ecd823d057b2647458cd1b6fe70e420e9e942b78b367ede8c1ba6bf SHA512 5511e51629550673002bc19218ecb62b3c2a2f1635959631197e3e2860f5bac20e3afa5812abc0b8fa3d9a904067385209c3a99467da8dbbd1584cfdd7d252de
+MISC metadata.xml 1464 BLAKE2B 820e94e46a846cf795c521dace49f7daebda65431203d626f654b76a8f86fdd8b7b1ba216fa87cd123ffbab3aafcf693509610b1469ebf2780ce930e1058432f SHA512 1d9053a57a2002837ce24447504284a96891304ed4e5dbd12a312573c576271e1974021d2147cfb1637039b307f0d6b202ef388efa7a9787d7cce88f070b0875
diff --git a/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild b/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
new file mode 100644
index 000000000000..48b8f20f6e50
--- /dev/null
+++ b/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="a simple, pure LRU cache"
+HOMEPAGE="https://github.com/chowells79/lrucache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/lrucache/metadata.xml b/dev-haskell/lrucache/metadata.xml
new file mode 100644
index 000000000000..832a2c27f608
--- /dev/null
+++ b/dev-haskell/lrucache/metadata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package contains a simple, pure LRU cache, implemented in
+		terms of "Data.Map".
+		
+		It also contains a mutable IO wrapper providing atomic updates to
+		an LRU cache.
+		
+		Version History:
+		
+		1.1.1 - Add an additional modification function for AtomicLRUCache.
+		
+		1.1.0.1 - Update containers constraint to allow containers from ghc-7
+		
+		1.1 - Add a Functor instance for LRUCache.
+		Add a generic modification function for AtomicLRUCache.
+		
+		1.0 - Breaking API changes:
+		1) The newLRU smart constructor now makes the maximum
+		size optional.
+		2) The delete function now returns the value removed, if
+		one was.
+		Additionally, a function was added to remove the least-recently
+		used element in the LRU.
+		
+		0.3 - Added a Show instance for LRU. (Requested by Ben Lee)
+		
+		0.2.0.1 - Increase strictness slightly.
+		Remove cabal target for test executable.
+		(Just include test sources instead.)
+		
+		0.2 - Added an Eq instance for LRU.
+		Added strictness to eliminate space leaks in common use patterns.
+		
+		0.1.1 - Add the Data.Cache.LRU.IO.Internal module.
+		Clean up build warnings on GHC 6.12.1.
+		
+		0.1.0.1 - Minor refactoring
+		
+		0.1 - First release
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
new file mode 100644
index 000000000000..524c55118feb
--- /dev/null
+++ b/dev-haskell/lukko/Manifest
@@ -0,0 +1,3 @@
+DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
+EBUILD lukko-0.1.1.2.ebuild 1083 BLAKE2B 7a927f8f9895493086005a9018e7a7182dd6a39aa03e5e4913e050de0ab5d50eec0cb6522709d096a5ec4af2582d9f10b6f2d4d34bc3abb29dcc37354d727854 SHA512 bcfd03d884776106537eb2f9a55d47c470221c1f865f093e458e5a65c6dc78c513c577334842050e007e3a82b31283ab65e78eed12d27d5c88940cf9f9d19f4e
+MISC metadata.xml 1775 BLAKE2B c2465f50a55356961ce4e30d005a76589fcfdf1ebb5f985e9415fe39b39767b9c02872cbc4a371441af240257b9d8d27e731b3e012b65beb60e45767c98035f9 SHA512 c8b0386734f1810ec1c2e693b5686e0ef0e5c9789794e393df47991341a5011ce079de92888763394a9867ea86fc2a205f13271ecf9af22207e4e7244a0c0d4b
diff --git a/dev-haskell/lukko/lukko-0.1.1.2.ebuild b/dev-haskell/lukko/lukko-0.1.1.2.ebuild
new file mode 100644
index 000000000000..dc9393ce2aea
--- /dev/null
+++ b/dev-haskell/lukko/lukko-0.1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="File locking"
+HOMEPAGE="http://hackage.haskell.org/package/lukko"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ofd-locking"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+		>=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
+		>=dev-haskell/tagged-0.8.5 <dev-haskell/tagged-0.9
+		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12
+		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag ofd-locking ofd-locking)
+}
diff --git a/dev-haskell/lukko/metadata.xml b/dev-haskell/lukko/metadata.xml
new file mode 100644
index 000000000000..a2f47beee925
--- /dev/null
+++ b/dev-haskell/lukko/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="ofd-locking">Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014).</flag>
+	</use>
+	<longdescription>
+		This package provides access to platform dependent file locking APIs:
+		
+		* Open file descriptor locking on Linux (&quot;Lukko.OFD&quot;)
+		* @flock@ locking on unix platforms (&quot;Lukko.FLock&quot;)
+		* Windows locking @LockFileEx@ (&quot;Lukko.Windows&quot;)
+		* No-op locking, which throws exceptions (&quot;Lukko.NoOp&quot;)
+		* &quot;Lukko&quot; module exports the best option for the target platform with uniform API.
+		
+		There are alternative file locking packages:
+		
+		* &quot;GHC.IO.Handle.Lock&quot; in @base &gt;= 4.10@ is good enough for most use cases.
+		However, uses only &#39;Handle&#39;s so these locks cannot be used for intra-process locking.
+		(You should use e.g. &#39;MVar&#39; in addition).
+		
+		* &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn&#39;t support OFD locking.
+		
+		/Lukko/ means lock in Finnish.
+		
+		Submodules &quot;Lukko.OFD&quot;, &quot;Lukko.Windows&quot; etc are available based on following conditions.
+		
+		@
+		if os(windows)
+		\  cpp-options: -DHAS_WINDOWS_LOCK
+		
+		elif (os(linux) &amp;&amp; flag(ofd-locking))
+		\  cpp-options: -DHAS_OFD_LOCKING
+		\  cpp-options: -DHAS_FLOCK
+		
+		elif !(os(solaris) || os(aix))
+		\  cpp-options: -DHAS_FLOCK
+		@
+		
+		&quot;Lukko.FLock&quot; is available on not (Windows or Solaris or AIX).
+		&quot;Lukko.NoOp&quot; is always available.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
index 989335e0e0ed..2412ee6d314d 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1,3 +1,5 @@
 DIST megaparsec-6.5.0.tar.gz 91498 BLAKE2B 339e68e211e871d77236770ab789523879a1a44286d5ff5567b75f32278826f79ee6a76a80309b07771703a415c252e92d8327e6a34b86f0670b1ac89c742d6c SHA512 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011
+DIST megaparsec-8.0.0.tar.gz 59692 BLAKE2B dabde94500b5f4e27437779fa2db288f71c7b493201e2150eed3d2ed6d2117bc9d9ba8100c1ffad7a6ac6160ea03d373fd3360e549d7f20284dae2257ba10e2c SHA512 ab550a99548da2739a70cc4bdb3313085b3179c58d19a84d30744d89fe2d7556b9b552d4ad7b177b18f9f5821daa5417c2b9267eadd9eb537132666c151513c3
 EBUILD megaparsec-6.5.0-r1.ebuild 1566 BLAKE2B 29c48485707089114665324e3e2bf5739f0ac9a5678d0327ecf1e1b0240706f4e79e730099681705848fed0733a7a3f403deac0ea5e3930eb62e6210860b6b18 SHA512 f9f5a7eea6f60cf2573b301416fb53c558c1eb993ca7ba52286886c95fc6cfbc6ef80c1e359ecc0da8524689522ec0cecb7de94caf7f7c4f65f3c87818fdb3f1
+EBUILD megaparsec-8.0.0.ebuild 1038 BLAKE2B 385782945cffc0b29b598c3e0525c9a13cb375b6c6fcb610dbdcf64c81e48c1587fc726ee15da0fd6da610657802e0f9d40775abd8c5af2a28d32f6891a93f4b SHA512 aaab2c29d53f0af14597b9b8cf8894e05b8358d8d10826c408ba65045a88e40116bbb6ef4d7a3075902de0d8d3709a5cbd5f8f0de190ac239a5c97f0bfdc8f0e
 MISC metadata.xml 429 BLAKE2B 787fadd68a570c19f0b5d5bcce0c0e445203f20e1e9db00e79051b8431520539cd8419c2c5ad06a2c7c181bf8c7d0428481dbc84f74b052dbfa466d4a0011a51 SHA512 a153068626ebe4c90f592241f3a3529ef159d298ef846b8bc5ea11200100aa167c1277415ae22efdc225a424e0395e8b79ce530d1eea83b558d85b37709dcf10
diff --git a/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild b/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
new file mode 100644
index 000000000000..aba2ec44c287
--- /dev/null
+++ b/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
+	>=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flags=-dev
+}
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
index 41c12837e285..4a6389708232 100644
--- a/dev-haskell/memotrie/Manifest
+++ b/dev-haskell/memotrie/Manifest
@@ -1,3 +1,5 @@
+DIST MemoTrie-0.6.10.tar.gz 8403 BLAKE2B 4d8d3bbefef13d56c16fdd4e3584a811e6cfdca6de27df7d8eee7bd684050275c0e7299073e7ad3edd231db0dec91f3e42725295f21a096796f2a8445d10822a SHA512 73be7e356ad2aeef49abf43975d2e24ee8b883e12453f316366b52998637ac26d98feef34388c2a46f683027dc7132444b17a25a12d3e86748088fadf081b186
 DIST MemoTrie-0.6.4.tar.gz 7695 BLAKE2B 4bd5ae0fa7b0ec6e95e221903e28367773d8cc310963d73cbba110f3d3285f2cf5a72a62d3a53f9b5cb46b86efab182089440bb142927eeccbbf4ed9b4765f29 SHA512 5700a36ae2a53e84bc31d80765afff3041972b4b64da359e16e7981009cc581d9c8aac019eb46d44d5dba7080dad494587ad1f4256f101387eb6de2959dd659f
+EBUILD memotrie-0.6.10.ebuild 767 BLAKE2B c05e118fc1d918c49856b88332dc61b7fdc732eb3f99261dcce678c697721cec61c95f66de9bf58248ed9db040cc53468aae86a8c93bfae35657b8d580a25be0 SHA512 6db53fb85253cc1a3d93016dc5114c7cd667af88855bdf21af6a15ad6de7cffe3838f57b5585391cefc6c0a8bc3d5eb70ee94b399a5e4c7bbb07e872860e5897
 EBUILD memotrie-0.6.4.ebuild 739 BLAKE2B e8f6791a6c734227ffbbaaed2f73bed03f872f73b0104bf168fa41dffed6a29ea4460b511fc786f5ca8cb28786318348918e685081a6226a53414f53f2acfdff SHA512 55ca065f20ffce2ca235b553f13a263bd7a2307e2834088ffa79d6c8a07e677024ea9741411915bed5c99e067cb6fb7b9b7e08ae8cedc0cd372b9b31c526ae38
 MISC metadata.xml 640 BLAKE2B dee8ca839f73f4be6933e30e23e4ae8a15fd428f652276fd3ffca8b9b715c3555b18ec8e05850a6b40babfa861afe889e1d3a21cac9a8d40269eb2e3a16cf46d SHA512 0691348e9a5c6a7370e272bbb12f0dfad0ba17fddb256df7b1cb9e5b38d059c2bab91562ed8c44a4f7aaf0a5dac4e9dd8adfcc2c91e3ec78dcad5d7d9c624b40
diff --git a/dev-haskell/memotrie/memotrie-0.6.10.ebuild b/dev-haskell/memotrie/memotrie-0.6.10.ebuild
new file mode 100644
index 000000000000..f8320abeea47
--- /dev/null
+++ b/dev-haskell/memotrie/memotrie-0.6.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="MemoTrie"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Trie-based memo functions"
+HOMEPAGE="https://github.com/conal/MemoTrie"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/newtype-generics-0.5.3:=[profile?]
+	dev-haskell/void:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples)
+}
diff --git a/dev-haskell/microlens-aeson/Manifest b/dev-haskell/microlens-aeson/Manifest
new file mode 100644
index 000000000000..a9f624cac780
--- /dev/null
+++ b/dev-haskell/microlens-aeson/Manifest
@@ -0,0 +1,3 @@
+DIST microlens-aeson-2.3.0.4.tar.gz 439564 BLAKE2B f8077c78ffb86f8f87afc165651e79c1f2b4737d954c5a720a1e9da0133245e5e8082969af177c4302469c339eeff9a659e334efbf8e5c8320d4683661b2c0b9 SHA512 34986eda7737947357999992f617bfd00079048f9fb75dd60f533e58a9671906d9bd0e4fcee1f4a3df309d98ddcb25144fb59f1a779675b119669c27739c3f6a
+EBUILD microlens-aeson-2.3.0.4.ebuild 889 BLAKE2B 885e4c75a52d8ac398a7cc05d621520e994cd78039013d8c813701ffbacf92a2ff6837255ee97f0b4f98d4f0a05ac6fd84336e88c92c16ca5a6af57804fa59ec SHA512 f41a2163d164af58098b8918579465fd1822e33c429898e9c79b81ee21b24371dc89e251d730c2ca7a2c0a6da8ee42d2ee74221e83af69232f27e3590a1c18a1
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/microlens-aeson/metadata.xml b/dev-haskell/microlens-aeson/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/microlens-aeson/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
new file mode 100644
index 000000000000..813122c70617
--- /dev/null
+++ b/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Law-abiding lenses for Aeson, using microlens"
+HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/microlens-0.3:=[profile?]
+	>=dev-haskell/scientific-0.3.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/tasty-0.10.1.2
+		>=dev-haskell/tasty-hunit-0.9.2 )
+"
diff --git a/dev-haskell/microlens-mtl/Manifest b/dev-haskell/microlens-mtl/Manifest
new file mode 100644
index 000000000000..adc058d4b17f
--- /dev/null
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -0,0 +1,3 @@
+DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
+EBUILD microlens-mtl-0.2.0.1.ebuild 799 BLAKE2B 3f1c966b0fbccce16da18f77e3fb9182ca9e23923619a7a5d9feb9518542d6cc92d6f9392d3913bdd89f3fcb50003b58d2aa29c4601ac3afeaf866b75745d072 SHA512 d8a3d8c616610418c52e8d44390f84510e4c166b4b7731bad8b87879adaef920fb8d605b7862dad8bd46bb382618bcd97cfe33f33c63eee303d182f99cde37ec
+MISC metadata.xml 649 BLAKE2B 3ff775441db74484cde52d1112461041573ca1cf3f6becf2f63a41f26a904ec8dd84c86642cfae6c38d8924f659ac5b57038136408248ac8f28c591f3ffba606 SHA512 5cedb24535136c1c14dce2cf2fb9f0af06a616bb91023913dc30790ffa8c782ccdbea3fa1f25c41c2ac336794e239afef8474862352ef7834fb4b74aa5c029cf
diff --git a/dev-haskell/microlens-mtl/metadata.xml b/dev-haskell/microlens-mtl/metadata.xml
new file mode 100644
index 000000000000..31f5b531504c
--- /dev/null
+++ b/dev-haskell/microlens-mtl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package contains functions (like &#39;view&#39; or &#39;+=&#39;) which work on &#39;MonadReader&#39;, &#39;MonadWriter&#39;, and &#39;MonadState&#39; from the mtl package.
+		
+		This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
new file mode 100644
index 000000000000..5e3dbeb42b78
--- /dev/null
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="microlens support for Reader/Writer/State from mtl"
+HOMEPAGE="https://github.com/monadfix/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/microlens-th/Manifest b/dev-haskell/microlens-th/Manifest
new file mode 100644
index 000000000000..36391b41d025
--- /dev/null
+++ b/dev-haskell/microlens-th/Manifest
@@ -0,0 +1,3 @@
+DIST microlens-th-0.4.3.4.tar.gz 21662 BLAKE2B 0c228791dae5b4ab10bd47d574b2dfc1a9bd046ee7941ba15be02d5c60f78f495c719ab64cd74434734c7a7ee1ca67eb083621319325bb3fbd518a1a36c1aa90 SHA512 456d0cfe6f93a4adb8c5d0004983bcc7906f8750787eecd2ccbb9063d3e63da824c1bec29f81b37485aeebc356baa478bc26cc439e45ec03642f2d61217cbb7f
+EBUILD microlens-th-0.4.3.4.ebuild 843 BLAKE2B 2b9c8208d0138bf4b0fd2885f1736f4c65521df5b15208cf06cfaec4fa1be2dd8106859d0254b4905005d14a4f184e6972ea8c64fb66be5717e49cf7cf5be273 SHA512 24701e8acb1f5174d0c23c2f7572a4522f822b2bd3e79c09fe81beb62c2fef5d57680304c74f581e5ad3f7ba4c3c327110cf46c6451f8dea7e25f7c7e25f0364
+MISC metadata.xml 710 BLAKE2B d9c0dfc48f0eb26370d528853825fc8bc71d46629bcc38796e82d174e557ec2add313cd9374f1690e45e666f342bc3723081f0343fdd261f67aeaab1844526db SHA512 4f43f603ba71818c14f20f4c809112770fe8c6a49c38a557b8d15ccaec35035bec6e2b564bfe82b4478ad03df432c65117e4740d6b07f0a0b9e8ffa38bc5288f
diff --git a/dev-haskell/microlens-th/metadata.xml b/dev-haskell/microlens-th/metadata.xml
new file mode 100644
index 000000000000..66694ad55ecf
--- /dev/null
+++ b/dev-haskell/microlens-th/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package lets you automatically generate lenses for data types; code was extracted from the lens package, and therefore generated lenses are fully compatible with ones generated by lens (and can be used both from lens and microlens).
+		
+		This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
new file mode 100644
index 000000000000..8469da80b613
--- /dev/null
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic generation of record lenses for microlens"
+HOMEPAGE="https://github.com/monadfix/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'template-haskell >=2.7 && <2.16' 'template-haskell >=2.7'
+}
diff --git a/dev-haskell/mintty/Manifest b/dev-haskell/mintty/Manifest
new file mode 100644
index 000000000000..580d3038ff9d
--- /dev/null
+++ b/dev-haskell/mintty/Manifest
@@ -0,0 +1,3 @@
+DIST mintty-0.1.2.tar.gz 6945 BLAKE2B 6fe05a5d130c807b8dca29e5c207bff3ce73778ed4ca9e27f2a54c1b28410a7043b8d7f8ad4de7b8c93e555f8577e9644a1d7e86cae0fdba94098d34e3fadfce SHA512 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667
+EBUILD mintty-0.1.2.ebuild 565 BLAKE2B dd0232f3e6e790cd12abc149ae5760ea663b3c7b82606c0f3ca707ace8e695b4971d833c4757db36b3e86cba8989eef7d5975db5ffd3fff9f9715cdfbbec66e0 SHA512 e7697ab17fd820d4678384b59379060791789cbdde25b2d4a37d5cbf53985eaa581a89b688d840030f2b46fe1123c241faa303219c3a121b590a118607a4da14
+MISC metadata.xml 1158 BLAKE2B 7547b955e934b3f64b536ebcb321672ef672fa98da801cb193b105b4aac19734c3a0707c9664752f65722c0ad85500c5b386b1cf524a43d0d153143acd76a6be SHA512 9a126005a6264cbc1cef928f087e73b8a67ddb1a45353aa93ec091fafc9d2f402765a90390720fa9993c4f6bf56e63b32bb1270b6316f39ad2ffededb211c4d9
diff --git a/dev-haskell/mintty/metadata.xml b/dev-haskell/mintty/metadata.xml
new file mode 100644
index 000000000000..dccdf4080195
--- /dev/null
+++ b/dev-haskell/mintty/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>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		MinTTY is a Windows-specific terminal emulator for the
+		widely used Cygwin and MSYS projects, which provide
+		Unix-like environments for Windows. MinTTY consoles behave
+		differently from native Windows consoles (such as
+		@cmd.exe@ or PowerShell) in many ways, and in some cases,
+		these differences make it necessary to treat MinTTY
+		consoles differently in code.
+		
+		The @mintty@ library provides a simple way to detect if
+		your code in running in a MinTTY console on Windows. It
+		exports @isMinTTY@, which does the right thing 90% of the
+		time (by checking if standard error is attached to
+		MinTTY), and it also exports @isMinTTYHandle@ for the
+		other 10% of the time (when you want to check is some
+		arbitrary handle is attached to MinTTY). As you might
+		expect, both of these functions will simply return @False@
+		on any non-Windows operating system.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mintty/mintty-0.1.2.ebuild b/dev-haskell/mintty/mintty-0.1.2.ebuild
new file mode 100644
index 000000000000..827af5189248
--- /dev/null
+++ b/dev-haskell/mintty/mintty-0.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A reliable way to detect the presence of a MinTTY console on Windows"
+HOMEPAGE="https://github.com/RyanGlScott/mintty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index e05992fd9f4a..4c0acb2aa63a 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -3,7 +3,9 @@ AUX missingh-1.3.0.1-ghc-8.0.patch 1293 BLAKE2B a7399a61fc8f2ddde96fd323b9193ec1
 DIST MissingH-1.2.0.2.tar.gz 115774 BLAKE2B ae1e4db5de9c9559f9687bfed16e52dba3fe782e6ce33e72bb60fe1cd5044cc70b0f839064144711c0f5863786c75ec34b17acd1449a8ca7387a5596185594e2 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
 DIST MissingH-1.2.1.0.tar.gz 116445 BLAKE2B 66d319c3bdb883eb5a8349c6bf98cd119b143fb4180c3f3376f136d2fd398666ef92a47164516a33a7f7fe3a5da5ba41ffe1998b715168c27f0466dd042e09e6 SHA512 54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
 DIST MissingH-1.3.0.1.tar.gz 116812 BLAKE2B f2b17ed9df625558bf05719e490547f4fd605a494922d1b8daf0602fe913346a1e028940e63645de2c786339555b4480bce237f6ae613a2741d0d81acb75ec7c SHA512 e7c6f95d5437d86516f9aba79026b2abdd5131917a09da452623be68b2377067f8f093412c9919ebc904c4e61d43e755282d5bb333596de935c705958111dcf3
+DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
 EBUILD missingh-1.2.0.2.ebuild 1324 BLAKE2B 8efe25c9dd6f02464705a6e8484ab6d53a59325f5b4cca84e11b15bc7dfaad9b2c49e743d6f9cad8cc796ce35e2f6178130546055010323e52d79a8a8491beb0 SHA512 675d5bc886785443f7cce0125459578d7d67f361714312da890eefe558d32e07b336cd8d7df571e3cd28429691a179fb63530a6a685efdf9e1a5fc9c8339eced
 EBUILD missingh-1.2.1.0.ebuild 943 BLAKE2B 38ebd7f6501ca555d50cbb16c202fc11b939e9537dafe5e5e08f4022fb6e8feea465669e3a58c65b977d5c2d2af22262814b52803150d237f80eefb3236a74c8 SHA512 a49d4f7bdd1c03f6808b52073b124c25e501cb77743add82d684fd4c9ebdfefffd567a8e3fcfff312b3a054cafa10995936b497e472190014f7840a71ae409ef
 EBUILD missingh-1.3.0.1.ebuild 1045 BLAKE2B bb3a23c8ecc76f3d40495d0eee52c3d028fddcf35fd5b669bc633f5e6293af90f325ffb9c6933e5f7544bc9657f057fb0e9f3e8cb433fe96e20dc78d3caaec3c SHA512 672dadde94b5008b5e698dbe00948f0d75fca799ff79b09ece312e4f20c4d85a95ecf0e4d012536b770bc4acd8b0aee02a74fa1d1f4ae01c5e7c965ecabe1fb7
-MISC metadata.xml 309 BLAKE2B 38a21e309ee9c95cb23ae88096df03c3d4abae37fe26b0ba4539ed254003ac1b1388d7b900ba38f8685133016edb3ea6b41c01b162d6310cc5d386e4e6d76dac SHA512 02afac1cf4005fbf51a79f989e031521fbb4860a96a70dab38f8821e8c7e18f15d54a6f856a93f628cea60f8493b06e3094bebac67a977477e66df0b89b8c8bc
+EBUILD missingh-1.4.3.0.ebuild 1801 BLAKE2B 8edeca3928f7b6ce1cfa4de052b88d141e658cc00205b24fba642bd410694263c19b46232c32cb04e78c30fabd303d5f2490cc505e4488256bcc9a9217c2ef63 SHA512 073b71a2ce79906716cb9b40b94ae3b3666c30938e63ee2771cd883078aa2c483aa1e34ed02e6eb31c9795732764dc2043fabf9b9b122c916ccb739c8d69c8f6
+MISC metadata.xml 374 BLAKE2B d6a62a349daae36cd69a91d56db0d25327fdbf018566b5dd5221a0c596a9658bb7b3935345b8aa6cc751c3304f3515c676376b6af8232ea8c55953b14449af4d SHA512 a92763db9fc45ad5465ff832c70f98430f2c702ea2fa4227ba1a4e9a68ce19c2502feb59da6cf379068973334716787b007c58db769e97e86fb50546256f58c0
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index d3ff43ef4921..c06a693b89c3 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -4,6 +4,9 @@
   <maintainer type="project">
     <email>haskell@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="network-3">Use network-3</flag>
+  </use>
   <upstream>
     <remote-id type="github">jgoerzen/missingh</remote-id>
   </upstream>
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
new file mode 100644
index 000000000000..2d4e6aecde27
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: network--ge-3-0-0:network-3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="MissingH"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="http://hackage.haskell.org/package/MissingH"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+network-3"
+
+RESTRICT=test # tests are present for removed modules
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+	>=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
+	!network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
+		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-3 network--ge-3_0_0)
+}
diff --git a/dev-haskell/mmorph/Manifest b/dev-haskell/mmorph/Manifest
index 349b0ac63330..c2079e1744af 100644
--- a/dev-haskell/mmorph/Manifest
+++ b/dev-haskell/mmorph/Manifest
@@ -2,8 +2,10 @@ DIST mmorph-1.0.0.tar.gz 4989 BLAKE2B 75b47cb76d19588bc15d5da9e588edc056ae68b346
 DIST mmorph-1.0.5.tar.gz 6100 BLAKE2B ba8a10e10969fc799c3d4dae49eb2478c9c6b41a1f36e0c6ef265b6dc3aee9a101f323b0ed57666ab3626bcfecdace54948dab4b8a60bf054212b66497fbbde0 SHA512 e39d84cdddb7063a3f8528d0053815305079cc199b9cbab76d860f18a9cc40df8738fde603ea7e83fbf01d3227ec27c5898a67bbdf8fc4bf343f1f5c228a5de0
 DIST mmorph-1.0.6.tar.gz 6504 BLAKE2B 2dd92d3010fa39313d4b1ce8009c62fa23cd5470d8dfe877d52df8a3f2b4c551ec97f10d6a68e9b6cad1620cf7a608164c503dc051a496f314cc04348e8cd915 SHA512 d8d4ca5e017f1a94dc8f4ac02f18de8de201264311d5b7debd9ba405b63e25a63fa83385cc287eb07a31b3e00ec02ce75c2d83f6d354f025e87d24eee911da81
 DIST mmorph-1.0.9.tar.gz 6497 BLAKE2B f30af26a16c4a573cef8bd95301b481cf83f12f87c956cbf387541140c3b1b3eb7cb9a876ac040d6e6cb6e3363747e8d3845b780b9dcd1c990e8dee85377bca0 SHA512 7cabf68a886ddc8d4b4d7b5af528bd1c1d7ff957845eeb7a216dd2e79117d2828740199424ff38525ff825b77fdb5363ddc4a3907c6bc3677674e8d0f8b516bb
+DIST mmorph-1.1.3.tar.gz 6975 BLAKE2B 93316f34fe13ffbf50934394bf7b4831f787e1c79eda625f1ebb5fad92ec143e5744ad0725eec80184c737c8978bf153dad63cdddf153cb69a306ef62dd040cb SHA512 3ef260682b5de48d765f9524abcd6853b5c4bfe94e2ca116ee4077aa0d7e5853f87e8ce1742f59b8753d2c0c3605251188346be7b394fa51d6ff2c5983edc3ec
 EBUILD mmorph-1.0.0.ebuild 618 BLAKE2B 93e21bba2749ce94278471d4a2779fd33b4798722f1024f3ee8bac4079d930c9f5c94cc1674ebbb8b484e7f0e0f9d1510571b27d5cd1726475cedc2eb83b9ad2 SHA512 a612b00c3627c8419011c5f9644f119600b87c8d6ae3b461c4e6d78a98c02196f3a6f1aed4acf6b681090056c0e656a5d6cf5b341a7a4f54baf3da36aa42db1e
 EBUILD mmorph-1.0.5.ebuild 615 BLAKE2B 5f3702dcc5202e0088995a30fa5130403f2f9c45e463111dce93a1fafa7136508ef6879747d938ea75c7f45e35fe8de9973994bd0c4ba656e590a644ed6d349f SHA512 758e504ce0113dc26597448412e9d3d583ef635f8d2cefffbf6bb33bf77edd8cd8c7663c841d2eb227d4ac12cf2c83d58040f4cdbb99f05ce8ec563cd7eb2d9f
 EBUILD mmorph-1.0.6.ebuild 785 BLAKE2B b5a840c15d57cd168f5f54f74255d7d7741fe249a2ee26e922aebacc2ab03fb0a8401a44004b67a8aa4f60c57b6a41e3f19ce27a9090e3de39e401cdf0730969 SHA512 44e301b2c05f2892a22e24863c99df3fb3b76a2d07c925f8e16506c764aafaee88132f8b885bae1aad0419df52b5040f1d624e56ba461cafeee0049819905cae
 EBUILD mmorph-1.0.9.ebuild 720 BLAKE2B 5006cab1a73e9d0b624dab7aafc9d1f33ebb8248c979d5decdb89a3619d948f129238cca16e246bb35155e470e7c4d7d59f8a0ec2d897f7bdf1d610a815eefda SHA512 1bc1dead1cb83fca213f4a69c3d0632bc9ac9e02ffd41ad4156ade2f40bcfe29b80ec9a3baeb7f68d944ec1c88e54d06d3d6843080ee6af7427b5777bb463264
+EBUILD mmorph-1.1.3.ebuild 691 BLAKE2B 4d36709a21c5780437587dd2091433862b4c4f71bd79e8a69438716797c777d3116a83fe9954475d204c8183281d5cbcfecc68f3e805d6f8b13ab5fd76aeb2de SHA512 445ae25462b6444cee40c40ab79490a5bbf2b0785982f39eceeb123ba4f1a7a3cc3107b261c5027b06fbb12c3627cc577515b64ac3ee4903d4f5dbbc9ebeaa2a
 MISC metadata.xml 402 BLAKE2B f07de9bee342c7809272f9d3014293d11f02c8281c45ff7225114d243e2c082ea6885584ffc073c87e810ce9587c814aef28ea04cac4a4d9f48e6a2fd7d86e84 SHA512 e5025034e24baca4f12cc5b97bcf6b355b5e63a88796c0b0520c8f51b2a1cd5fb0f8f3363e04ecab17fd52989a66f2d7a5691b4c9aa54c32d0af2aa83c5ffc76
diff --git a/dev-haskell/mmorph/mmorph-1.1.3.ebuild b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
new file mode 100644
index 000000000000..de9f02525959
--- /dev/null
+++ b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad morphisms"
+HOMEPAGE="http://hackage.haskell.org/package/mmorph"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
index 4e3227a4141d..7e71924b7506 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -1,7 +1,9 @@
 DIST monad-logger-0.3.17.tar.gz 7871 BLAKE2B aaed5e4267d1b851bd632fae3627e2e43fdda8306c9dfc062c2cbd684b4964714c1128a378b53be2e04252c0344eed52d571f6bd297deff2be5d4b334b14ab69 SHA512 7905a9cec560e3fbe617e28d9a006d744ae6662a23c4f19807a11c0ca409cf4cf994175d528f000af53804b14ed1beceb8e4c7c4dd9b1a480d506e9455a6e6e0
 DIST monad-logger-0.3.18.tar.gz 8094 BLAKE2B 5c5025e936012773b2c6721af2ec8c81c16f23ece9a817f93425e31ed50d064db36a2917cdb49aefbc30bd14a4571da9e29d0ecbd04b6109d4c0d148ec84675e SHA512 30b309b441a3be81e209e7aabc9cf712d7a436e89833c84d74ae9b1011bb55bab77e728882670ef6877c32657b30b65c09997867ad0318fc4dced8751db90e9c
 DIST monad-logger-0.3.20.1.tar.gz 9034 BLAKE2B fda6ecb84b8df5f969c2c36daae32b36db36bf0365d28d3942de71da77f6ceb76fe9342f9e430c35d74f40cbccd713bc8e04c8e0bf4ce36289192998421ddb60 SHA512 f8d70d2620e5f24e283c484215ae1ef3ef7db854ba65b0e16938ab4589d0600543b1f06934e98ba374982433bb831613882280645cea5076f9a9da7bf6426faa
+DIST monad-logger-0.3.32.tar.gz 10984 BLAKE2B d03a94f9b207e5a64a150140d9b4dcdd56e6ca28db1f371c08ffb9d35168602b8cbe478b19b47fdb38e69f0d08431f3a2a98b7ea916448079d27674bb70cf454 SHA512 d65fad10fc4bcc5a597c7a9b03b9e275c40ef7c930d1b7f703115c2f18b8bd3c5a42b4c3cc445889e0878e62709c62fdf5f0b2b60d1a15430064f11853b01ef3
 EBUILD monad-logger-0.3.17.ebuild 1433 BLAKE2B ff6de4d8156040f3d9f23c59e2d7f0f164d7c43e8f590424d2e0186ce1985f20e99de567f80f911ff950661b4389992e25a0c450ac2d140f8b0410c576eb6591 SHA512 c11cc641c00a0d0d8a4b21bad8d23340a6a5124cd7b2e3a745960c30bfc8fc6933d8de20c1f00d8db79869d8281cb107a0068cffe824238144a19284817ac388
 EBUILD monad-logger-0.3.18.ebuild 1433 BLAKE2B ff6de4d8156040f3d9f23c59e2d7f0f164d7c43e8f590424d2e0186ce1985f20e99de567f80f911ff950661b4389992e25a0c450ac2d140f8b0410c576eb6591 SHA512 c11cc641c00a0d0d8a4b21bad8d23340a6a5124cd7b2e3a745960c30bfc8fc6933d8de20c1f00d8db79869d8281cb107a0068cffe824238144a19284817ac388
 EBUILD monad-logger-0.3.20.1.ebuild 1398 BLAKE2B c1038d7c542aff7ec6d27f026e7b3138a6f54cdcb4531870266df16db46afcb10aa92639301c8d4b8452d249738a82b4576c4faefc8eb8158e69119339170132 SHA512 7e2ad3872156d1376fdcf9236af33782919255af95660b1cec902915253712444cf84800acfa91819cb984b06d933cd72d6228d4c141bfaf112112c493b4661a
+EBUILD monad-logger-0.3.32.ebuild 1457 BLAKE2B 965bac3b16376b407cd5e5bba4e7265c4c036eda880c802af50ebf0c1c9e7b35d28358af21a43da5f5048871cd97a2d3706c812104c1c630f189a3eb9c7784e7 SHA512 d2f73d2cc4492bf921d2b91dd40396711e069f19ad4f1abb7804a58f4142ee9c0feb0c568c1f2174d1952f985d5ee84efc9296dd41f044545848f2cd41c78457
 MISC metadata.xml 548 BLAKE2B aed87b6886e7409aa09314b75627af6adcf3dd0afeadb31f8dc365c9496e155622b0f24cfb52e36613bef63beb1ed7f29b3a891f61dc750f10231414af3cd992 SHA512 fc17bc8a267ba2aeaef6673e3713b370ed36954b793002cdb6c442ec1ae3db66d06affb5bdcd5793b17f078307f64e8d924b9c4a7516e3c2c244515429c1da9b
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
new file mode 100644
index 000000000000..1259e939884f
--- /dev/null
+++ b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class of monads which can log messages"
+HOMEPAGE="https://github.com/snoyberg/monad-logger#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?]
+	dev-haskell/monad-loops:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/stm-chans:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag template-haskell template_haskell)
+}
diff --git a/dev-haskell/monadlib/Manifest b/dev-haskell/monadlib/Manifest
new file mode 100644
index 000000000000..7cf85feae0fe
--- /dev/null
+++ b/dev-haskell/monadlib/Manifest
@@ -0,0 +1,3 @@
+DIST monadLib-3.10.tar.gz 11475 BLAKE2B d77ba15ab1e4a535a265d4d8f4cd9b6f6cf57e030cd241d5d92e96ab943f895b1102174b65e229f2f39b80732d0a203615c65ff44cd9b24f970ae6dd62f20dfc SHA512 db579c362e1a5d7737c3cadd8cc3cfaea620fc9ee3057a00f1400c84b3d25b52d91a192553898c4ee51f0d8a6ad4a66a4e97bc10bf132b1955abb89cfc4b053d
+EBUILD monadlib-3.10.ebuild 609 BLAKE2B 8c9ac2c3ac2aad4c8c410ec997f3528f0206dd92e3b3d4da8a9064fc9461a381e888ba9f1491947e3872d09d5e107a6addcad45087757f6b6bf4ff74710d4932 SHA512 f455010b1d7eb999e40410db3a81f841601720de79fe30f5ba5413e56a71f981dc44b91b03cd8df67a454ba8eb3c8d72f61fd3500761e86076b4901b3853e12d
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/monadlib/metadata.xml b/dev-haskell/monadlib/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/monadlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/monadlib/monadlib-3.10.ebuild b/dev-haskell/monadlib/monadlib-3.10.ebuild
new file mode 100644
index 000000000000..af1edb68c810
--- /dev/null
+++ b/dev-haskell/monadlib/monadlib-3.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="monadLib"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A collection of monad transformers"
+HOMEPAGE="https://wiki.github.com/yav/monadlib"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
index 0e63608270ae..5ed2573cd4ee 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -6,6 +6,7 @@ DIST mono-traversable-0.6.3.tar.gz 23577 BLAKE2B 2c7b239beb3c142347f22b49897b57d
 DIST mono-traversable-0.7.0.tar.gz 27752 BLAKE2B 9201a12a06fda335ed637c46cb982b14196ca58818cdd3b04ff8be5899bf369728910382038a0ed2a8c7daa9bc4989039bae776cad8f1483daaf59144db6bb51 SHA512 ef2bda089208c85048d400541c4b5d0c336e06ff8aeeecb0bce7f804888e35560621ba685c53a2037bc11a9703f488e289b0ed86e47a4165e91c47b57d62b6c2
 DIST mono-traversable-0.9.2.1.tar.gz 36866 BLAKE2B 941cc511660f341f0301fbad513c97f43fa6d4d954a398bc78c3b3601b563424d8a9ad2f746a19542432226738bb0b9baf812b0911dadb71b40dd4c6f9d8e605 SHA512 595f4d48034a9a002951359fced926492939cb16e34db8cdaf302e07da72420ed54619613fdec8d7186be008d2f75c7726f76cc6326ec734aedd72f8a0256db2
 DIST mono-traversable-1.0.1.1.tar.gz 37982 BLAKE2B cbee32442ce30bfde8230b2914905d1ae34c81ed36190c57609e582fa6a952436061f4d7bd87501d004c069e2ca57ca2a483cf6f655bfc92d6af609dc56bf33c SHA512 2be39644bc67841ece7675098b3507a5cac1a0eb6e97d776d3e0ffffc09821fa2c4db1d0046e69ae611301144308f27d29e45ff449ac2290ee74fde07db0638d
+DIST mono-traversable-1.0.15.1.tar.gz 40815 BLAKE2B 432b90de9620b1aadd95e4591f678510b3e878a5af98d12856448e0add928e61bbca3fcb9f4796af0befb0bb70dc7cc8650263abb719e133ca227fcf85b6f0d7 SHA512 adf1af35b93af0605667d8b033415f318c6dab225499fdd1d9eab349fb1eedca2623c98f9dce83f94ed27db75b6f0aa88027daa748c7b3db05f47f68b505b0c8
 EBUILD mono-traversable-0.1.0.0.ebuild 959 BLAKE2B 7e88728f5a42ff5eb1941a02ea90bd9cec65c74453355118de3ac2d9a5d13b9440b39924924cbc7e058a8ce78df81fbd7e28749e986811af3131c4e27c70f0b8 SHA512 414619abc1e977020679114cf96765e85c8811db9eec7c268548bb701846fa2d8c45c4ff49cbc0c3e6f9cedc4615b89e438a44c21ae7b61a49e81bf095abb5e6
 EBUILD mono-traversable-0.10.0.1.ebuild 1313 BLAKE2B 05412048cb2c9c96f310d3eb70042dbc053345de0e257ad81b2e93f96a9cf2dc2d7953bc5929d98644b381029eab7a15bfc580da8c09deaa5bdbace9a865acfd SHA512 8bb03ad58c3b74191fd3bdb88aead802f44ffbcd2346dc10e65d9b45615801a8d74053e5db84d35fa429027941118b83168d3aace4667be558e888de0b471747
 EBUILD mono-traversable-0.10.2.ebuild 1313 BLAKE2B 22e0895b4d562064ae9b834210ece7b4965a533b8d8b7b9158996912295da1dd16f92c70e0b80943d00f3ac83c3b9be450c3247da8c547862327845ef907eec9 SHA512 287033f5f785b88b21b29de6b60c7948c90944836ddd87f240b50a0925444e0a794a400f42c325beb6b306f7d8a7530af4cc03a40475d604cb78d81fc568349a
@@ -14,4 +15,5 @@ EBUILD mono-traversable-0.6.3.ebuild 1256 BLAKE2B f4370018de42432d37f72e40852095
 EBUILD mono-traversable-0.7.0.ebuild 1256 BLAKE2B f4370018de42432d37f72e408520953ff4eecbcaa00d9376491651e5e5b1d0c702f1f2a2a98febb4d6bbc271bdc8c580f1f9562564b839ccdf5b9ca87f89d01b SHA512 3b7f8581f72d434027b4a71653a4d7c42e8d94d335787d42c071fe3a23dab7c60ad0e698af3d44798ab5043a4e99dc8a261a95b19373d7ca4ad070b1535e2db1
 EBUILD mono-traversable-0.9.2.1.ebuild 1276 BLAKE2B 553eee72dc8dafffa24e2611d740be7a8a18ed4c646baff2cdacd82c5fb14308fa71dab2454c6f4c94e448cb15980687b7bb72e4bd2493cd9e7750657f8bcc5b SHA512 d1743948727158cedbe436307d5c3ae60fd92edbe357e24c8e0f83fcb24678681b7619f8ae8c9f46c77622142b6bfdbf22870ee6fedef29caaf6e8f065625e94
 EBUILD mono-traversable-1.0.1.1.ebuild 981 BLAKE2B 3c0fa2b2aa7df83993e89726d2d69b8e775f047e5def45214646b22f4e46a5a22261ed29a2bcfe1bbcb543c937ec1f5dea03bdef4a6dcfad24f70c3714f4cd5b SHA512 4cc979ab5efbf16d6ec42adb5404296358f8fc5d2c42e1c70b6d8e0dc892bf8bd03b33713488f8a2342295b94b0c71e6b6c5e5b983acc93062bcfae1f794cea0
+EBUILD mono-traversable-1.0.15.1.ebuild 969 BLAKE2B c4666a903ac6b9053d2cc5b94aa19d85c016769859be2f25e1db077a719528573f08c12f8d929b32ff0887140ba95ba6874070dac7aa2bf72f48fe397bda5aa6 SHA512 96018176056c5aa117e267249c8dad72bee44ffb6d0aec48d8ef3dc0ed5800bd146fade60004c26bc8ef05ec21b64d342413e39a493f0175ca536584604d960f
 MISC metadata.xml 535 BLAKE2B cbe1667be6853bfbd8cb382455247e28f1fb887e92ac6fa21fc926c5f504a57fc70568a096f2aa43142e77a711b36f5003f21e956cdc8b63ff860b429d23e4bd SHA512 051c88194092ed402f6e824fc05dba55fa73dc7790d8594b6cfd1ca7e779d1e529e0ad44f9f56a9aba6f0048edc75614edf72e0f4b6bf1f8b8c81ac0475065f8
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
new file mode 100644
index 000000000000..6f25112213a2
--- /dev/null
+++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
+HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/vector-algorithms-0.6:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/foldl
+		dev-haskell/hspec
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/semigroups )
+"
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 63e11802681d..0a0232102978 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,6 +1,8 @@
 DIST mtl-2.1.3.1.tar.gz 13955 BLAKE2B ded18304c2c5158cfaf02e77c01829895079d9a344692d8a4294ccafce66f867b709fb64b9b82fba728d659afb17ee54560fdb3b3894398677408eda7cf878dd SHA512 dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
 DIST mtl-2.2.1.tar.gz 15391 BLAKE2B a3ef2496a7b876cb1747a00aec092c21751c2774983f8db0fd78a8c4da220296c96dec3327c78c3e9eec9f43af25d7462518e3a03a69e80c1186777bcca43f08 SHA512 5c31626b15551ee1757ad701b8e5552202bb6fe1dbd002039e3b78c6d01108a5c50f565c4993d165a00eb564d9d72fb8d2aae891b6242f0ca8cb11f7b95c5c6b
+DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c
 EBUILD mtl-2.1.3.1.ebuild 699 BLAKE2B 85722f7625cd0ba0ada1d984e7e2982d3e2a49826ae2686b6a3c2053a845f881e942bcc234417df0d1ad7f012d1a57206d3d0115ab63072ac98bb5f9f8fe8a78 SHA512 35e0f142e1dae36269471d94187c228d5ae708ed6ed897be5954e165acd9977adb6f6892932d75e3881d850bea6e413702447791eb2cb8474973665ba65a64e2
 EBUILD mtl-2.2.1-r1.ebuild 735 BLAKE2B 61f3ce75c6957086f4254a7a5bda5a66791646aacbf0350ba9d58297b68ce2f2719accbdef3acf40ad24601ebdce67c049cb13d89f254d9a47be855d5f38d190 SHA512 0c45c8d42c6b3d041a7188a654eff52049aae1868ec362c70e1ba8396b108674a1022e25f7770b78c2a4883dd4f4ef4939217043bf6e74741512cbbc778c9dc4
 EBUILD mtl-2.2.1.ebuild 694 BLAKE2B a6becda4d7c3aff8cc9441df9dc66ed5b989bb3d4d6a26ff83bc31cf9be68075b36abdf2a11b412bc8c0af40c5428577b6c2bf45e8beeb0a2183b848db7e3a39 SHA512 d775f55ac63208f2ac5018909c2e9821a2082e3dfc2d67e53b36b7365dad916a63375726b27b21cd7b8bff47483171c5c37210b57a2a08d2a5ff2ecbc3271e29
+EBUILD mtl-2.2.2.ebuild 905 BLAKE2B 1481705f17b82f69a90b23ab3dca5bf20efc8bd9c7600724dd60b299fa0640c4a21f044588c7580a1036dd4f7e1c0e0e78f4ad7b64a92e2df7dca3c1da7aa290 SHA512 5954a5b2c2e5c4ba78fe582e6e6e663d920c0e76f9b414b2d50eadfafa497b9925fdb7de37f6eb8f72f2bd916cd117df235d18f48311d44751b611e0915f6615
 MISC metadata.xml 693 BLAKE2B da27e97919715cacee75756746262ee8706cd83f26967cf33bba060e85034cbc546a0c52093ba34dc9db7faa81db2fe0162adf4882cfb6fd7d86137915721ff9 SHA512 3f98568414ef1de6679c4d8a1f381bba6eff560b889830d711578252feb9dae978a60fdfd7e84f5ba71d09a2710a21cd464e1735b5bd139462d12694df8be781
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
new file mode 100644
index 000000000000..40f440d52c90
--- /dev/null
+++ b/dev-haskell/mtl/mtl-2.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using functional dependencies"
+HOMEPAGE="https://github.com/haskell/mtl"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/mustache/Manifest b/dev-haskell/mustache/Manifest
new file mode 100644
index 000000000000..3e89002a4ee1
--- /dev/null
+++ b/dev-haskell/mustache/Manifest
@@ -0,0 +1,3 @@
+DIST mustache-2.3.1.tar.gz 20207 BLAKE2B 87691b14e85ac5934c08d1b3f8261d6e7bb3786b808d0f1a04630b96b4f2ed4aeae4d049ccf0e408b47586e990db2bbc09e3eac56af67922538e73250ef486d5 SHA512 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3
+EBUILD mustache-2.3.1.ebuild 1123 BLAKE2B b99008b9059701ea7994d54612bafc83ad6ec0d9b45da5bfc0a2a8508f54ada4a2aff60ae2e6577d84cbd763a3df6d151a097013a2f8fa182703a2de0d92abe6 SHA512 d6c822d2a7b0180b92ad89d1c8a78bf4427027658ea6e1e3296b4eb7379c77a1696b99b681396e06c1f8e9e0d650592beffa200d6a678a7527f9b471b60025cb
+MISC metadata.xml 576 BLAKE2B eaab68066642d76246155fa2218ab83f19e285a08563343c420647ab679a3cc721abf98328c927ca412bb4d7f478759a9ebd4475339ba6016119e78627f3a788 SHA512 feabd7703243f794c0e31ada7d39911677ddcfafbb0d1a6f1d832d9cfff4027863019fcaa5f5322dbef37043b968620ff4957fdfae1e42ec706661291b78d57b
diff --git a/dev-haskell/mustache/metadata.xml b/dev-haskell/mustache/metadata.xml
new file mode 100644
index 000000000000..546170479152
--- /dev/null
+++ b/dev-haskell/mustache/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Allows parsing and rendering template files with mustache markup. See the
+		mustache &lt;http://mustache.github.io/mustache.5.html language reference&gt;.
+		
+		Implements the mustache spec version 1.1.3.
+		
+		/Note/: Versions including and beyond 0.4 are compatible with ghc 7.8 again.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/mustache/mustache-2.3.1.ebuild b/dev-haskell/mustache/mustache-2.3.1.ebuild
new file mode 100644
index 000000000000..23b768a9e9d5
--- /dev/null
+++ b/dev-haskell/mustache/mustache-2.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A mustache template parser library"
+HOMEPAGE="https://github.com/JustusAdam/mustache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tries to access network
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/cmdargs:=[profile?]
+	dev-haskell/either:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/th-lift:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/base-unicode-symbols
+		dev-haskell/hspec
+		dev-haskell/lens
+		dev-haskell/tar
+		dev-haskell/temporary
+		dev-haskell/wreq
+		dev-haskell/zlib )
+"
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index b2958da6eeef..237a1c8b0ff4 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,7 +1,9 @@
 DIST nats-0.1.2.tar.gz 3954 BLAKE2B f20f839d3aa4ac0a06f873d87ac5a691a7eeb62489904875918dd395302cee021cd59bbb0cafb88fd8554c99e14ba7dc9dff5a3704a394b5d342133560347fd3 SHA512 11903b123d0ed27af9fccc8bb7c343dcf42ac8d58768e628460153b0bf6f27bf1f1271890b26a48eb234b3b89bb7b9e48266a4b39742f56bcf8913e0c3751ab1
 DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498352c08f07262bb491dd68ea9303cc22e67416c349e224153c484977d14491eabcb6ce22a2991f7c0cb SHA512 419f2b4f938b7d590f45a25be163e25f29d47ec0fe7cf5d1f69cb9624c5617dfc25a0b14daf1b31ac590c021120eb5cd93bdf902d27136e3019e30ce2b5d3188
+DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
 DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
 EBUILD nats-0.1.2.ebuild 543 BLAKE2B 1f569c2d079ebf66bf12f83a94c7c49dc48b3f55bcbce981f4da8949e41f7c07a054ec85a4ec87716888adbf2697d921d70ee2ce84c2e0cb5f43a74b9d6994f2 SHA512 bc7896c15609b96520e7a1051c0074391326ad2d9625679b3525d2ad3475d5e072ba44d5b62dc8ddcf8caa87d18d74f1a8ae12a1accc112804cdf1c9fb1e68a2
 EBUILD nats-0.2.ebuild 717 BLAKE2B 4c9cea91e739cb2b8541a84ee651ad07620c26315d6f7126093b9ec43266c8a45973ee97ba92597ca204c1b65bdc02c46d19a857eda9e9a69922edeb797e3d80 SHA512 473d3ed753b9ae472ecd71d609fe3b3efe8b075b840659c1954945f437137cbeffce4d47565cfbbbe1f44bbaf498c6c0f2a0de431d81b5fd1c5f257986f1267c
+EBUILD nats-1.1.2.ebuild 1052 BLAKE2B f9e93ddc09b9693f23dc8c544be6d59c65ad1192ce2f04db5e9344b70bb500dbe7e0e5ff1a9872a086020a328a8d16f702d2025b8e65ae7802c5c59ab3d17129 SHA512 f85baf0fae68121af3396c33fcbcbcb5513bd88bd34fd51a893a3104f506b96a1f1d23755962a9ea8164de532ef923126ee96575f7b9fc7ca01082568e6101a6
 EBUILD nats-1.ebuild 725 BLAKE2B 4ac86b59bfe91b8d761f207f55ecd83d8f53fd51c769c3ada619d4a4d67a6174e985da1bcc9024a7f9419ad2aad967839aae1e693568d85c77fc0694bb78ac8e SHA512 65f7b5c9854f712fabaca4dc0fb79a09892af952f5c37ba5706f0a1ab4131e586ba982fbd1e6963e75227561a188c335350f2c6a84a3fb8a170460488cd38796
-MISC metadata.xml 703 BLAKE2B a3434d123064ec0470602448e541cf91d65d32c06dbb25bb1287b43a606792789cd6be1942d7558a35297a4a31da86e082343541ec39d9c58946544f33550c64 SHA512 533f3697500bc5cc931743a82562816555c0b6f17a9e552f394c2f0286d12c1a4e8e0447b708785d2413f2945e4432ad3853d49190ad11a0a8632bffeb1915d7
+MISC metadata.xml 505 BLAKE2B 7c7f0d247b1ddb56fd7b5e6f920bf429c083b4648a1f02b84b25360cf3c40f1c01d277ae988fe669be69dddab117a6517c86a51372a402d0148b5c082b9831fb SHA512 8bc2a5bd043b6389a0630f1e60d2e360e8f78156dc3c8ee85a7ac3c940b28901a550e11f9f8f4bd6f68bcb8da6579f372f4a2e9953c86f7901095e640635a992
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index 1c6077508d48..dc01d7df7855 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -9,14 +9,8 @@
 		Haskell 98 natural numbers
 	</longdescription>
 	<use>
-		<flag name="hashable">
-			You can disable the use of the `hashable` package using
-			USE=-hashable. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If set we will
-			not supply an instance of `Hashable`.
-		</flag>
+		<flag name="binary">enable binary instances</flag>
+		<flag name="hashable">enable hashable instances</flag>
+		<flag name="template-haskell">enable template_haskell</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/nats</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nats/nats-1.1.2.ebuild b/dev-haskell/nats/nats-1.1.2.ebuild
new file mode 100644
index 000000000000..0ffa621e1a6a
--- /dev/null
+++ b/dev-haskell/nats/nats-1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Natural numbers"
+HOMEPAGE="https://github.com/ekmett/nats/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary +hashable +template-haskell"
+
+RESTRICT=test # avoid circular dep: nats[hashable]->hashable[test]->quickcheck->nats
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] )
+	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary binary) \
+		$(cabal_flag hashable hashable) \
+		$(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
index e207ca2126ec..a358788a5a3c 100644
--- a/dev-haskell/neat-interpolation/Manifest
+++ b/dev-haskell/neat-interpolation/Manifest
@@ -1,3 +1,5 @@
 DIST neat-interpolation-0.3.2.1.tar.gz 4339 BLAKE2B e3f7a87308839de027e566bb5498ab7d1983bfaa8c81ee225a18d40e3cf5a3ad31dc8f52660e85f1532e33fcc5bc29e6ffcc3d9bf69095ef7d5408cf98231659 SHA512 aaefc95b85e8546bd20848b3d4da39437b48e5e3c54829f9ae06f8f4021752812a643a638bcc10213db168d3217bd8913b2feec81d90199a14eea8c35fe62245
+DIST neat-interpolation-0.3.2.6.tar.gz 5437 BLAKE2B 0a84a4e0ed3126d6ab11ff382dc46d8760a14f725c23bb87650290b2b8c3791be996f734fecfe326fc8236548360a163de3979eb12534e52fa927787d2dfb803 SHA512 0b3725258cebdf6144a9442b3dfb5e46a1d36525fdfec7f1797546416ef7788c7ad679d33105d541ae37b208c170d695757355291ef0d05297d8e35ea4116546
 EBUILD neat-interpolation-0.3.2.1.ebuild 824 BLAKE2B b8aee4e4a24762dfbcd784452ec1dbf8d9ef4a821dc2c2cb3764add6bf222aac5c797dcb77ec3fe2c24b311b4534de25d199df7b13dd437f7bb6f67462b1baff SHA512 c98005f8484611bdfa0126c26a2fb42cc3070298b7ca21d211fcb74c34d3f0895d852e1d65d646acf70e963ad1d9194041245625aa6535f52285d10a2c9ff5c0
+EBUILD neat-interpolation-0.3.2.6.ebuild 1103 BLAKE2B bba5c44571a69ebc3764018ecd28aa53c51f4c0dba1208ce3f97039c7f381c55dc15cd91a139e2ed3b83125282c5c43942e54d95f3489fc49e3fd4440a764049 SHA512 34b4673d5ebcfed4d3c3963bb9b87a7bddc8d1eea98ce433786bed96056fc725a02c0aea49695a6a7227d339b4afcb5eb85d55932519982937601615ac94012f
 MISC metadata.xml 528 BLAKE2B 8f1ce2fd25af69785d68ddc9dda15763c223577601992b171479ad804a75de01dc8acd97afff5ff9230d3dbf08f935d6ea37dc82620860571f7727ec1834b678 SHA512 0f3cad29fba3eeeb53a1b9091ed7dab3799f1dca2df3896976785edbd8b194676fe42d8f0ee642fb74eb69afea8ef2ffadbb8e3bf39799ec25a87f36e7df48d9
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild
new file mode 100644
index 000000000000..809ded48fb0f
--- /dev/null
+++ b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
+HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-9:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-3
+		>=dev-haskell/quickcheck-instances-0.3.22 <dev-haskell/quickcheck-instances-0.4
+		<dev-haskell/rerebase-2
+		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-2
+		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/netlink/Manifest b/dev-haskell/netlink/Manifest
new file mode 100644
index 000000000000..cce51641af53
--- /dev/null
+++ b/dev-haskell/netlink/Manifest
@@ -0,0 +1,3 @@
+DIST netlink-1.1.1.0.tar.gz 49444 BLAKE2B 620cf5a4b52f86d9410534d5ed0f4ede40961e976e811c0e2f07c46c95b1ceb1452b9b19cdf4f9da9dfd60166fc7899550b060569dea956feadd6c1293c20f6e SHA512 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
+EBUILD netlink-1.1.1.0.ebuild 841 BLAKE2B 2c05a399ed25f634ac10857fe4f7abeb778f7fb240ab7ff7e46a88e0328356ff789e585c31c874369e708dc440d258461dd66162d60bb8bdbeb632008fdac8e4 SHA512 bfc246baa8da6800f95c80f0eea79e199322d32776413a09ddc60ee93e404938425abff7e7fc25e84fe20393768c6abd313df53ed3ea91e7b323d363ab44d749
+MISC metadata.xml 339 BLAKE2B 40a47c360c94feed4297bb8d44315fc2e02201b19ff53b2fe3ed2c4f4325279bbeebf8d039ad92e0e989ea352895cd3a38be20f5997d7760571bfc259d474311 SHA512 0beb4aadfad4adcdd7acc220c7b2c584e0c908b0a80dc6c69dfb959a4f80146eca0bfdc3b86d2cc53acf5268f834dd9fac4ed4fa7d9e35b6de34f9269cd466fb
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
new file mode 100644
index 000000000000..c32804186997
--- /dev/null
+++ b/dev-haskell/netlink/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name='generators'>build the generator scripts for constants</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/netlink/netlink-1.1.1.0.ebuild b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
new file mode 100644
index 000000000000..53e93b7bd2f0
--- /dev/null
+++ b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Netlink communication for Haskell"
+HOMEPAGE="https://github.com/Ongy/netlink-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="generators"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/monad-loops-0.3:=[profile?]
+	dev-haskell/pretty-hex:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	generators? ( <dev-haskell/language-c-0.7:=[profile?]
+			dev-haskell/regex-pcre:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag generators generators)
+}
diff --git a/dev-haskell/network-bsd/Manifest b/dev-haskell/network-bsd/Manifest
new file mode 100644
index 000000000000..30b9a9101ebd
--- /dev/null
+++ b/dev-haskell/network-bsd/Manifest
@@ -0,0 +1,3 @@
+DIST network-bsd-2.8.1.0.tar.gz 8584 BLAKE2B 9864cdcab82d77592574983c70ddf262a4e836807d9141cacaa638d109f423e8332d9cb0b7d07661121970d9bd0b0ef9dd292d7e57010dff106a62003592d738 SHA512 b2f66c6705c490e1cbaab6ca88444294bc90b3711da4039046a9279060ed41228ab855b40039f56bd02eabcc0351200de3e043a108a0cdc98192d563702de7f3
+EBUILD network-bsd-2.8.1.0.ebuild 695 BLAKE2B 595c754b501c69374b6043bdcfaa648c38c1d75f5a8d5c05f24a3012a69bf4868611e1fa2ba2dab8cc4795d2789469423f69d66721592e4a7d3ba05e90f95b3b SHA512 ca740eef3e4e2d8372dfd2f6c39f1576ab79868075034221e5d80cda9db0edbc024f711080e140a96591fd9a47102bd40cbdab717c641d8ccd46d16b60bebeb3
+MISC metadata.xml 565 BLAKE2B 94098ab012c476f17cfa75d4d84d8e1a3b2c0cc1e963a380901a8139e9f09bbaa8abd81c31a3355f3f7541a904bd4228c82c337426e1c625a4f848d657721d55 SHA512 942ae67c0f50e3d39f3ae7c0cee4953b5b3964812fe92f9c8192bae028efdda30f3cc02f8022bc58e44723cf03ec40e33c0f94cc0ff36d78ac943c7dad1fe0ea
diff --git a/dev-haskell/network-bsd/metadata.xml b/dev-haskell/network-bsd/metadata.xml
new file mode 100644
index 000000000000..c784256ff24c
--- /dev/null
+++ b/dev-haskell/network-bsd/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package reexports the &quot;Network.BSD&quot; module split from the &lt;https://hackage.haskell.org/package/network-2.8.0.0 network-2.8.0.0&gt; package.
+		
+		See newer versions of &lt;https://hackage.haskell.org/package/network-bsd network-bsd&gt; for more information.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
new file mode 100644
index 000000000000..0681ee2efcf9
--- /dev/null
+++ b/dev-haskell/network-bsd/network-bsd-2.8.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
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Network.BSD"
+HOMEPAGE="https://github.com/haskell/network-bsd"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+	>=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'network >= 3.0.0.0 && < 3.0.1' 'network >= 3.0.0.0'
+}
diff --git a/dev-haskell/network-byte-order/Manifest b/dev-haskell/network-byte-order/Manifest
new file mode 100644
index 000000000000..9043afae60de
--- /dev/null
+++ b/dev-haskell/network-byte-order/Manifest
@@ -0,0 +1,3 @@
+DIST network-byte-order-0.1.4.0.tar.gz 6426 BLAKE2B fc4f414622f8feab70bbc76dec977a591099bf81bb050aa0426791523d75bc4bb7fed877d08e9c55cda881638b47d84beee9a6c5ffbba89a95b3e40afdade3b8 SHA512 b0b9f468df51963bb6ef6cd6dcd90345cbee7ec96686b8c4f5b94639f6a78280f30af55779208a14f468ec9c5509aea0e65865a7e8966f9779d4c0eb83933dc2
+EBUILD network-byte-order-0.1.4.0.ebuild 588 BLAKE2B 5fa8c9b4c5621f6d99721ce09839329f83a50660898f6bbdd4c62a6d1b0c1cf3a83d5942afd78d1dc568641b3b8b14bc8e99f577d37b3cae77d824465824c7d2 SHA512 8bba2c4df400964e4be8393509e4b3327420cd39e8893e32d8bab3ec5f8323af74f0187f29eee3b5562cd8397465d670c8247d5cc19bfbd521f892e90bf9dd8f
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/network-byte-order/metadata.xml b/dev-haskell/network-byte-order/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/network-byte-order/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild b/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
new file mode 100644
index 000000000000..30a9fcf44988
--- /dev/null
+++ b/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Network byte order utilities"
+HOMEPAGE="http://hackage.haskell.org/package/network-byte-order"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/doctest )
+"
diff --git a/dev-haskell/network-multicast/Manifest b/dev-haskell/network-multicast/Manifest
index 0ab75803c7fa..b3d4260a6221 100644
--- a/dev-haskell/network-multicast/Manifest
+++ b/dev-haskell/network-multicast/Manifest
@@ -1,5 +1,7 @@
 DIST network-multicast-0.0.11.tar.gz 2970 BLAKE2B b58ed23c8dc8ed0c556685ce2a233c72517fbb7a72fa6fc71676f7ac6886a7e3a5ec3ec90bb37805dbb3dd07e3b129bf3a1a5be958d2240df782dc7e40e12ce1 SHA512 f38f4e683117412b97b602ddc324b17ffbb6c20f265086565b16124c15cb99ec63e4a21092cd33e87756d7c9ae15de8c63d8dd192503f7abfbbcf455f02796b2
 DIST network-multicast-0.1.0.tar.gz 3023 BLAKE2B f9ab3881a6ca4d575643328121dd69626fb5e35fe508da0611e4b74d4725f232365db63fc97a8926e653ca972ba6663c476a2c4d159fc52c93dfa5464f824bb3 SHA512 e40de36f5e9bfd999033825c1b834895fd20e649ed5e297f601c0112ed9c02a66aaa05110df8eaa3329d79a7d44d77f077ca231f4fd1587a633ca1847083b0c7
+DIST network-multicast-0.3.2.tar.gz 3352 BLAKE2B ffbde4c01b286fa5d06382bddbab5bf820f029f371114948ba7e3ad3e26b23c0e94afc9ecc764a481fc7fc2dbd1f13f2252274091a30656ae148de2fb3596f99 SHA512 6308b09e882a3b99ce762cc30da790d6ff83b777d322842d342f555a307c59f0110b9a46557559e9bb5bfba258644f25ebfb9007f33e62cf6855dec8fd48da99
 EBUILD network-multicast-0.0.11.ebuild 582 BLAKE2B ae6933e2a4199a532f478e52d3aa3e7acfbb0517167792e7a8727ca109dd8e9a88b02c855ac9e8fa941bed7ed955c8e704b1227d32bb7263722019105b62ebb7 SHA512 7afe2f85390cb065342116f55d741e0d3189fded28721f7404c051b32906f654f450e34b9425dbf202d55ee17f970ffe03db53dd4ffa3fdf108000ab496fb1c7
 EBUILD network-multicast-0.1.0.ebuild 584 BLAKE2B a53c99a1b7e9150fdda832964e88a5dc6eca0abddffb089f9dc0b5e07b06ba06ae2d03cd86441c0ec252dc705f91c60aee49ad8dc8abee472d942cd225f7de44 SHA512 6cb06c8b9b02b3f07518f4e6a81613e7adf6781296c84b839d627cbc86f5f006cb5df75dc3fbd60deccd592ba0fd3936281f1439f846fa49c8db3fea83e1ce80
+EBUILD network-multicast-0.3.2.ebuild 615 BLAKE2B 76cebc00fe4f63eaf2ab5613c4f43106126cd0b51fdb6aa30fcb45523441d74ae376f1926604886e56cdbc7e7b9b24919556c23afdf415055ed5d13c1f07a528 SHA512 344fa3d3a98532e2aca096e81e44507420d709cef4c50b4b70c1d1c24190a3adcd0cefd95ac20d4f1e835ea70bdf33620a28e6ad671a5eb33770c4f87a30b1b8
 MISC metadata.xml 388 BLAKE2B b18d972ab62c4aa23b380fa69b2fa3f67d6fb1eb777a2bfbaee87b8ba9e391e5c1ae86e2da7f4c7ba9c5da1ff6719ec5d3273f1e4484f0b4f2dc75b02b0615b1 SHA512 7f3201b67d296092839d3e81bada2b845eaf35de4dd6ad24fa560df33ca5e8d3bf4955720b05d595d761dd29b0c22b99344b84498515722e53834a8b72eb23af
diff --git a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
new file mode 100644
index 000000000000..d7bbf4142bc3
--- /dev/null
+++ b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple multicast library"
+HOMEPAGE="http://hackage.haskell.org/package/network-multicast"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/network:=[profile?]
+	dev-haskell/network-bsd:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
index 7856fe0dd828..4a0a693d5ed3 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,7 +1,9 @@
 DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
 DIST network-uri-2.6.0.3.tar.gz 26639 BLAKE2B 6d94ac9c89bf0758deabc6869d0964050a610620466054f704608212033e410edd23497c8cfb4d746b891d6f0e7b30c76581f2ba1cf57082d0ce59714ce1c5c6 SHA512 69d52462ed5af44fc3c1e27b741d87a33e0e90fe1fb314f68fd7b8819007a0e88dbde5f53ae7672d820ee48ac99cb9e422dc7274b7032c965f867089468d73ba
 DIST network-uri-2.6.1.0.tar.gz 27262 BLAKE2B 9ef806e6a97a62b43d15887f7e8bad20568db5cbfcbea320d749b9f4b98ebc8eb729762982baf627df792d0535665f4a52a76afdba40e3a73c475bcf86b17238 SHA512 c1b6e516cd19875aab0da325dcb8f5c6b98d43c3952bda4f96bd9c798882357c724b2facbef09e2e98d29b696a9e5518a2de9463fb0af4c5df0734fe2654cc24
+DIST network-uri-2.6.3.0.tar.gz 31997 BLAKE2B 305a32a14eb32bb723ade1b20665e1f37a14111a7725bfcba99bd59120e5ac08c0f30c7fa32692a64f5a0bd4b26292e93bb079b89aa043c3fa0188316d0908f8 SHA512 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0
 EBUILD network-uri-2.5.0.0.ebuild 553 BLAKE2B 9d79d8e9f7ad7a69c1612fd4be4601cb31809b90b128eac94a7586576c99782bae3583d43dfedb17eb525ead74f861112a3a373b7681867df1c21e3e31017e16 SHA512 682986d29a6779e142b08f476829d2635280a255e747f1a31d3a75ed123c34546f8a6d883ba0ae34d52a513d6ecfa7949718686450fcc8a5963e208b76928e19
 EBUILD network-uri-2.6.0.3.ebuild 823 BLAKE2B aacd0a1f11069c486419309647be90e0a424a4097490cbd5477ff2a22cf065118be98186c63d41ab1275d41154d3035503f3787d6fd4b777c84dbd34f580ba9e SHA512 d018b3941f30dda6393a0346bdc62303f169339e523298a4e08df6dcc1cf6aa32a7be4f4a5a00a8e2b32d05949846955007428c14906f55c598426f5d52fcbf6
 EBUILD network-uri-2.6.1.0.ebuild 823 BLAKE2B 9cab605c53e6c9757f7346fa2d347ca5d882f495a8a09ac1e20ae3a27e13ffb18d1031d253bbc93f7361f9bc199839c415af8c95b4e2f71ec00b9349454baf30 SHA512 36e00d4a64f998a6b6cf773fd53122110ec65043e113f149ce6a741f7f51f3c13bc9cce3c294b1c34f71a776ba52aec15ad37b25169a48aa75949abf6f9d621a
+EBUILD network-uri-2.6.3.0.ebuild 744 BLAKE2B dfdd04ea6c8ede85e6e614417b0f083b90b9fd9adf14bba10438544f82bba2da275d84fafe50e4e8718399752e2eefe2f2e9959767673b44bdd105ce604a8c1a SHA512 17b3dfdf28d05b09abba010b97eec6c40e5b34accdbc99c6626a2ecd0e39c2beb94df6dc291e8163735cdce1be6313da8a3d9c181f73286ae6569f47ee14e5f9
 MISC metadata.xml 1145 BLAKE2B 08c579460c155f26b818729fd01266a1a9ef569c32a60a0820baf19005d1f8be213b7f3340f724b54cd4671c116557645ecac359c8a221cf14fe9f83c408c408 SHA512 5f7bbc0bdb35e22641ca82c19b948a3dda898d3f697babdf450b94ae9a90cf299fe3c3356d3d9649bd59a4de065423ab542666dd00cbc619d4071573c627d148
diff --git a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
new file mode 100644
index 000000000000..a542da827e19
--- /dev/null
+++ b/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depend
+inherit haskell-cabal
+
+DESCRIPTION="URI manipulation"
+HOMEPAGE="https://github.com/haskell/network-uri"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
+
+RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 1ea3e20c87b3..2650fce991ab 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -4,9 +4,11 @@ DIST network-2.4.2.2.tar.gz 141558 BLAKE2B a2e9137b79da5e9d136a9e10eee796b2aeaa8
 DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b04179b1608b6ca55f755dcbe08a468546a52c69f2a3f681e9e2ff05a952d1dbbd87831dd03e3a8a2f911eb17a379c0 SHA512 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
 DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
 DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
+DIST network-3.0.1.1.tar.gz 114777 BLAKE2B 05ced39ff17eb68e5e70ddb1036770413224839d5a2c84ee568823feb364f1da898bdc56ae7e64f0e24db80dbc2ec739e42763708b3373f49a85ecf911c72621 SHA512 faca3b25c8724a0c832b6e12e21381fa9642a60bce8a01ea7b570216cd429b2332b14903011f4a554af227de5e502f9619860c230a8f2a69cb5e2289b1947e3d
 EBUILD network-2.4.1.2.ebuild 776 BLAKE2B a0a1008eb760ba94e92dfd06c00598fa08dbf5ae3327c75a39b33865c2a887de702f6b1aa850e2481c5ee7605e326787c1f67be7b93d56c4115bccd11426436b SHA512 6321eacb7afaff080973ccee00137a1a3005a7bd2a980fa4e5058456f5aaa084918dc3ad393b7e5cdfc12df274d0684844c2c8f357c6d388785f8c5bb257cf1b
 EBUILD network-2.4.2.2.ebuild 770 BLAKE2B 44bb2e062372dcf65babec8dd3108dc8300c21b0c66b7cdc31930e9cd5590540f37ddb46084a22a1c3087bf5e61d8674f93273b0ed90c1739aa57a47ad625114 SHA512 a0332c8813d6c4438044499ac245febbe0246d76948a8e6e60b072f9337d6f08f03763dd54d6c81fd7f57a1cd75432dc04b8ac34ba43a59426e29abffabd9029
 EBUILD network-2.5.0.0.ebuild 767 BLAKE2B 3c18b7971cb0f0e91351d1b1d6e0ae5c53c5f358aad91212a5bf312e313f9a3300e7fd4fa8cd60023d486aedf9d737cf4a129efd4f10eb42ba848050948138e0 SHA512 1a2c98f3d489b41f22ef17c75647f63e3bb40c8e5f03051766387615a70be733dfd26a21f62d705210224b302289bed2635c020310acf37ca70b8bcbd2a7c19c
 EBUILD network-2.6.2.1.ebuild 690 BLAKE2B caf9701033b3c87a7fc93cbe0bfe4e4c3e871f0e0c290ce06bc2b76d27431295be918427fedf0f06be0ad3f792e1c4c7c5b6f17ce951e870776a3ef1b5e3f3c8 SHA512 7bce7f3a2ebe03a7656c6fc0ee1660704e61ee7edc50abb79514f58bb12074d198988940a7e9cc0b2ec8306e57a19a6c375f95edf61db5bbd815a1a39d2fa6d5
 EBUILD network-2.6.3.1-r1.ebuild 778 BLAKE2B cb1f8675e642dd107e8eca115066848132c26433380ab3956d38c8b347c3886db3248bd014a8cf7d6861e3c145b399a7d48c47d559e3522ffc10175c127b7ce4 SHA512 20ad310375bc4a831ce4cc1b0f914cc095d492cc1753b32c5b5ba677a71b1f700b86cc6a786144e0bacbd3cbe28b8652934585ffe4029fb5f422f01c4429137d
+EBUILD network-3.0.1.1.ebuild 696 BLAKE2B 06240f3559d1b788a640d742e49da4b1e577f736f96df52b24b6763e1f0346dc3d8251d42abc2ef399b61240f89e5817d2e354d93d2136594bf89df7b30258fa SHA512 4500a0a1ba90b4afc17ffd4a87106ea62f4612498ac87021a07401ab03711613a08bc7c387cf95ed86f00fc472f4783e7cb2a51dd92126eb624ce00785884558
 MISC metadata.xml 339 BLAKE2B 18307a0d079346dd5375b9b1bc7e305cab5d4d540b3c2c3dabe7cfd58fa4d1c3cfa85ec9e783b39e3aa5680f0341a42cbe67d13243cf44e90ede9835c5c69f2a SHA512 d01bf59dc204787d38413ec975da4530201bfaa8e7f68547e253013469c881cd258813129845de80aa3cbe0939c94cf59efc4605ae6351560fd214e7dbd4ce0f
diff --git a/dev-haskell/network/network-3.0.1.1.ebuild b/dev-haskell/network/network-3.0.1.1.ebuild
new file mode 100644
index 000000000000..4756e2bc55d0
--- /dev/null
+++ b/dev-haskell/network/network-3.0.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="https://github.com/haskell/network"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/${PV}" # NOTE: remember to set SLOT="3/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # requires network
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.6
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/newtype-generics/Manifest b/dev-haskell/newtype-generics/Manifest
new file mode 100644
index 000000000000..d36ed62eca74
--- /dev/null
+++ b/dev-haskell/newtype-generics/Manifest
@@ -0,0 +1,3 @@
+DIST newtype-generics-0.5.4.tar.gz 6878 BLAKE2B c260a0eeaecfe3d97aa6b7f794f588d64252373ecd92a5bbae55ab373620d96b4dece32fae0e96a74b1c9c1a0744fc222480c7271cd21addf93a7747465a14e5 SHA512 33128015f68a01633b778b8fd7f3d3df8f13b33479705edd4b47036641d7b358667998eb56a6fecdb1f65cb7fb0ac456b8d08ef264e1c17b2fad08ce0a0ffea1
+EBUILD newtype-generics-0.5.4.ebuild 701 BLAKE2B 7b40ac817488bf66e308a1103c22dedf5605d63e18f386c2bb48ef8033acf9beb0b004e1242e729df43bfdbf42cced8a15d1b0a8ee48403d7fdca245f4b4782a SHA512 7f9f6a99c0a50577307955e7f3a6af1e9d09c33f595f1619b75129d1ea2b6d37cdfc92019111d298c149a0e69fd4d6b13063a24d32972f81597167bfb51a6bfc
+MISC metadata.xml 619 BLAKE2B b87d6e619729576a412b806988879ca6d68c9c6f28f96b4d71026712abb230091c454f176a945c38192b594f4dcce1923f0c4e15b0e1077a0b64ce5d034a308e SHA512 8d9b5b0e46bb623ee8e53929b0b87f74169e034c89013f2d5ab73ced64f0fad61f1eb29c1283e1942e9c283960364e0e9b8de438f289b295a704ae9aac058b47
diff --git a/dev-haskell/newtype-generics/metadata.xml b/dev-haskell/newtype-generics/metadata.xml
new file mode 100644
index 000000000000..e28f27a0de98
--- /dev/null
+++ b/dev-haskell/newtype-generics/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype,
+		and allows you to operatate under that newtype with functions such as ala.
+		Generics support was added in version 0.4, making this package a full replacement
+		for the original newtype package, and a better alternative to newtype-th.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild b/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
new file mode 100644
index 000000000000..105dcb183f0b
--- /dev/null
+++ b/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A typeclass for working with newtypes, with generics support"
+HOMEPAGE="https://github.com/sjakobi/newtype-generics"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.1 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.6 && < 4.14' 'base >= 4.6'
+}
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
index c08edede514d..487f092e06a5 100644
--- a/dev-haskell/opengl/Manifest
+++ b/dev-haskell/opengl/Manifest
@@ -6,5 +6,6 @@ DIST OpenGL-3.0.3.0.tar.gz 130752 BLAKE2B 3378cc470f68d51900d54ee3a1cdf78a01f096
 EBUILD opengl-2.12.0.1.ebuild 1085 BLAKE2B cc3e5d574314e4f45c354bad38c61b57ff70b483f701b99b0f086bdab9c5b0807c2a6db8f3ded98f159699e79d84a71fcecd052d6d8cb5c61a31a87ff81d694c SHA512 f10c7db2ca4be8d162a2e81b1b98edd6b462cb74345e0663b4275bff5f79b7c8633eefcf30cc68b50f4d8d61edc5e26079244b3864e453a3e88f5134e0bd97b5
 EBUILD opengl-2.9.2.0.ebuild 797 BLAKE2B 1a54427daa30095a17495dbb55de581c3241402b4153cdcd9fec6d3aebe1599cbea159db50a0dd4a0d6f9ca4a6bca518672d23d21bc3add5546dd73596eb4436 SHA512 7ddca593d9354fddc8acd8ea96da03e71e974ec63196a51e723917e4c97f4fa2f99091b1f55ab9aff16056859beaba2033810d620903db177e4e1d3c1fbf21ff
 EBUILD opengl-3.0.1.0.ebuild 1083 BLAKE2B 3160260e0c141289f0ef6a3d27df83dda3e31a9aa3c71a6400d6c3961f0f0eb2c43119df95025518eb1721ad2d8826a97c35d9860fede365fbaa307f899f26c1 SHA512 7b7aa6dd68963b293751e8c8c3dae24399460e22cdfa590cbfd76d3587724690907f53881f03df0b4fcac54debb20fe978fb6f0aa4ac97aae0a51c3a81661ed7
+EBUILD opengl-3.0.3.0-r1.ebuild 1170 BLAKE2B e0569419cc47477baf4f3f86f4f1113f11fda5bbcad58c29b8c287c6ea9c93bb6e2dd1df4386e94c26cda3c07a70c36bd6a1c78c1b5fbec4b2d430c01e8eb4f6 SHA512 284410e13fc44c192930785e16cb8dc5acff81ba9af7c289a9789b3f3feaf79c684574d19470be00ac21259d1744ec9d31e6c718f5b815c128644ec6821ba064
 EBUILD opengl-3.0.3.0.ebuild 990 BLAKE2B 38ce90526ed2c14324650522ed4e74f05723139d9f2356cd34204ccc63f4563fe40505caccc366c95491c85791c524a053e8cd47b304705a86320549d222a291 SHA512 22246b89880f7b1a808408b7cd0fe777279b5727bdd56acc346ba2de08273c32d637a1eb2b25ff580eaac1a7f40de2468c4845997df562a6ea3bd8e4d2091bb8
 MISC metadata.xml 814 BLAKE2B 1fd42b44c7f720c6afed3556f087a57102dab18d4348b7b5e8c0665f9e52da441df52ca34a0c6236777918055777baf6baabfbf366c28803ed27b6bba482b767 SHA512 f56f0537d0df2c6fcd18812b99705d09a565031e909403ada47835ac343aa80b4045124c92226bdba6d0b779d8ff9ba04f21f3fc57eaf080c82f7b1aa301f64f
diff --git a/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild b/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
new file mode 100644
index 000000000000..5fe15f8d0947
--- /dev/null
+++ b/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="OpenGL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding for the OpenGL graphics system"
+HOMEPAGE="https://wiki.haskell.org/OpenGL"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
+	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
+	>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
+	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	#as per https://hackage.haskell.org/package/OpenGL-3.0.3.0/revisions/
+	cabal_chdeps \
+		'StateVar     >= 1.1 && < 1.2' 'StateVar     >= 1.1 && < 1.3'
+}
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
index 3a409f953c91..7afec6227ca9 100644
--- a/dev-haskell/openglraw/Manifest
+++ b/dev-haskell/openglraw/Manifest
@@ -2,8 +2,10 @@ DIST OpenGLRaw-1.3.0.0.tar.gz 75328 BLAKE2B 0bccfed258369fa0e84737bc752b6db5db76
 DIST OpenGLRaw-1.5.0.0.tar.gz 102276 BLAKE2B 33cf8f755a48952bf65fc748e11febd0ddbd3ba6810c2d9ed71d24926c3ba257c73a65aa58505757221b75b9f7912c4dc7aa080425e7b6b19035fc2d1acaa4a2 SHA512 455d1149d70a73e12493ce931bce72c62a11568a43d4b139b8c4a5e5c940533e23feb46c71b2a76eb80d3d9512825bb8ed176d4701e17be890b47ba63fccac76
 DIST OpenGLRaw-2.5.1.0.tar.gz 733570 BLAKE2B 6d8ae440d4ab782a578dd3d3bc3bd734f06909a5ecdd9474561596249eb7bfe7dce4047634ad2d271c612f006a18f4ab2706083a572acacf9f78cbc1889b024c SHA512 98f6224d57e8fd5d152a9e028c4c8dafa69de4d52ef30e5a44555cb4c32d0fc92db1b3651beb388f357f59d2a0dd40e0946b26967287f56f268f0ed08008873a
 DIST OpenGLRaw-3.2.4.0.tar.gz 799693 BLAKE2B 3eb97d991242113175b737a1fc9e59e3ff58d63dc4b1ea605414c9650002760e93c6bb3493199d62f8f7ae6db7220c2b07e1e901ed3fbaa8a464c023fda915b6 SHA512 8339fb8a04ddc1c366bb6e93e3c0cabaf7a7c18f5bd687e1f7af36e66f664d8877716a3ac97cce9855ee5af50e3f95e5e0ed19c0137d90013a9cbf6f529ebcfc
+DIST OpenGLRaw-3.3.4.0.tar.gz 882560 BLAKE2B 10cddf9b739d40394859090ea7a7f237fa4f48e1a219a5adf87329424cf2c2d2ef2465793b53f431cc6382de0adf2188ad8b093031ed3cb3290c66be4e340291 SHA512 1db7196cc59d7107ba53a497b6cf78a82b280a9bdc115bd49109193e3fa4077c84eb34b757669a3da95d6bce214fc523a9b75444f9a7019049649e2431a2f076
 EBUILD openglraw-1.3.0.0.ebuild 635 BLAKE2B 18835e22bb25ba6b8bcc5fa09fddca3a18a82a1972e5543366fbc15017f5ac9cb1f67d2c8f248fb11d20a6bbc896cda15cb77d8bd0d2cdd4b82148f17c63334b SHA512 f84e65b5019bf390b2bf97b9a974a84f82ea394c844730fc6db0bf63f5f14f98b39b92ad913001da4019e38abf0c5af105e0da239d35144b8f44b3d6ba1210b4
 EBUILD openglraw-1.5.0.0.ebuild 823 BLAKE2B c030abf20ddd028a02e2c5cc82aaed45ef61b60fa67fc325885b6ee03714afc4eeb594d1984d24793a3a4195c96a48766f314499315079548aafcdea9c94bc66 SHA512 e088e1661a5f09912b92f9079637e8dc073569fe08da5b452c7a11b5c0ce8686f5d3538503de64de2593b4d2313f287c889ec5af11cd483bd3dfb1611c87662c
 EBUILD openglraw-2.5.1.0.ebuild 976 BLAKE2B 9bd109ec4188da05e60513016a771dca528299ace905eeca131bc2ec6c3c35ad6c3c92f01a51aa9c0172da4181db2bfa80436e4cf32d5565c1a65cbc5058837c SHA512 f199c217504b897912c38384161c745cac1a659ffbb59257893271201e3f6fd046f09c3c1e05971e6d85bfaeeb69effd5fcb06b995b0d6329885d286ad2cc145
 EBUILD openglraw-3.2.4.0.ebuild 1110 BLAKE2B adc779524f8f9956a56c51fbd159313ae89e416c6a456a5104bcc719cd8c3883d471a094900086ac49a57a6b1c0951574768dd93dc096e49c47c7e65e0573248 SHA512 c318a0860a6ec6880fd47f139ad272010d785b796457228102512fabfab3c20b6f95a35f7ce1213be7315a54338aac75e9d1ad101180aa4f26cd6946d2fdd117
+EBUILD openglraw-3.3.4.0.ebuild 1104 BLAKE2B 08a89b7ac5efe078b3dc878fd048d84b20725f4ec7bd648106ada0ebe3c40f2365165b40e11dcb1528a9d27f839ecc6b25a7676098d35726482dca96be0699c5 SHA512 3396822b2b4d222949cc4a246b9260f75b3aa93d933fd17e9dbe21818bbc152efe6023ebc26e43e6e7356721bd1cb0e8e661e8ad1f9b2c025c7c7a698b3a9053
 MISC metadata.xml 1327 BLAKE2B b71049e49f15888f0f67058e7518201ca46e7ae64ad907f36fd3507fdb0de0b07a04bc8d8c1f0bc0c6565951ab8ce9ce30a579a678e8de99c99519474fc6ed06 SHA512 d44492c262c233ad31f207d991a69a6404d37aa3bf158479017ec74bac144eef6e69db8179f022c4cd6c6b15cefeb7431345b0cb76885ac37e1e8a2c1e18feb7
diff --git a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
new file mode 100644
index 000000000000..61096c6ba093
--- /dev/null
+++ b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="OpenGLRaw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A raw binding for the OpenGL graphics system"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?]
+	>=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?]
+	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-osandroid \
+		--flag=-usegles2 \
+		--flag=-useglxgetprocaddress \
+		--flag=-usenativewindowslibraries
+}
diff --git a/dev-haskell/optparse-applicative/Manifest b/dev-haskell/optparse-applicative/Manifest
index d6316eb6f5f1..6a6040dba7c2 100644
--- a/dev-haskell/optparse-applicative/Manifest
+++ b/dev-haskell/optparse-applicative/Manifest
@@ -1,6 +1,7 @@
 DIST optparse-applicative-0.11.0.2.tar.gz 30425 BLAKE2B 2bcdff429adc14240883b2bb1f54449d18ce10ae787f4575a60bf170868f71d4633ceea509f0b5ed4fc71a1d0d1fd68b07782ebf2b2a820e47a8c2fbf246c677 SHA512 eb10a274074dacf2a481c964f8fcb125c1ea6be7f33388c938ad310b49d959484102caeb1849e0370292286b7603f68853cf23ded634bb09cd34871eaec74caf
 DIST optparse-applicative-0.13.0.0.tar.gz 36101 BLAKE2B 4dae014b933ee9e89cc417327763b92a94647ee7b5b31662df73cc3d7a1ae26dae2e2931cc1f5e573753ba7dbdefffc797125621650c248c12ecdc72c40a4232 SHA512 ef08f4b994703a35f7c50ba93017742188c612c99a6e69cf7329a42427e2862ec0b8498fa57dd1f64a225d3ed94c62815af211efead9e73adc32482e22e46ccb
 DIST optparse-applicative-0.14.2.0.tar.gz 53512 BLAKE2B 512823fe0c10c31eb213aa68e1821918ebc4034b171c3f5b0c62ea2072c9b6e54695a3f94bc4d73dc1f19f67dfb664ccdfae7fe1cf0ab46433a618e7709401d3 SHA512 ad2252e4501be93ccf1fd9529790b850bdb01b8f36ac9cbb4145015d7609799c9774fd42feec9c8a8b535a9d17b60e0f80b9e75ac7c92444aa5098d2b9ccc096
+DIST optparse-applicative-0.15.1.0.tar.gz 56203 BLAKE2B b4db1a96d0dbe1e4f1a4969e5fe1597ca314364bc71da505b9582b8cd0bf0025edc1dea3d1d39b84c108a7b38bea2c53ecd660d1d0b7d44c56b8d18dde14d812 SHA512 e7ab0a2b4812bbfe7802c2d51a45a4f5a5ea162b094631dc6ee4cd79e5def4101ccb04305cfa16942926809ed656f91aa6f68c4d98e93171ca9be99ba40cc51e
 DIST optparse-applicative-0.5.2.1.tar.gz 24123 BLAKE2B aec5c0718ff629097b80a635077544d6f441fa653c4d71b196c4a5fe6773485c62fb94d615f56852bef024f262800316c18db3df30ed0d4b53c745125ace1c86 SHA512 7246fc6b6c9ec1c9a7b4f4e8850d80fe0958b9c659b2f31c455738d09b70178bb71f164198871874414e1fdf0ecf38098fdbc65f838224a6f6235f2d000f3876
 DIST optparse-applicative-0.7.0.2.tar.gz 26682 BLAKE2B 4cca1216fc7267adb848d716e8ea5a9e895b418d9cd8410e1de6ee22f3eb909559ab404846af3cdbbb9c26503410f3c02dbf440296ba49252ca691ad144337e9 SHA512 94f583d7df97f2887cc4fea8d5b22261195c3f30bb9bf0aec2579d5b2d31583692835dc9df1273c544c3ef72343159ee90531450f7c498617a0595479efc5d0c
 DIST optparse-applicative-0.8.1.tar.gz 32055 BLAKE2B cc11e066a37e4506189c390db7b999ef1e87082d015f09c0bc922369e864d861791c9cfad543a9d891ce964dfd53625fc36d9a4d4513a7ca9973562e3fda679a SHA512 bd7b8462d897439a77dffdc187dbf61e51937960e339c3bd5009b7479e84dd1ca1e40529c8ffd7d198d26542c23e38c45d91abe8e1b1d420090859f0f07574d6
@@ -8,6 +9,7 @@ DIST optparse-applicative-0.9.1.1.tar.gz 32757 BLAKE2B c169a44d8256a573e9df11f87
 EBUILD optparse-applicative-0.11.0.2.ebuild 860 BLAKE2B 4a0a6ce7caaf7419ba32216e6ff6f74502db4e7305dbdb3204c85783d6a0785ec9e0776c30a6751ad0218ea037ef29ade38ef46fb79353eb0c28db5962e103d8 SHA512 87aa8fd636abbcf026d82962286a45ff1075a55634d3da3bde4e409b3112c0354acf2ae4c9410253232435e8ec88e3dece9ee1662e3722af1ffd6911a957d9e8
 EBUILD optparse-applicative-0.13.0.0.ebuild 1066 BLAKE2B fbc9e647bd84bdaa144522214b9cb6a96fdb8f6c7683bff56cda0fd254b291c9f4ef896aa447c7b72fe4208490f284ca9aaeb459d1f927274c72467043b8d96f SHA512 f14f5d2daa1e7c246debfca4091e13e17f1c777b3820ecd574e6409dde52343d358d40308c18e75470be0dfd748b6e87a21e05937be6c94d55e90d7cc4b66a2f
 EBUILD optparse-applicative-0.14.2.0.ebuild 999 BLAKE2B ae4b8c8d26d7253e12d1d7a8c5ec22cbdd093ffe550cee26f543eefeaf1de5a7782e69c4b9ef17aa23979ec7bc07556d5d557f8c0282aad1c9e4cb7df0b029b8 SHA512 92eb4676afb1cb16cadbb85492c2fe085a19299efcdb5ec95d05eb2ea601b0c8ab9c236c6d5a8bbeb1eed11ddab7024513ca007526adb4d7c59a06c4a8429ea7
+EBUILD optparse-applicative-0.15.1.0.ebuild 1004 BLAKE2B 4a1d443800432c3e66cb8199cbef849a6cf9374ae83b60dc26a32efa728d86c1e5a261027a018972921ae0a8d9010f0f9e6278bd7d28114bd0cc7bfbb2844ee7 SHA512 152d00c0d5335b93c4078ed8ca41844cce8f15d583378b89840f85298c6f3f95134fd9cdd2c44592543f097dbe79e43dec63ae374fca9fb836a69d69c12eaf8f
 EBUILD optparse-applicative-0.5.2.1.ebuild 920 BLAKE2B 7bdfdf4245b3e302a0fe7445ea75194a936dc9f99e8988d3e644ce1fd22640bcc4644a787a638da171ac5cfdb189920b8e339ce307090167bbaa143949f8c2a3 SHA512 294b93e56582ad43d420ba721711bd28d783dca94241f6a37988dbb302df292b895508c17c9a240ec95e0a0bc6f490842dd9d7842dbb6e74aaeb7591a07e7869
 EBUILD optparse-applicative-0.7.0.2.ebuild 971 BLAKE2B 91bb8216ced983e26f1655533eea1969255d9736fcc92eb15c29802976a9918610f732abd854e1d2b93c397241b68a3d4f4c008a13caca14e74075309047864f SHA512 a0968caccad810b8ee551b6d432defdeba385fedc52088abe4a8ffebf87e826689aa864e5f21abd381ae92affabffec03cc2b58a84d44aba687b160a776aae57
 EBUILD optparse-applicative-0.8.1-r1.ebuild 1311 BLAKE2B 5959baa928abe3ce3522da55ee136e49c9d89acd80d6fdca9fd386d0c661273151885b3602f235591b39ca4a887cf181d8c7aa9807116772dbee650963b5cc6c SHA512 a87690973300280a46dda6f75c927e7676c30960683b1375da0b42c4a170710950000d5372b5485182a23442fb976edaed892c00953f4d7ec903f9edd82c4228
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
new file mode 100644
index 000000000000..4e1407187440
--- /dev/null
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities and combinators for parsing command line options"
+HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
+"
diff --git a/dev-haskell/optparse-simple/Manifest b/dev-haskell/optparse-simple/Manifest
index a8bf58d2ed46..2e46645da7e7 100644
--- a/dev-haskell/optparse-simple/Manifest
+++ b/dev-haskell/optparse-simple/Manifest
@@ -1,3 +1,5 @@
 DIST optparse-simple-0.0.3.tar.gz 2972 BLAKE2B ff7a559c9f05278ba3b18085fc4f8a48d43025383c38840b3987613ad79aa74590df1ce518b78c338c8bef412c098954b72cb92a31744dbad113510c2e3b4eb7 SHA512 d607482a9ef9e9d4992328fb141cf797ad72e43cbe42eab23adacd21843b8c62c98d6c8fc342b2a11019a220759854b6587a1fd07fa8268462c4cc3d40c4a1c4
+DIST optparse-simple-0.1.1.2.tar.gz 5067 BLAKE2B 1a1bbca9d142bb61af1c00eca720bb5c3315f021dcdf59e9eba418f5511a94b3fe0799c9f958ab4962ba8ed4ac6ef524a6edd4d678331935ae11d3a8e85401e9 SHA512 a2810745ba4a3fd62585fc7367f02ff8eb70752d4836da495a73f15d2b1672d7b5ff59a72bcbc8688efff71fec189c5cc11331b6c46b714233ad86049d581c03
 EBUILD optparse-simple-0.0.3.ebuild 670 BLAKE2B ba2f7bda267baf8d4cc4a3eaa217fafb01f8c3f229868fe0754caca73545a015825ba8ee1e3bebffe93f5935fd7411ab050b89cb62ddb3e7e2d812d795ea82e9 SHA512 cefdf209dca913b64306fd39682928bc9d1c2bae0725c6375277f14274f28813f00f663a9b17eee86102a3d6e2f7d3318468452bf3667f296629c8d8c0e49e47
-MISC metadata.xml 331 BLAKE2B 379c6e1a5d703af489b136d791922e6ea46799276389a232e08768dbe72526da3bf09c362314d9fa1c397d6b9ca91852735112d2c1e2442e0107133fcdc3c446 SHA512 31537d60ed4b39ab3e2b3cbed7b6d6daa61021a325165eefa10cbbbd34bdc085353e56fbebe45fc0b5f2fa6a4a7d9b56f183b324c94a2b7961c17fee06cd14e9
+EBUILD optparse-simple-0.1.1.2.ebuild 762 BLAKE2B a9ae763d225557863a042e62aa981a8de7f28eea83a02681a109fee920cfba98736fc4f0bb04810faab2e411d314b8036eecf0457a07f115b23362e597bce578 SHA512 886e33f70ed9c7d659853342c4834fabebd07ac227998312b073d80340a24b06750825b1f2580de64fbd693b8ccc4aca0d0ffbf4d763e14aaf0c7e13fc2bd017
+MISC metadata.xml 411 BLAKE2B e538eb6d8a230986bb07839b949bbeab3ef9e104a3cf35d899bf6a78f7ce7f8ab54a61fa31fdfb0af1ac3ad09474370f9b5b7a024a5d531f1949eb44f94fad80 SHA512 31a35ae8a8ac5cf3d9819c75f55b899c52b9b87fbd29f68086fbf333fbb50ef7edd03cd1dd312b9688ad4da9370652bc7b683b27ccd8dff954151db34cbdc45d
diff --git a/dev-haskell/optparse-simple/metadata.xml b/dev-haskell/optparse-simple/metadata.xml
index fd80ae8104d5..35a220f21d80 100644
--- a/dev-haskell/optparse-simple/metadata.xml
+++ b/dev-haskell/optparse-simple/metadata.xml
@@ -5,6 +5,9 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="build-example">Build the example executable</flag>
+	</use>
 	<longdescription>
 		Simple interface to optparse-applicative
 	</longdescription>
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild
new file mode 100644
index 000000000000..55010cdd03e5
--- /dev/null
+++ b/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple interface to optparse-applicative"
+HOMEPAGE="https://github.com/fpco/optparse-simple#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-example"
+
+RDEPEND=">=dev-haskell/githash-0.1.3.0:=[profile?]
+	dev-haskell/optparse-applicative:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-example build-example)
+}
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
index 30f342293928..207a51537197 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -3,6 +3,7 @@ AUX pandoc-citeproc-0.9-no-binutils.patch 912 BLAKE2B 191df6e5d4257fe1c8b7aa6a90
 DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 BLAKE2B 1d8080616fe8ed838a8b1d6f59b10fd5abf1c9eb0fe2b1d0fd183670e6db41dcb70258fdb5dbf70fbd053a2a8759eb3afade8573b87d35efcf67d77a0a4a5825 SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e
 DIST pandoc-citeproc-0.10.4.1.tar.gz 252717 BLAKE2B 048c38cec654a07ac2f5fea21269eb234eba17f362ce4aa84b26d8bd09c6a7c14bc2c0258f3d9c1984dcb06f8db99eb34d832894cb4b959171e62376e9517b98 SHA512 afe0b81c4e58dc80cd0d05977d919bb1f1c8e7a77aba5ed960a04f3a6ff8ec398a62dc5e8497d01db7f67e9ce808a94d1b53c4cecb8b6a28893ec8076555c7ec
 DIST pandoc-citeproc-0.10.4.tar.gz 252481 BLAKE2B 782de52be122a7cb94d816d6ba2438db036036167985244f6b8ab63b95f12077511ce9eb0d84a20a7a59834eb88159dd1953ec205c7403c614d9ad0dee8bf9cd SHA512 f188cf2d6642c0dddf2437d23096d488f5e6eb44b9931b004feb72c8adc1a5240d85f8ed48ced9f073733ee546818e3530962e2f2b2ce6cfa52979ec1fdd7cee
+DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96
 DIST pandoc-citeproc-0.2.tar.gz 249374 BLAKE2B 375ed1517d64d3bfd94fa7d7d66480e796a94e33c29eed7cb84019b6d77f77f6ae2c0b23a92596de890f6a70805ace0ba454e73d166c47819896e6b6ce977a0d SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4
 DIST pandoc-citeproc-0.3.1.tar.gz 258552 BLAKE2B 6206dc5739e61f9763fc52e591d3b3272744f0a70186ac068a3f6b91b3b61a624c38bf17bb2c050a05cc8629c67906c4919dea5b2ea52eede0346ec2fe6196e3 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a
 DIST pandoc-citeproc-0.6.tar.gz 227239 BLAKE2B 3942af5577d69b08f22fa00f1174f61c63b886ed2a6c62758903cbe2b0f34d21466dec272b747a4bd80d8b879a048dce5a887c69d588e99c1de0b96eb67b470c SHA512 eb626e0d776b798757d6b8644d0f5642f07141d614f1a3afe6e265ca77cf17030cee3ff267870d3f0a226c7111d68746a5a88c4a9689e2103f329f1b8fc4bd58
@@ -11,9 +12,10 @@ DIST pandoc-citeproc-0.8.1.3.tar.gz 310914 BLAKE2B 1944971f25cc0d43908a25ebfa7fd
 EBUILD pandoc-citeproc-0.1.2.1.ebuild 2105 BLAKE2B 03176da6125ec627c2ebd5e3f941a6ce036d0edf378924040bdc30139c17ef7bc6ae506427fdd165b8b2de8a783f7e3183bd18479ade637bccdc1ddfb2694d2d SHA512 55bf118198a47f766f89494c8fd7cc38d6045489b1d0cfe45e0b4f8ac135a712fed8a33b201f01270fb99ae6cc1122032e1a16f85bba713e39617fa0a668bb0f
 EBUILD pandoc-citeproc-0.10.4.1.ebuild 2347 BLAKE2B 50359ceb4376d3ee3525bf872c66c8aef413576abb4d4e2f6c20a427951cfed0681c867431c33fb34f36a261e7856a397452fc9071719b3651200445a83c34ab SHA512 c68cc167327428a6910d70ea36db706a70165b473b1a33fc17d9f6b6a6127534bbf088fa5716cfb1fbba93435021d6ca765ffd14b8ac153b5d3e2c1aeb0c526b
 EBUILD pandoc-citeproc-0.10.4.ebuild 2347 BLAKE2B 8b52391b0a1f8566be4f5564ab9c3f5c38860563068b3a3c447fa8a9ceb8167931893e241af873b8621d46ab9afef8e0632e019a51ef8e0f8514a92268b937a2 SHA512 33c80c49d270374c56d2c638bafb13207195cf5e53b1c2d73b2fde73e4af836da7443ea8eee4b9eabf82053027e9ecd1b6ea09b74a4a223801cf21ba9562333b
+EBUILD pandoc-citeproc-0.17.0.1.ebuild 2624 BLAKE2B 1029765ca1b39931388641c2f45dcdd63053af8a817fd82dd4f88cb1c0c394aeb087005e29822e2c8139fd62936304f1260e948fd91c03bff6a8bdd37591fb5c SHA512 6b2ce83990051013e04ecf5af3fa9a191a3b6de75efd7c4780c0dbd887c3a486ffdfd74a227ba179598d5b22b99a23717ae2ceb3e8e625f2f57bac798cc4b470
 EBUILD pandoc-citeproc-0.2.ebuild 2097 BLAKE2B 755f5583bba87e426eae2420ac50715f279cc616e674dda41ea48ec2ea60982b926f3b80df846d4be91a57b6493cd4bf24ddf6e283d988764abf551e5a3cb0ac SHA512 2f52de8dcab09ceefb035f18f33c5389ddee0cad92b3bfafdf15abd402a3bee71ff7a919337ea9850dd669db738fbf2985238ea0ca3423141a96eeecc01afcbe
 EBUILD pandoc-citeproc-0.3.1.ebuild 2478 BLAKE2B c7a88662b82c79804c209e81567115b5a9e1874062e4261be38128d6053b926369acdaca15180753874e1505487220b02425dfd51b98a4d27ccf06e54790134b SHA512 d7ef814c299837ee4570a6356095b5f67e147c67465f533a7486e519839d49549bab78f9c27a5316c3c867005e721d1050927095f4db95f4903e5e7c4f27419f
 EBUILD pandoc-citeproc-0.6.ebuild 2129 BLAKE2B db9e6c6d75d50bab024bb160fe8426f9e6d1e762532a57a21eeff3542947a0225ef4435f734887ecf4084708f27d8ff905d252dd4cb077c4e55e3871f745a42b SHA512 dac0854ef182cf34dc391f2e4926914fc8ba70906b5cde220ddcb3833f4f93188048428efd0e79475a64b80f6aa586ffec3c475beb189ce34edd295a7d4a6c74
 EBUILD pandoc-citeproc-0.7.2.ebuild 2105 BLAKE2B 49502a6b8c24708a1bdf79c6a689605e2c4b38770f2a2b4821ea257d46218b81998f873a44483fb2dc6b889cb387e31250b641176bd361be5acc4dff405a3877 SHA512 137751fdc8126626adb31cb724fb2e8339e11f351a132a116eab5b0afd1704c2142cfd0c13251cd568b2bdbb472a5087cec464d8ce83e961a0124a303e2f2dc4
 EBUILD pandoc-citeproc-0.8.1.3.ebuild 2221 BLAKE2B 5124fcb5cedaaaaa7c10f4d083fa7a522f75c29e88fe1da15727411faf66b42d9ea2767b697e5d98e0629db7c70b4fd783b14f7e754bc1a628cdde7dcc07dbb9 SHA512 b3bbb2a8f4f551136514fbae42a71036896ff350b108a2bbe3ce915fdf1751556887b0e6d27f0b26b7df1667a7c3de160e26d93d1a5bc56f55a5b67a432551df
-MISC metadata.xml 1820 BLAKE2B ae0e531d77c424e0be03c47fb5895afcef7a6b58c60fdeac5576acdd88dc236a110001d356585699e21657420c13de92af026cf70292f40fe635485adca6e0e0 SHA512 371fb4d5222c15ae9e085df4a0b4c6d8c1143197dc2033efb01b698e6d687bd9da27b139c6b14dd1f7f8423b119e70e5506cc08462d4264376ebadb7c14b6ba3
+MISC metadata.xml 1912 BLAKE2B e3d9cfa0a6f09692a2f12082601dd25fb3cedb3eb97c8f7c1c6a5a22d32d1d1623f2f3181e0a957e9b17f11aef98019d83a48f590ea6c7ff1371d6af8cf8931a SHA512 010cb707a406ecaa65718fb61c5ae509181bbdd50df27e3c0e2b1b2c8dfe06b50f4cd2e4c5331f1a977e4f052d1e828b704a634a496a97ad7d74997e902d02e5
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
index 44fca18984bd..98effe1c3ac6 100644
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ b/dev-haskell/pandoc-citeproc/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
 		<flag name="small-base">Choose the new smaller, split-up base package.</flag>
 		<flag name="test-citeproc">Build the test-citeproc program</flag>
+		<flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
 		<flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
 	</use>
 	<longdescription>
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
new file mode 100644
index 000000000000..7c28423ccd3e
--- /dev/null
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -small_base,-test_citeproc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Supports using pandoc with citeproc"
+HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bibutils debug embed-data-files static unicode-collation"
+
+RESTRICT=test # fails
+
+RDEPEND=">=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/base-compat-0.9:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+	>=dev-haskell/hsyaml-aeson-0.2:=[profile?] <dev-haskell/hsyaml-aeson-0.3:=[profile?]
+	dev-haskell/libyaml:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	<dev-haskell/network-3.2:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	dev-haskell/tagsoup:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/yaml-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	bibutils? ( >=dev-haskell/hs-bibutils-6.4:=[profile?] )
+	debug? ( dev-haskell/pretty-show:=[profile?] )
+	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
+	unicode-collation? ( dev-haskell/text-icu:=[profile?] )
+	!unicode-collation? ( dev-haskell/rfc5051:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/temporary-1.1 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bibutils bibutils) \
+		$(cabal_flag debug debug) \
+		$(cabal_flag embed-data-files embed_data_files) \
+		--flag=-small_base \
+		$(cabal_flag static static) \
+		--flag=-test_citeproc \
+		$(cabal_flag unicode-collation unicode_collation)
+}
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index 8c71d0a9287c..1b612629adf4 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -2,8 +2,10 @@ DIST pandoc-types-1.12.3.tar.gz 18633 BLAKE2B 53776ac60c3e658ae6bf348d065d449045
 DIST pandoc-types-1.12.4.5.tar.gz 13341 BLAKE2B e0c9d079a8b5ee1eef07d8da87f621a1b005a984ae9b52b81241530bc5e7ef632fd9efe52aa7ab6f55978b28a15ef049769bdaeb5a94cc3b09b5cba8f34f757d SHA512 7f4c1156b074e61cd6fb5f37f5555700f5c21a24eb4226770fb8c83be3dc6075fef0b7b183c06561cc42c194fea0ac7356572e05097165e87e162b161f9c8993
 DIST pandoc-types-1.12.4.7.tar.gz 13208 BLAKE2B 6d823bc596cb779e67d6ba3af0323de2747ff0280e82fb4c319a8ebb5dbe5211015708c5241146a6a8210f9f1907c1d92aa5aac90397d3de3c249d5cf32968fd SHA512 cabb59d4f6bfec3c00d4cac4f2bda60e11ce96394b61d79650544b3249b5ef81758da0d8d08cb3de68ed252845ae1b6f2c4d663e80b4cdc076916c278ac4fc4b
 DIST pandoc-types-1.17.0.4.tar.gz 21540 BLAKE2B ba11e3a9c8fc98597cfaf0812ca35d6346f2c43aa7f67adf3f098b2410d12aed6b60b28003eec16e4cd82c6a355ec03b78d590bfa672d579ca8adc5ad1c63fb5 SHA512 3b3aaa2d6b62be8b3876ead411a0d48277666ab3dd718e5aad5ecca01cb9d66a4d7973bdc250e4fd2d061917d0836f63e6412534fa854c2c886dc798e34c60fc
+DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
 EBUILD pandoc-types-1.12.3.ebuild 690 BLAKE2B d05457b9dd83a4dc3a9cb71bb04848fa7e036a4e2a8f016f6db734e48a20b37faa81f38b7a822b776a1adbf89e751da585c4ea98afa82fa92ec959b4c183bb69 SHA512 637e63136aa0ba1d21f2bf4150bcb2d691eb3feb19f075fd0ec26e3311cc1816276bb24b2e7f02eacf65b17b2d72bf62c94a4b5115813cb661b238aa38671b50
 EBUILD pandoc-types-1.12.4.5.ebuild 778 BLAKE2B ac5b67e1e683a2f412af5ab8fbd42cff4117598c6d8a7b4ef8fbd274a69cd26ffced06a264d4d88451ace94b9072a585d791cba96d6dc8ba31d037db4bacb36e SHA512 e9b5b3b6bb1818b92d381d0d0fd129894e2ce175d10cd047bb49d9f329bbf83822a08856c2a50307846581bad1b8957be56539cd568287760b262df9ec35f3f2
 EBUILD pandoc-types-1.12.4.7.ebuild 778 BLAKE2B 7b6a48628a7ab2ba21cb7c387fb33d94976cb4acb56b1983c0bab7b237f846e8f7e4242622ce3a6f514fd4a255e38dbb0ae3a01d8d17aa7b6019e8974b07728b SHA512 086c8fd8059d3ba22d7bee1675b33a94286eb919a829d1d0289be39ba5ced8d001a2ea5d6a7cc932607811bc70fc02ada33bebd39871cae6f991a0b2bb9bbde5
 EBUILD pandoc-types-1.17.0.4.ebuild 1166 BLAKE2B 8b669040dd8ef5081c1fa02795eedac09d99e4310184ca5ae843a0e6f4327d2b22a8c4c911184a8d80af95dc2bc03471c2f04c3c3d976cb911a219dffff02ef6 SHA512 d63df34f0e2c11c70d88c57d6639e61d0e5f83c4aea44fcb6f2494ffce36ee91df2254f369ce7ed947839e7717c4b022c03f74008089bb959e4bc16447e485de
+EBUILD pandoc-types-1.20.ebuild 1212 BLAKE2B 2114df77a615113b867e7ce381b3475611944ff92bc14f883848afba80342fd034328f5ff5a64a14525fca73a1cee0c74d18a5dc233ee45e6de28d2418833b41 SHA512 99ba7d61c11258a1ba09ba6769efc9ffff14c32f0aad3fc5220c2bbcab691909452e876d91325ae7f993cb6a8ab0d2ef2c902ba61e3fb4054fbdc8cb0365c980
 MISC metadata.xml 742 BLAKE2B be89ec8208d0891fbe9af9f4cdbd438daaaf96e8fa3478b9b9713c57349e6a516c0b8d5ad1074e4b34d02e0d1f1d52ff27a7dcc2699362ed7ddd5bee18940255 SHA512 438830b6cd891695dbc45cb03b0bcd34f85fb5d7225384617a1d130c086b687e7dfed06d4122b0025ad70eba4ed25e2d3dd2803a0a84012d225b75cdfb6fa9e6
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
new file mode 100644
index 000000000000..0afc02176b72
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/string-qq-0.0.2
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/pantry/Manifest b/dev-haskell/pantry/Manifest
new file mode 100644
index 000000000000..88405aa34c2f
--- /dev/null
+++ b/dev-haskell/pantry/Manifest
@@ -0,0 +1,3 @@
+DIST pantry-0.4.0.1.tar.gz 89571 BLAKE2B 4d378ab3a1e951ccb651cd246cfa7328ccbc4dcb8e382e0332122a1bd6334bf3617cb257d8e22865f9dd32f6c75936a0e4871936a25c75596a730df8fcc88d97 SHA512 0fbed425e3079bf1a06805efff092345c5f09bca430d2167d132cba4cd4a4c66567ce1aba921a9ac01d0db368f255395b2ad38d8b16ea5d81e263b100ad5a51d
+EBUILD pantry-0.4.0.1.ebuild 2319 BLAKE2B 53ab40154da66f18b3134be2d37445054d3e666ee3cc4e6c790c65e929cddb7f30413947a600176870034cbe274d31b488e83e28fbba48eabea82cd5458e5160 SHA512 3099ed8aa5d35a53a98088de83ffae56eb6f682239be8f18cacea115c725086a677f7523cc687a03a31dfb286afd56fe10a8d77c9a81a5513068d823c5fdf6eb
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pantry/metadata.xml b/dev-haskell/pantry/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/pantry/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/pantry/pantry-0.4.0.1.ebuild b/dev-haskell/pantry/pantry-0.4.0.1.ebuild
new file mode 100644
index 000000000000..b68dbeafb858
--- /dev/null
+++ b/dev-haskell/pantry/pantry-0.4.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Content addressable Haskell package management"
+HOMEPAGE="https://github.com/commercialhaskell/pantry#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test" # seems related to http-download, requiring network access
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/ansi-terminal:=[profile?]
+	>=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.1:=[profile?]
+	dev-haskell/casa-client:=[profile?]
+	dev-haskell/casa-types:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/cryptonite-conduit:=[profile?]
+	dev-haskell/digest:=[profile?]
+	dev-haskell/filelock:=[profile?]
+	dev-haskell/generic-deriving:=[profile?]
+	dev-haskell/hackage-security:=[profile?]
+	>=dev-haskell/hpack-0.31.2:=[profile?]
+	dev-haskell/http-client:=[profile?]
+	dev-haskell/http-client-tls:=[profile?]
+	dev-haskell/http-conduit:=[profile?]
+	dev-haskell/http-download:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	dev-haskell/path:=[profile?]
+	dev-haskell/path-io:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	>=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
+	dev-haskell/persistent-template:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/rio:=[profile?]
+	dev-haskell/rio-orphans:=[profile?]
+	dev-haskell/rio-prettyprint:=[profile?]
+	dev-haskell/tar-conduit:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/text-metrics:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	dev-haskell/zip-archive:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/exceptions
+		dev-haskell/hedgehog
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/raw-strings-qq )
+"
diff --git a/dev-haskell/parallel/Manifest b/dev-haskell/parallel/Manifest
index 7076c534ddaf..f474a4890797 100644
--- a/dev-haskell/parallel/Manifest
+++ b/dev-haskell/parallel/Manifest
@@ -1,5 +1,7 @@
 DIST parallel-3.2.0.3.tar.gz 12527 BLAKE2B a3c52089a36ba1189d037b3fb93bcfb029965f3a8329990f464bf0d880654b40fa6148b23070f30053bda9efdf123cdf70a1b6d0d6ce02fd22fc5f0792997eba SHA512 28c0d30d51a6d66379190f96e6c057dde044e2bab25b9e87d6bbad2d43e9f1e6e82c1a11aaa61ce3fbf3681ddcc04f7d48cb6b8c9b611d24e5d95247a0cd0882
 DIST parallel-3.2.1.0.tar.gz 13199 BLAKE2B 7559c9b90f7849c119b545aa2a110f45150367a179c6d9a8514853b4a8bd5aca524d790e1bf111cfdd83d33886cb38fc136c29ed9a2a99f4d4d890946ad1f0eb SHA512 5b5051aa70320a70eb0f2326d49afbcda32f24f9a48463f8854f9d61cca2e61cf321b1f34989d1009f0cc8e49934c820f3d5f89a1d675701d9cf46df65dd2d6d
+DIST parallel-3.2.2.0.tar.gz 14681 BLAKE2B 579ac5a9c5310ca74b852fcc4d396815fa81603f939149a4c9aa6ca40d24caee9273d77e31a395c1478cf05750f25c63b4561e2eb0f175091c58d0260e6b7fca SHA512 ca1fe3fc5f9478dd52b42243d1191a2327c22946eb11d2d3426b9da2d833a61f182c20af9d15f7ceda6b58a28ee03de8837b6ca5bdd34e7306894db97f37f7bc
 EBUILD parallel-3.2.0.3.ebuild 676 BLAKE2B e049ad40cb33f4bf577199396984b351a911c368775639f9527b4d153959da62e0b495389efe2f60d2d75aa082ea7a60d16b9423b29ec1ab27dfeccbf5dd078f SHA512 50f33d0e199f863276f7e4f7470ca57582e65316ef689ab3fd0f050a469497a2ac50454a1d8155af941af88dd2013e4a33779b144b2c504e9d36c791e06032d0
 EBUILD parallel-3.2.1.0.ebuild 537 BLAKE2B 8ec90bdd556c55f14fbb6005ebf7ca1a64ed2779dee352a933aeb3cb54471b5b20564199cccfcc1780160de8260ac2fbc2dcc6e867847159ac7d32e9fff4f910 SHA512 5b0d7c6bedd6f75ee171bf4a82f3f41e2ec1009180885c6d74b39fc7462ceb258f66d5714b815c20d96393f98d09826973faf82b8fdde8b3801df71bc72ecd9d
+EBUILD parallel-3.2.2.0.ebuild 633 BLAKE2B cece8be61021ca6abdfd4e12b2b518c7c3fa965457c668c77e9e4a717d6e51513f57e53ca2049ad8efb998e01c4770ed53da61af6c3dab3914d7b1a961c3e10c SHA512 7a3e1972a8deb3b038fb5d93419040a43cb10f682498b4e39e8add3fc353a6ecf9116449613d765b920fec55235e62c9882bfefac451924a8144996e9b31b0a1
 MISC metadata.xml 348 BLAKE2B b3ff628c3dd2e4cc55659f1236f459cba5964c4e20fed7c05b060320ec2564c10bc76eb545637f14f921feea48f3e3fa9f69d978b906a2d371e735f50e98c09f SHA512 2ec2707ab414044b06c87575e74dd42b27bbd0f3040139f8778a70954bf6941c20abb07798052a1c44e51f64b6250abaf621eefabfec3cc6cf696d05104e046f
diff --git a/dev-haskell/parallel/parallel-3.2.2.0.ebuild b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
new file mode 100644
index 000000000000..e0166cf4ada8
--- /dev/null
+++ b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parallel programming library"
+HOMEPAGE="http://hackage.haskell.org/package/parallel"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.3 && < 4.13' 'base       >= 4.3'
+}
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 610567b44468..e8cc8b3262d2 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,9 +1,11 @@
 DIST parsec-3.1.11.tar.gz 32412 BLAKE2B 7e463d37b1da799820079500d96d719e2f34781ba1d443391d5a49b60c3ad935c6c4e766aaa5963c1128ca12a0070f86b17fcbdf6e96224573742e0f9341c7f6 SHA512 f913c172295b184fc118a59ad5fd66c35133885c39aac62239fc3a1aa98b4741465f67d0cffafc1706262ada42259a4694bfbb9175a399997e5b8840da4a809f
 DIST parsec-3.1.13.0.tar.gz 35207 BLAKE2B d5d39122bdc8117aa45b7fc83c15162ac5d366ede01fbf99a94909c0b8ff6a31b6058bbd52ec6aa2366c6e9b1c909acb78c90a697821f8a88b67fa01c7655ff4 SHA512 4efa52bf5f8cdfe81ea97f1ea0bb5522331217976feaf98bb5ebfdf37f4685263f653de091c0ec0ecb0fc26cf6f8525639f9728c9e92afc154e91c6d4239c9b3
+DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
 DIST parsec-3.1.5.tar.gz 27894 BLAKE2B 4c0daaa10d2307f59770747662b387cd286b46d27c3dff27c581d0e295f7bc652cc7e6e0f141ce69ef15da2af0e9f612f732b9bf09f17c9bab56dba0dc596481 SHA512 58bd5e1ea878349a678c4a8d77caf42962ab65f801411bbbad4fa1e4f387de743f2f64944b5d7ef82042507552f281f70a7f4b40984a0ca4fd37618a0d1ec662
 DIST parsec-3.1.9.tar.gz 29668 BLAKE2B 296049551258044915936afa0928b0d73b30ec7cbb217b3ac76972cfc3f9cb49efbe5091c49fe1232f5bb24951efc0c56d89b7818046cc5b8edeb67796de28f6 SHA512 bc5209813ad0742c68c275f0ecd3e284b6249d2651f75daf16ad9a776003591217eb7d47fdaad88530af90455fe7d3e014c3c1d7d0893482721d4997b23a2d16
 EBUILD parsec-3.1.11.ebuild 907 BLAKE2B ed849d5079142a4e9c35125fd20a05cd3ba1c0eadb6046a79a657722ca09796202a1c6bab97d67bf2ee1757eba46516d4b39c68481fee16affbb84d5a9047270 SHA512 41b60b20578535e65d2e86adf171001893504e804466bc21c7219fbd9c8e7a7ecb0c7c4a6097cecd2135703d945d5ed80780548802774264f570960a3e6ac594
 EBUILD parsec-3.1.13.0-r1.ebuild 1487 BLAKE2B 19d19b9a05c77810d032135254746a483e5bec18affb3406b149e58a45202971145f15e41005fe43a989a8b5ca54c12dc54bcd2732458b564c8ac4a7d77f89e8 SHA512 c0182c6ecbbb800a305016f38f3a115c9eece16201208362f7fd3c86833d0ef2e1e7b3aee7bb36cc8cd187cfb849bef748466324f59599f228b53e961917f446
+EBUILD parsec-3.1.14.0.ebuild 1441 BLAKE2B 7f3f319d9851e01b930c0df7ba15d945176e0a170263d41349f5da32d89f137c873ef58c4400cd9ed03be03aa5d1c3f5a00ffb55ce86051c1edc68244c1528cc SHA512 e634c34f9a3b3a41fcdea553067693e25a8f2723769ceb1dc6a9452e58e9ab2e6a09680e57f666e888b39fa62cb351d0e650cc0fede6d77db42851d700be8edc
 EBUILD parsec-3.1.5.ebuild 702 BLAKE2B 0520e9997df96a1412c7a07f6e3ee30f7699445f4946dd2c6c6c79c9a48c78cdc52d3d117abd17b3cd755dcee7f972bb79f26cf5e41ccf93118004ccb84f06b1 SHA512 933688625f831ee6f93c0456e6d7bc2c4f4a101bab1747dbf6d0af3eee092a3847d280cbaedc754b966022af87e292e9b988c318b0f4afffbb0c883bf1e1276e
 EBUILD parsec-3.1.9-r1.ebuild 955 BLAKE2B 568caf15f4a8e90f552467f2c1d9b420c9c14015bfbb74db446c168700f6bfccd9300e11c76031eb6899d135cf46fa749ea727090ff6089d309f4626ce801565 SHA512 f560bc02130b0c05197ba43e586797efb70210ccfe2c704449187489d5d3f49b62600b53fea34eb8b39c1a06cac9212b5bf8feb8387fca94e750254a5ec72277
 MISC metadata.xml 307 BLAKE2B 16cc6920f5961ab10f92062508514149a785fb6011d4c68de20b40083cd8c80cc6e284a1ec8ab90a8937f14ffffe05602e753e91cc25cf2a28664c292fb5aa47 SHA512 bfda6d40cdde23fd32b6640ef6089cf3060a0d608ae4ba12954df60fd27d86fd3c0e1336a362754927bb00651db8e1a541be195c4cc464fd8bb417f3811b7a51
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
new file mode 100644
index 000000000000..fde0a720b3b4
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/haskell/parsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT=test # circular dependencies
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+"
+DEPEND="${RDEPEND}"
+# 	test? ( >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+# 		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+# 		|| ( ( >=dev-haskell/hunit-1.3.1.2 <dev-haskell/hunit-1.4 )
+# 			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
+# "
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/parsers/Manifest b/dev-haskell/parsers/Manifest
new file mode 100644
index 000000000000..faf5c5ec942d
--- /dev/null
+++ b/dev-haskell/parsers/Manifest
@@ -0,0 +1,3 @@
+DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
+EBUILD parsers-0.12.10.ebuild 1495 BLAKE2B 588843cabdf6475f83401d8d51362fab3aee8fc2336842d13d6d46daf0eed227ee1fd0884055c9d65765baeceb64423ecff28e1051d682ca796faaf425c478d6 SHA512 fa02af09569303b982010c73f64c5d54f7f42444ff08f6172528239a07dc88ecf1cc1b51a929a413cd1f093884593fbba50c28b117083cd184d76ff29a3fc4e9
+MISC metadata.xml 860 BLAKE2B 2578752f82eb9b0f48db65ff635446dc167def7c5a01a874609a6599e8544d407001936c0ba24ca6ebff39d549b4a52a536451a6325259b090ac159911318438 SHA512 2d4427181eadc4b5c7db4457f2b982ef893d1e30ff93c9605a1a2b28efa9ae9ea3b9832edcb7fa16062517ac2c31c8570eb22c7ff7bd90fec39c4287fdda4a24
diff --git a/dev-haskell/parsers/metadata.xml b/dev-haskell/parsers/metadata.xml
new file mode 100644
index 000000000000..0149708d6d5a
--- /dev/null
+++ b/dev-haskell/parsers/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="parsec">Enable the use of the `parsec` package</flag>
+		<flag name="attoparsec">Enable the use of the `attoparsec` package</flag>
+	</use>
+	<longdescription>
+		This library provides convenient combinators for working with and building parsing combinator libraries.
+		
+		Given a few simple instances, e.g. for the class &#39;Text.Parser.Combinators.Parsing&#39; in &quot;Text.Parser.Combinators.Parsing&quot; you
+		get access to a large number of canned definitions. Instances exist for the parsers provided by @parsec@,
+		@attoparsec@ and base’s &quot;Text.Read&quot;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/parsers/parsers-0.12.10.ebuild b/dev-haskell/parsers/parsers-0.12.10.ebuild
new file mode 100644
index 000000000000..a262cb26304a
--- /dev/null
+++ b/dev-haskell/parsers/parsers-0.12.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing combinators"
+HOMEPAGE="https://github.com/ekmett/parsers/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+attoparsec +parsec"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] )
+	parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag attoparsec attoparsec) \
+		$(cabal_flag parsec parsec)
+}
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
index ac368bf0b4a2..a4839d5b5308 100644
--- a/dev-haskell/path-io/Manifest
+++ b/dev-haskell/path-io/Manifest
@@ -1,3 +1,5 @@
 DIST path-io-1.2.2.tar.gz 17818 BLAKE2B 5a4a39ff0282e2d2294b8392af954fd0bba036ff223b95dca1951b202b6a4be14373bf439b826d4fb868e4378f9beb45488a77955a6c8e10bd5af70ea72fb57d SHA512 910af5fd9345daa815235027992e6ab4af3784da7afa314644abaf8acb5bee59f3f1444449ce55e88961c86031cf4537c855e13ba2e777348d9fe4c0104fb6d1
+DIST path-io-1.6.0.tar.gz 20848 BLAKE2B 89236aca7c41b5095bb989c7638640ce6735843db36028b2b9d4f0427b0bb94403d915eb3abdfd34cf02f5b6b02cb02e57525eb9e056c942481802b24401117c SHA512 dcafbbfe1531d7b00a9df751c093e6affdefafe7589c0243530579b9f5733ef1357b1085cfd88bf53ff9794accddbc789b927a199f4c4a2b7778268cf1719477
 EBUILD path-io-1.2.2.ebuild 1086 BLAKE2B 79afe2fc2b536a9670abaff2b2159fdc4b4b0f43a60de4a301440b6339d50a841714fbf34ceef312d5b9d4c0358faf0952cb3dab56eb021da17235a38639386d SHA512 11a6a8ee98a30d7defbe0535a019c4556d1b25bde7b6963c1a06956b10f662dedef39c858dc14022efc9ffcf6914e9b800745ae69526fd24311970b1251316c5
+EBUILD path-io-1.6.0-r1.ebuild 1123 BLAKE2B 0b6e59bb818133e2abaa74c1473edd8ca49a0d0da9f39c56733e4fdbaff70ed4326e544f5a0f6aa87fc3614411dbbf7d076d7957bd6ac7aaa5f2c29a8b9f959d SHA512 d793eee11974caf22d844967ea174e5499029af55c7ecde88a048448272cd8d8e5a5f587d6c1978b03c03b6ce367742f6db943576fe9f622c108f290106aee9e
 MISC metadata.xml 340 BLAKE2B dd3091702c88dbfc3d33f22fc20d8c10b506d3efceb9c8b6277c46a11af951de5eba045cf56a73aa2ee88a0010749e3aac8c9a11ca08174f9fdff4caa107a0fe SHA512 6d5348e164095958d860fb532fc3354d8edc244dd1f0b9b90eee725659f5616c54c3e841489c4752aa470e6531d04ae212898a02652876eaf2f18639c17b1827
diff --git a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild b/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..fdde596e893d
--- /dev/null
+++ b/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interface to 'directory' package for users of 'path'"
+HOMEPAGE="https://github.com/mrkkrp/path-io"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/path-0.6:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	>=dev-lang/ghc-8.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'path         >= 0.6     && < 0.7' 'path         >= 0.6'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
index 5703f46a58b5..972ea558403d 100644
--- a/dev-haskell/path/Manifest
+++ b/dev-haskell/path/Manifest
@@ -1,3 +1,5 @@
 DIST path-0.5.13.tar.gz 16988 BLAKE2B 4fbc3464f674a15a2dc3c543cbf9d705f9c189224e45c6bb4f180e46483547822ed8a90920c183c756ebcd3529ceaa142b7a644b6e2f28a474e1302827b37204 SHA512 bf1e4750aa025382735f0b8329daa092501f1bbcb25ca3951be653cc3193d19be4339697e966db7dbff7ea2f78b251259c9f6f4cb36402a51221b077af388284
+DIST path-0.7.0.tar.gz 24227 BLAKE2B b2f3347c29dfae0e7674f4de39f07bb7ee681735d1509c7eefd29cc2141dcf974212fc970095a783fdb47dbffaac9489097116768bfe996a160bb9b8886cc9e6 SHA512 b07fc95eab12188d49e4525ea5bbadfda9d5bfb61cc306d624730087d2fc1f946407e4861f7f66de48d9cdf2541591d4518fcc77f28d65671bfa65a963e18a9c
 EBUILD path-0.5.13.ebuild 937 BLAKE2B e96e3fcdce7908abc4ee3fbd19923eceaa4a2fa3e8d4e66f5c4baca9068a363ebb66278a6e8ca4037bafea032cf811ff5d2fc1a69660d52defb2632a1fa2b62a SHA512 54df4d1ea3d5a10c26434aeced20285cef3bd6dfe6764c4fcf44ff4d28bb7173585e1088172077dedea8b65df8e58044d1496c5fd13c9902cde0ca92bc355285
+EBUILD path-0.7.0.ebuild 1151 BLAKE2B 14667893c4c008e7123e21635195c72c99d41d12e759ac0686ae41125b35ffe339b9aaada420b28498e4e789370e466f422c8e9746bd8ba16b327457fc4071c1 SHA512 e7da00e4b2b1e3c09ef11c5720995b47c1a82846da0013e75983e8d7de2e459b254741e89f2d507ac8dd0d4c34340aa4ad2c8f3fcfcaad2d2eaa33c1a76b2d8f
 MISC metadata.xml 295 BLAKE2B 5f4666825b52c64e89d54c65bfa6053986c2c1b3aaa3032e652d304516f4f2d9402e14b66ac9e737722b3b0ae6b3a5509d39d51a2799dec35ee323e88948ca65 SHA512 e416d1a71b8bf287ea2072c15d4bc5b520355d210c7c6a75dcfbfac542caa06fc24319809ece7794ee8325d73080c59e1e881e128e5f5cb89c4b04d17f42893b
diff --git a/dev-haskell/path/path-0.7.0.ebuild b/dev-haskell/path/path-0.7.0.ebuild
new file mode 100644
index 000000000000..969e56affe31
--- /dev/null
+++ b/dev-haskell/path/path-0.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+#hackport: flags: -validity,-dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for well-typed paths"
+HOMEPAGE="http://hackage.haskell.org/package/path"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/genvalidity-0.8
+		>=dev-haskell/genvalidity-hspec-0.7
+		>=dev-haskell/genvalidity-property-0.4
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
+		dev-haskell/quickcheck
+		>=dev-haskell/validity-0.8.0.0 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev \
+		--flag=-validity
+}
diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
index 9b4bb3ebe294..7d81827ba96e 100644
--- a/dev-haskell/patience/Manifest
+++ b/dev-haskell/patience/Manifest
@@ -1,3 +1,5 @@
+AUX patience-0.1.1-ghc-8.6.patch 914 BLAKE2B 840b9f375e4bc1725be57e55d2a7a6e27c8e075758d924597a34ffc80ab6c0a6f706cbb2247c063983c282451a4ff0832aca00b03a795d38898a38ffd03f3dc2 SHA512 d6a4bc0eb4abdbe8313d334ce5b60e18bf1b2d74aecc72147dcda53f6e724d2fe29d07a70c026f24614c36ab6d9132dcd6ae9ee44b5f2b04b6b317cb3121c47c
 DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
+EBUILD patience-0.1.1-r1.ebuild 611 BLAKE2B 173fa58ecd0080d2e2288fe0c937537a480e73de2839ec2ed0a412ac7bca700993e840c4fd94c5c9dcadc22f69e02bdb2b989e11105c984f2de4398539ef5991 SHA512 fd038e9a893b74b45b482ef147c2af3ed811c48e1ff818bc5773efad91109c6493d7b313dcc6f7a1d0a0a8768e243b8801e6bff1ff95a37bdd23aa3a233f4014
 EBUILD patience-0.1.1.ebuild 568 BLAKE2B c3672a6f7659d9695469dd2ce33cf2bb7653cbfb845e3b6702db661d11aed518977189a7ccb2643bee4a12d9de2fafa97399325eb138ce75fb3b80bc7edeb947 SHA512 525b06e383af2aa4938aa5ceb92b4abc5f38e0e4467f5958296f1875a37ccc1719cf16c9d9dc06dd27ab82b2ed5d96658c590628e976480edfae1e138a688964
 MISC metadata.xml 887 BLAKE2B 0cf15592802803b2efb4a61ec726a019abcb976bdec08c7389e3842fc0067c78aec5b96723fb3afd76c607428548bbc2ad46904f9be6edcdbf2363463d88ed4a SHA512 e6d6b6af598a2d92c07d1464c785f694f91e706ab2706909f4d1920c58764dc84856cadbed8008f337dfddc4ddb4431849b5688a7c6e50c28ff922680a766f78
diff --git a/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch b/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch
new file mode 100644
index 000000000000..e844e1d9df5e
--- /dev/null
+++ b/dev-haskell/patience/files/patience-0.1.1-ghc-8.6.patch
@@ -0,0 +1,20 @@
+diff -ru patience-0.1.1/Data/Algorithm/Patience.hs patience-modified/Data/Algorithm/Patience.hs
+--- patience-0.1.1/Data/Algorithm/Patience.hs	2011-08-17 08:08:14.000000000 +0800
++++ patience-modified/Data/Algorithm/Patience.hs	2018-07-11 15:17:45.021338649 +0800
+@@ -15,6 +15,7 @@
+ import Data.Sequence ( (<|), (|>), (><), ViewL(..), ViewR(..) )
+ import qualified Data.Foldable as F
+ import qualified Data.Map      as M
++import qualified Data.Map.Strict as MS
+ import qualified Data.IntMap   as IM
+ 
+ import Data.List
+@@ -68,7 +69,7 @@
+ -- Elements whose second component appears exactly once.
+ unique :: (Ord t) => S.Seq (a,t) -> M.Map t a
+ unique = M.mapMaybe id . F.foldr ins M.empty where
+-  ins (a,x) = M.insertWith' (\_ _ -> Nothing) x (Just a)
++  ins (a,x) = MS.insertWith (\_ _ -> Nothing) x (Just a)
+ 
+ -- Given two sequences of numbered "lines", returns a list of points
+ -- where unique lines match up.
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..54fcdd486411
--- /dev/null
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Patience diff and longest increasing subsequence"
+HOMEPAGE="http://hackage.haskell.org/package/patience"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+PATCHES=("${FILESDIR}"/${P}-ghc-8.6.patch)
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index a08096ec00c5..bca932e34f75 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1,6 +1,8 @@
 AUX persistent-sqlite-2.1.4.2-exe.patch 709 BLAKE2B 41fbf74d91c0cf98a7417754ac3533eac51dbf35258f9fd2f6be286271ecb0699ac461a6d9898fd211c06e288da572080f14d6c19263b8199d49d394de0fdfaa SHA512 96772879c46426fba0e79d23c5b11d2ae3e2e30a272bb11bc3f739eb20a7c5b182e952163b974b440f39c947180675e384dce5d7f7ea693e7835055248e18ced
 DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 BLAKE2B b5bb2a869888fd276fc4a515000253408f878964b5b4b0740406a7655f2488a8b5c9354be108bc4f24b31caafa4916a9973ed2204a4be7ca53745dbc7217893f SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7
+DIST persistent-sqlite-2.10.6.2.tar.gz 2220390 BLAKE2B f146ec84ae45d0d4b4cb3c809bf694182c8592369e222029824f6eb6a39abbbb67acc6bdd2af4a9b8080d50ffcdc20968fa14cac237a475b220dcefe3329fc2d SHA512 b1db41bf77ae53b99c28f3224c9a2b7335faa4a78c96487270249959cc9491fa542e28d38dd63a2b417580f6a41608ffcee152e8609fe16392005c728862c7bc
 DIST persistent-sqlite-2.6.tar.gz 3565770 BLAKE2B e92865929494d37ea5363dcb5110821e5ae5de099aca3fefa59311d2586b9c450f648fd4077ac7310efe72d5c7267b8f5c943610e65db7731608d8e86c62fdfe SHA512 c0be576429ee0051eeeffff6c6d7168a7993deeca47acd27bf2d0075afad2702855f2c14d8b389697d5053aa097d81fe119e4eb215a1c56f782e2ac95a5f8ff8
 EBUILD persistent-sqlite-2.1.4.2.ebuild 1302 BLAKE2B 5f82fc77a67f846d665ee4a7ad3b6134abd679b2583dfb3e4c5bead612557e2391117a11c8aa6fb41f5040ac7488553bd475dcd032e5f1695e45d0143adde57a SHA512 04f9d44c2f711fec358afb5b2b58b2508474621e662ed26ba7ecb173cda57540486e47029a766b232cccf8849254ae7e86381a66e363aaae2362dc55bcf03c63
+EBUILD persistent-sqlite-2.10.6.2.ebuild 1798 BLAKE2B 5c74bb24992fe69fb9024892495c7d4f4b51d361d95e02b662a5e5337acb74e56ad42d72d85aabd644b283819f09615bcecb3ca76f57e4d5160c33d66fcb2483 SHA512 9fb0bdf40d858c514f0fee7040a7ed09e2382a44a294e437672312624abcd706350fc76c6e3c4e7e7a973873a7e1b0d77b0161122b19fce9dad8b9c08d3ff221
 EBUILD persistent-sqlite-2.6.ebuild 1259 BLAKE2B 1e607715e92a1710d92ea5b2831568959f46fe1418b7db5421692dadbe0b268e6bc858d9c5f4f1056ff2167eb7f957f8e42d9e67f2058f531f862765aabc6075 SHA512 3a4d79baa945f87d95e49389c471b3fc1310e18cc92e9cc9210f596d41bcd64edc5ac4d875a7d8eb0d7d01cd95c1b093c9806d70d45c1a3b905ca83dcc99c08c
 MISC metadata.xml 533 BLAKE2B c34bf1644536c848850e9e5c8049a4f55588c9aca1f430fde30360a3f56d5457a55796e17d430d9622ea6d9beb804fff4fdd12e3120b7b2db322f8c2e319d0fb SHA512 d8224799947db36e76c7e77dd7303f77961f1c0ddeed6b795f3b5c047db6af57148c6a31f3838a9c35900d6859a333bf85965caa68263e23d0533c17ce2ad3d7
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
new file mode 100644
index 000000000000..e3b69f748f49
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/microlens-th-0.4.1.1:=[profile?]
+	>=dev-haskell/monad-logger-0.3.25:=[profile?]
+	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	virtual/libc
+	>=dev-db/sqlite-3.0
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/exceptions
+		dev-haskell/fast-logger
+		>=dev-haskell/hspec-2.4
+		dev-haskell/hunit
+		dev-haskell/persistent-template
+		dev-haskell/persistent-test
+		dev-haskell/quickcheck
+		dev-haskell/system-fileio
+		dev-haskell/system-filepath
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	# most flags disabled since they have no effect when system-sqlite is used.
+	haskell-cabal_src_configure \
+		$(cabal_flag build-sanity-exe build-sanity-exe) \
+		--flag=-full-text-search \
+		--flag=-have-usleep \
+		--flag=-json1 \
+		--flag=systemlib \
+		--flag=-uri-filenames \
+		--flag=-use-stat3 \
+		--flag=-use-stat4
+}
diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
index 242102162268..1676f7b2c320 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1,5 +1,7 @@
 DIST persistent-template-2.1.3.4.tar.gz 19084 BLAKE2B 625532bca1e65a40f043f6975cf1c3c93329bd593cc2c5f6f9f62c0aa925c91a358518ce69ccc65609b4d2e9686a4337af47bd2a7e6778769d7f3cb40796241d SHA512 8b218dea93a6a2ca80801acb43f101d6809d7118f3b6765a98543d87b12b4b565d5b3ea1f1256863b2493553f996ef5dcc569432507de6477b1f59a02093d95a
 DIST persistent-template-2.5.1.6.tar.gz 20196 BLAKE2B d7d63dbead0348bc3c9239c23e5976337fa952a4a19cf86507064632d0ab1ddd7b26f984285307cf7b3ff177afd8aa5e94708412ba954815959ff09fb857bfb0 SHA512 4e2432a0f0fca28699c3abe9298b10451330dfb4e2b1a7048a2a98e3e18d4b41df06ba1bd53ffbbce3aebb123cd2f6ec9249580490a32c478ff3aff628011916
+DIST persistent-template-2.8.2.3.tar.gz 25949 BLAKE2B 2b2fbfcb4e8dad68da8a820ae082db8cee9f683db9509b55b4ba908bff0a20cdf4e925db4bfe2d5c0014912e58469aa593e24a428f181928e8024917a3ab7db8 SHA512 eef94f07783f2b61ed4d00c75a57e976e2546ee1cb564471ea33e5faf01634701a7b60b4c1ee64594e0058949966f132fe46f1a5efc5a64f949fc6e6b27d5ddb
 EBUILD persistent-template-2.1.3.4.ebuild 1148 BLAKE2B 21adcaf596ee31d7298e4594380007515d61638cb04db66b34a6730ded1df3f06bd84714e57a56f35169ecc53faf46eece23ca68359ed2f455c9762da582cb67 SHA512 1637849f9c9941fe42eb307470ee577a433eafacd2be4718cda84f82634dbfbffd816b2d2fe8ea80295977f4a50ea3a88169121a368c17c47f5bd02d3f064bb5
 EBUILD persistent-template-2.5.1.6-r2.ebuild 1461 BLAKE2B 952f3c92bbd322cc411eb2bd73c5bb5c8463c541cc5af64b5a3a6b8e960f2ac85f3c996a16333652be22b41d839041b6314532f58c6a02ff3d3ffde563b137a3 SHA512 11f4a368dcd13ff985381485977b72e67a978d007ab2301258d34cb81ef6d115488f2d59f75688b4ee86323844506e312a35c7ce1b50fd177c6073007c0e05d9
+EBUILD persistent-template-2.8.2.3.ebuild 1174 BLAKE2B 22a507b8a84f0a9e7176ab3f7fb2004e21ed5b65bcd0b09c5b30e71290a6c9a25523daeebb4f4a179fc30c1c3c9f33c30f76a6f880111b60572c110267f6cbed SHA512 9df4d2e578edcc5171c3e66143f65e896fb2011efc42099e5d84c37e64870e66e158033adf487f784aa20459acc73ebb4ff16a180388d2d05687072b9a85b108
 MISC metadata.xml 423 BLAKE2B 74c07376a1dec4710e8c652e2400fff81a26fe160c8d66535d96cde967cf6fa2e430a78464478a684ce4bbf0daf93f881fa9803f03c68d7d0d0f74dec421973f SHA512 9bb326d4650a21992d988e00e20936bb9e40138d306c75e1621b4291b6cdeb72bd40d7d25c503f89a5266c157ba917ece4828a7255ad5b5662f450c4e82091ab
diff --git a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
new file mode 100644
index 000000000000..2a2501f66988
--- /dev/null
+++ b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/http-api-data-0.3.7:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/path-pieces:=[profile?]
+	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-2.4
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
new file mode 100644
index 000000000000..fb223142e8f2
--- /dev/null
+++ b/dev-haskell/persistent-test/Manifest
@@ -0,0 +1,4 @@
+AUX persistent-test-2.0.3.0-new-exts.patch 8051 BLAKE2B 6acfdcea9195fc1e79be992ce93c0a5e061722b70a9af9e231a4645436c077bd5c466c7d8ddc091795a3a44726edabfa97eeddbdb61fdc92f1afae29caac7f6b SHA512 cd4eb775a223396ee602cb3a220b0323bf491f9d7f1daebee146a0f573971900bd00ec2de5640119fd2e27fe6be5de3151eb08d4a94f08bb3bc10006aa932ea8
+DIST persistent-test-2.0.3.0.tar.gz 24642 BLAKE2B a1f94ffd7d574ac575db79f2afcd9f627be9dffff8c29811d104b1c30239f0518c90b096a34689c18e9e1a4fa63a3dccb819bd910ecfdadb5239806d53e5cb17 SHA512 511aa72db39687b2b90ef262d5dd83a64887902c2fe57bb87bfd437421170f39af4ebf54ba217eddce80d2afac54ed7e546214775f056e478f20de27c518fdf1
+EBUILD persistent-test-2.0.3.0.ebuild 1430 BLAKE2B 5c9b2be28244e7589c5bc549fb10aefa47bf5982c4557a318c5414512887155fc6909447d5a480ec07f941e221ffa932d33ab3dcaa2048b09ba9e5a6e64058e0 SHA512 b00983533909425be2150d55e9e5ed893113483911b2b1d2017a882d0fa399d8e6b8ad25cceb8ca507d6c83affbd8205a7458203e728e9905c20342aac9b0a0d
+MISC metadata.xml 467 BLAKE2B e032a48fbac4eaa4a7fb97fd7bb2437a8cfa0fcc032f76f6e62fa55cae67a8a9c6f9f06c28ba1b7ecffa32c2d8943590a2038f2764b4e73e791a3b42174aacf5 SHA512 f320da1160bea9aac40a791c5da1e0f76aadd9ccd165687e8441d66de488e4d7ada914396b10147614afa28538c84372d7a98d8cbc18beeab517415f042958b1
diff --git a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch b/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
new file mode 100644
index 000000000000..e27746b85731
--- /dev/null
+++ b/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
@@ -0,0 +1,252 @@
+--- a/src/CompositeTest.hs
++++ b/src/CompositeTest.hs
+@@ -1,6 +1,8 @@
+ {-# LANGUAGE DeriveGeneric #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-} -- FIXME
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+ module CompositeTest where
+ 
+--- a/src/CustomPersistFieldTest.hs
++++ b/src/CustomPersistFieldTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module CustomPersistFieldTest (specsWith, customFieldMigrate) where
+ 
+--- a/src/CustomPrimaryKeyReferenceTest.hs
++++ b/src/CustomPrimaryKeyReferenceTest.hs
+@@ -1,4 +1,6 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
+ -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421
+ -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.
+--- a/src/DataTypeTest.hs
++++ b/src/DataTypeTest.hs
+@@ -1,5 +1,8 @@
+ {-# LANGUAGE ScopedTypeVariables #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module DataTypeTest
+     ( specsWith
+--- a/src/EmbedOrderTest.hs
++++ b/src/EmbedOrderTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where
+ 
+--- a/src/EmbedTest.hs
++++ b/src/EmbedTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-orphans -O0 #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module EmbedTest (specsWith, cleanDB, embedMigrate) where
+--- a/src/EmptyEntityTest.hs
++++ b/src/EmptyEntityTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module EmptyEntityTest (specsWith, migration, cleanDB) where
+ 
+--- a/src/EntityEmbedTest.hs
++++ b/src/EntityEmbedTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module EntityEmbedTest where
+ 
+ -- because we are using a type alias we need to declare in a separate module
+--- a/src/EquivalentTypeTest.hs
++++ b/src/EquivalentTypeTest.hs
+@@ -1,4 +1,6 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ 
+--- a/src/HtmlTest.hs
++++ b/src/HtmlTest.hs
+@@ -1,4 +1,8 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
++
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module HtmlTest (specsWith, cleanDB, htmlMigrate) where
+ 
+--- a/src/LargeNumberTest.hs
++++ b/src/LargeNumberTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module LargeNumberTest where
+ 
+ import Data.Word
+--- a/src/MaxLenTest.hs
++++ b/src/MaxLenTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ 
+ module MaxLenTest (specsWith, maxlenMigrate) where
+--- a/src/MigrationColumnLengthTest.hs
++++ b/src/MigrationColumnLengthTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module MigrationColumnLengthTest where
+ 
+ import qualified Data.Text as T
+--- a/src/MigrationIdempotencyTest.hs
++++ b/src/MigrationIdempotencyTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module MigrationIdempotencyTest where
+ 
+ import qualified Data.Text as T
+--- a/src/MigrationOnlyTest.hs
++++ b/src/MigrationOnlyTest.hs
+@@ -1,5 +1,8 @@
+ {-# LANGUAGE UndecidableInstances #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module MigrationOnlyTest (specsWith, migrateAll1, migrateAll2) where
+ 
+ import qualified Data.Text as T
+--- a/src/MigrationTest.hs
++++ b/src/MigrationTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module MigrationTest where
+ 
+ import Database.Persist.TH
+--- a/src/PersistUniqueTest.hs
++++ b/src/PersistUniqueTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module PersistUniqueTest where
+ 
+ import Init
+--- a/src/PersistentTestModels.hs
++++ b/src/PersistentTestModels.hs
+@@ -1,6 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE StandaloneDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-} -- FIXME
++{-# LANGUAGE DerivingStrategies #-}
+ module PersistentTestModels where
+ 
+ import Data.Aeson
+--- a/src/PrimaryTest.hs
++++ b/src/PrimaryTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module PrimaryTest where
+ 
+ import Init
+--- a/src/Recursive.hs
++++ b/src/Recursive.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module Recursive (specsWith, recursiveMigrate, cleanup) where
+ 
+--- a/src/RenameTest.hs
++++ b/src/RenameTest.hs
+@@ -1,4 +1,7 @@
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module RenameTest where
+ 
+ import qualified Data.Map as Map
+--- a/src/SumTypeTest.hs
++++ b/src/SumTypeTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE StandaloneDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds #-}
+ module SumTypeTest (specsWith, sumTypeMigrate) where
+ 
+--- a/src/TransactionLevelTest.hs
++++ b/src/TransactionLevelTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ 
+ module TransactionLevelTest where
+ 
+--- a/src/TreeTest.hs
++++ b/src/TreeTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-} -- FIXME
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module TreeTest where
+ 
+ import Database.Persist.TH (mkDeleteCascade)
+--- a/src/UniqueTest.hs
++++ b/src/UniqueTest.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ {-# LANGUAGE UndecidableInstances #-}
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
+ module UniqueTest where
+ 
+ import Init
diff --git a/dev-haskell/persistent-test/metadata.xml b/dev-haskell/persistent-test/metadata.xml
new file mode 100644
index 000000000000..06a1d4de2257
--- /dev/null
+++ b/dev-haskell/persistent-test/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Tests for Persistent. This is only for use in developing libraries that should conform to the persistent interface, not for users of the persistent suite of database libraries.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild b/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
new file mode 100644
index 000000000000..31a319f723d7
--- /dev/null
+++ b/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tests for Persistent"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?]
+	>=dev-haskell/hspec-2.4:=[profile?]
+	dev-haskell/hspec-expectations:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	>=dev-haskell/monad-logger-0.3.25:=[profile?]
+	>=dev-haskell/path-pieces-0.2:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/persistent-template:=[profile?]
+	>=dev-haskell/quickcheck-2.9:2=[profile?]
+	>=dev-haskell/quickcheck-instances-0.3:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+PATCHES=("${FILESDIR}"/${P}-new-exts.patch)
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
index 8902db4118be..f2c1478416b3 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -1,5 +1,7 @@
 DIST persistent-2.1.6.tar.gz 42889 BLAKE2B 73b5235cca8104b4d10cb87f8ec3faea4f4b4c48b017b5b6a44fbf50cd955b9446e6fccc91a1a7572f9e480270436723316e1c4ed25a8ee9b5399390ff4d8757 SHA512 b1de69547d252a142bce18b837b37be60cc384172473f08dc0d7826dc82f7ce879bb7e0860d31e5c8dadab78992f2c84766bdc804f6ca06b29fa5e7f8391273e
+DIST persistent-2.10.5.2.tar.gz 72570 BLAKE2B fb5fe4704076e66b6aa24615e4faa14803879b18da6dc972f7f05a5ecc27435ee4e7f46376a2082bb327b189db4cc51aa04f673ffc8df46d8b85a56e2c26b111 SHA512 5d7fe9259d89ab210bd136d9f9b0f3e52d48825a003cc02dfb01f50457324daf2c8659b9123cc0e958b636613fa61004f649f97980c6a5427d425656ceb166f1
 DIST persistent-2.6.tar.gz 50030 BLAKE2B 434b452c55339acf3ebc5631d6038b1e875959b7b867f033d2d55b72a2cbcc536c999e25bfc1ee6326f93e2c3a730c8a9a781c4677a44a55648edd32951db6ac SHA512 39fe1ec0c959ca0ec9c37feda8b2e4d4ddd706ae2bd4de9c4161db02c85747475f5a61d5daa3ef73f4adc061e13ff138edcbe34fe1baeb93512c1fe68053a282
 EBUILD persistent-2.1.6.ebuild 1646 BLAKE2B 6e0279517a0bf79f3dc5c52fc5d9df2af522302df09737ee6cdf02e9b9191d9f79f35bfff831d348ac7ea3cd251630844bed01881f7765f041eadda547510dbe SHA512 c93693e12565233f79a79ff76a9857c2428834c1fc2c73166a9a66b5a5fcbf2a45645ddf7df17edb4326b0af1f15a27b418ef447762f5eecfc57652f4a38370d
+EBUILD persistent-2.10.5.2.ebuild 1449 BLAKE2B be79e34008c7e1e15ed075cccf61e3cd08d91d9f8fb3fbe7e6a7c275a47159f030bf1642ebe2ecadd2b5509807a81b064fb394439c866808381b6655d5aa529c SHA512 1205a01b98b890fe66be5eb63b587bba1c47cdfcfc9e487d6f61ec0484afeb44f646de7960d593a5d13f4f1912d1b9ba827720b74b873293f00686ebb205b8f9
 EBUILD persistent-2.6-r1.ebuild 1819 BLAKE2B 5aa4702c8e0df799697e30ab5c1fb2140e7d2c08eddb62398535e680efcc35ad06d4d6d1d0e4e4309c8329e9ddc4c36ca00822fe3fec8b3059c5475700fa40bb SHA512 07535160e6c905db68c38c1f42397da2c55eea82e9a92f6afaed297de962d6ffa75e0ba7ae38c7ec3e39b373061a08eaffcf7dc0ad2a64a5c076e6fb4ebe8c8f
 MISC metadata.xml 545 BLAKE2B 930ddcf3f9a50ed279af337a1c0e8972a8dd34d71218d1ec57b312bffb4700efc425359798ba71cb15f764ac4e74333b9835f877c91aadefc5aea7bac9ede850 SHA512 be844f5ffd48d9573cff4389f30efe79882dab1e6786b1e22f8d3b168cf81a83e10da15a4deaa2c6e1189645b70e097f72fcb99242581083c855213065fa686d
diff --git a/dev-haskell/persistent/persistent-2.10.5.2.ebuild b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
new file mode 100644
index 000000000000..1bbbd221307b
--- /dev/null
+++ b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, multi-backend data serialization"
+HOMEPAGE="http://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="nooverlap"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/fast-logger-2.4:=[profile?]
+	>=dev-haskell/http-api-data-0.3:=[profile?]
+	>=dev-haskell/monad-logger-0.3.28:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/path-pieces-0.2:=[profile?]
+	>=dev-haskell/resource-pool-0.2.3:=[profile?]
+	>=dev-haskell/resourcet-1.1.10:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/silently:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-2.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag nooverlap nooverlap)
+}
diff --git a/dev-haskell/polyparse/Manifest b/dev-haskell/polyparse/Manifest
index a7dba7af6b98..cdd4763534fd 100644
--- a/dev-haskell/polyparse/Manifest
+++ b/dev-haskell/polyparse/Manifest
@@ -1,5 +1,7 @@
 DIST polyparse-1.11.tar.gz 22978 BLAKE2B 22154655fb090234223189f9f25e871c73f478ee3681313654d737930d594c9a378fa1d259ff4cdbe93d2df5a8ac79104ee12b9efed7e9fdf1caf6ad269ab988 SHA512 b2cecc633596caaa2b8a00ceb16f141cd69de9ec697ce53cd827a17c82cac70ffaf10bc1d8669156ed4d28589b11ac56820b5c02905c8a6bdcae65112126fa5e
+DIST polyparse-1.13.tar.gz 33144 BLAKE2B 0b142e4e82df045d838861124b204c06bfc62e642ea8a6a88697be0312df2a33998984a7e85ded35e4a0bb5eec304447b66a0d61dab196db32e63843a4b3e1cc SHA512 3b66a73f97d6b5b6628193f87cae1ae1a68d63df0058532b2ac9a62af82dabe28e15fe1464075a2f436e70a7d20b57e72fdd7831f8b11035ff8117becb08d18e
 DIST polyparse-1.9.tar.gz 22256 BLAKE2B 01f2280db5d966d86450b4a3ae352e1ba911c1d7b116e6e94cd182c6d49c4b43e6d52f264097b4e8c87867bd535140b18c04a445ee9ab60f9296e1a15bcdeb0f SHA512 80f7cc269c7082d256aa273ce668a8fd9f58b4827fa69e390d749a622d667d5c01b7ede3719d52408d3efa35de66928a3fa659f3798826a2d53222d8a8d9d7e6
 EBUILD polyparse-1.11.ebuild 630 BLAKE2B ea2932e1cd8a1ccafc485218f1b5f9e1f3f22cabddea4d35eb1a117b9ed9a557ecbe9d489aa5a6b55dcb38c0634b0d1bc456f7ed70790d4c85bb695a46515033 SHA512 0cf58362c1c4a24def87b972a0fd618b3baf55c57d30685e6adf6383ec7a7d96a0543dc2d41f3f0216497969630195d542f2a93485a455f80198022c0e779464
+EBUILD polyparse-1.13.ebuild 802 BLAKE2B dd95b494d480f54a028f47ee8996537934b48bd2b068a47b5a92feff3981934f2d427ae60eed2e2ec9dba7f52b900d6bdef746551b0750c30f3bd84bbeaeb1c1 SHA512 ba1daa4558533e7ab5ca04e068b870ac28d9f412e440f5fc1f32ea549eb749709ea90b02c681e739163796d0b03cef007a20d3861549e1986791cd9399654492
 EBUILD polyparse-1.9.ebuild 607 BLAKE2B 32746a7455545d9900ec1094efa2636f87f651908e3fa24fd1e42a9ccdc6c97d354036f3894c829778c556fddf9c36d5fffe0247120f05fde12e9ea470ef273e SHA512 728b32d3565ce24a0211cbf66c9965da606ceb5dd9c521da1ce6b75834feaf024652a314b61e8ef7f0f36f21f03d7313436e4d92fb5e0a21859ec3a69998ec7e
 MISC metadata.xml 648 BLAKE2B ec7679bb8dec7212a08a306a1b57b796aa6037f642cbedc234a42da09de700a7a7faff3219e9d8019ff6ae0641260e07bbdc7cd78352940f195bc300f6e2bf6b SHA512 ec7413b7f4fbc51776411fef7a21be4bfdbfbb52640d3b21467177b09903c0cdf860c201c7450e9f2dbcd87c918676fd69969319afafc29e75d0f989b4e7963d
diff --git a/dev-haskell/polyparse/polyparse-1.13.ebuild b/dev-haskell/polyparse/polyparse-1.13.ebuild
new file mode 100644
index 000000000000..56e5391cec99
--- /dev/null
+++ b/dev-haskell/polyparse/polyparse-1.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A variety of alternative parser combinator libraries"
+HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3.1.0 && < 4.14' 'base >= 4.3.1.0'
+}
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
index db50d88996ae..f3f10c5b056b 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1,7 +1,9 @@
 DIST pretty-show-1.6.12.tar.gz 133535 BLAKE2B 401ddd8dd47759ad4c1d07249e991ce0843c31cf19f63697a4a042dcc02e1790cbe32f499d2b7f5684658c32185c46d84cd6cae52dad5ba8cf8e0b6ca136378a SHA512 849eeb2d939bad7ea38f706ae69beccb9e033135d152f7ff0e8b214c0ea89cd7c1c9c1ccafa1025d098c145ddaff6c82a36b9e899bb7b8ae549d52d178a59e23
 DIST pretty-show-1.6.8.2.tar.gz 133160 BLAKE2B 2e24b32f3e9c303b2cfbd3bb8ce210365f1f4c2494ec4c3ad1d833367bcd9d6f20995eec448e0bcdf570b0300d9449563d41ec29c7c3cfa097ec516547d3bdf5 SHA512 673b1fe7745e299cd9c547aec90daaf870d13e52c7d78b472a71e5b86e22bcc3cf3ee8a4f0a88826ade20ed59fcbc623254b71485e928fe8f283d28edd7b4a6e
 DIST pretty-show-1.6.9.tar.gz 126196 BLAKE2B 70c14fc324b1c9ec54eafd0e44f5a93b6ee3f37958a10be8129811c65124801915d189f4c5bcea72ce8cda91572f4d7706daddb7ae70304ad1a0d13631916505 SHA512 8205182584a03777cb04b83b8ebe2e92bdb17ee801ff9ff2947a860175f7415375ca1fb7b433448b14898addcd0e86bf0f9e0a53a37254322625698bed9952be
+DIST pretty-show-1.9.5.tar.gz 42378 BLAKE2B 3d8fb41c00aa95049b88c75f0b2c107b6000d837e3761c74bc888b561fcd36b1da21c502cbf8e905b601eda3ed5c2a242a710945cf5aee5e2c4413581ba3788e SHA512 7bf382ad3531227588a82d7bcff3a795df0c425b27d7f4448a94fd617fbc8a4fb6087eb859480fe4702771bf560a353a3a3d5079cd6576c620d5258686c41193
 EBUILD pretty-show-1.6.12.ebuild 687 BLAKE2B 8bd61b2e06b5f68cbbaa2a78bc65884bb0f1d54c6be2918b32307e1195ef1cbce78e359c119e37272016b2193c0412f8899929d8055189387981919d899795ab SHA512 8728dd9cf648a4240e9462d53ded138ad3ff354a419ae1c419299cc8a55ddbb5993ac79863f52c08555f31b80fdbcca2ebf80a11181b69c93f16fe07045d54a3
 EBUILD pretty-show-1.6.8.2.ebuild 685 BLAKE2B 645cfd4d546f4fa26dbc00cdcfe14c56c5e84852ba876824e42248c1c4a678c20a684b301a542be0955437d0dba93f56e7b4c3f02a2764d36f657d95e69dfe28 SHA512 60c93a0f6866d1b5d952fb6e66fbd08d176f284071dc1d6f92b6e40d64306c4a42622ac027c702ba31e4034c580628c45ce4cea0116d6e60e6cd435246c1aca1
 EBUILD pretty-show-1.6.9.ebuild 689 BLAKE2B bdccd6b34d2b4491118ba1e61ed47e695f403e66196fea9b7bd7862e81654c4355389c5795dd4f881740a76b22672d15c738a02511546dcfcdf555c41b7e8088 SHA512 f55476346b715dbf6b488efdb6b0fd94f29543a3f65f133618196ccbe479d6854e4adde6134365129765e371dde8e258c5fbd598de0c74ae7250236d9fd76c79
+EBUILD pretty-show-1.9.5.ebuild 711 BLAKE2B b81e1a71d5614b545b1e638c74744e509f6b98268c426f1fbfd17fe582dc1060461fc538563e228c424654c10449404814b94876ad8a18b38b80dc8b9ed0629f SHA512 b65641095e2b037ee98c9870a3054efa2fffd1c8f9b659a5364cb3d6135ca3b9c8c445666621592a63a67a262d37a5b9d31facb2091849fb2bdd8b22b5514f07
 MISC metadata.xml 617 BLAKE2B f3c5a355f4a9d506198431ba777cf086f33386796d78391651c74d397ab7477011400c72391e80fd06761d1442b4ce029ce05c6d1865d30672b1dac8691721d6 SHA512 79ee76d8f4dbf8a78775f6ae5e9a0833a97f23e67217d32f07660a4a3b3d67355090e02f48fe1de1445d509635dd837753096a899e91f0aebb848c4f036f576a
diff --git a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild b/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
new file mode 100644
index 000000000000..11370d8d5e0c
--- /dev/null
+++ b/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
+HOMEPAGE="https://wiki.github.com/yav/pretty-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	dev-haskell/happy
+"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/Manifest b/dev-haskell/prettyprinter-ansi-terminal/Manifest
new file mode 100644
index 000000000000..bd670f333fdd
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/Manifest
@@ -0,0 +1,3 @@
+DIST prettyprinter-ansi-terminal-1.1.1.2.tar.gz 6378 BLAKE2B 5c8c4a224bb2832f31ce8a52b8cdc35ee84b3e288a38f507f7bec22beb5fa2877c6ea178a60bcf189bca75be1afa35903582614f0a209f4d6f5d8072b3683bda SHA512 b2ac6c76ce6570b285370c9b1a466272aa5a3ba86a9f1de996392d750d212ff62a743e9c3c28f7de7951c9b270d64c97cb695166b65d642751942d682ff1a71b
+EBUILD prettyprinter-ansi-terminal-1.1.1.2.ebuild 785 BLAKE2B e73fb67098967b0895cf1b04facd466f16944dd4c588a6b9c582416cde5faade41b1bd571049669dae11bc97501d9aef7759efa9a8d7b8f7879244379960b9ec SHA512 719e4504aeb83a4350e92c0050c7d3f65d09e09dbc0a919437ab2b128e8af0b2fbaf322ca734b98ec957c199a418f9c912bd0dbe8b7fda83d5119343f15deb52
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/prettyprinter-ansi-terminal/metadata.xml b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
new file mode 100644
index 000000000000..726d4606f861
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+	>=dev-haskell/prettyprinter-1.1.1:=[profile?]
+	>=dev-haskell/semigroups-0.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/doctest-0.9 )
+"
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
index 5b8fcbbad4cd..a40f8e1ac11e 100644
--- a/dev-haskell/prettyprinter/Manifest
+++ b/dev-haskell/prettyprinter/Manifest
@@ -1,3 +1,5 @@
 DIST prettyprinter-1.2.0.1.tar.gz 46373 BLAKE2B 8d71f9dceffd40a228e2911397ecd8cce1ed141f16fbca287b3005693f448c4fb43a974b5ddb7e60d2f33ceed58d69ccd3c6fb4490bff477e3598f414cdc46c6 SHA512 f51e546915d799a07f7b7a60c53f1cd1491535bcad6199341c14aeb96250da85f5527b94ad19e2c297fcf4b02d4561c2eaad1458c4b9c870fb0dcfeb142d9771
+DIST prettyprinter-1.6.1.tar.gz 52818 BLAKE2B 171667a7483802a6e55f599af89831ac4e13931f4ce203313ab5126c975963de13c39dba124d81cef29bbeb1a98f1f2001dd9beb02b00dfe1d34160dd8167d30 SHA512 4623cec5c2034f08bce57320d9cedce4c893977868e2c98191c060d6442c2c19c946a07dc8dc2a31dd03c726f392dfff6509ca837d9c75974637e7ffc5099496
 EBUILD prettyprinter-1.2.0.1.ebuild 972 BLAKE2B 6108e6d57e6efdb39fb6f83e53dfa3e2adf27bf617c45e8b7abb16490a70e99a7a229511e70a4938ad11631085321836e39ab62349ec9093947c8ee0a3fd0e60 SHA512 71c58a76a777660bde03bcab88b465cc0c4bf1e258dc238fec98025315344c9d730549c84ad93406a9a8bb4247a454bde2e406706c4d3dbfff0f228403f35105
+EBUILD prettyprinter-1.6.1.ebuild 982 BLAKE2B 48729ff71b6eeaccbaea42902e4754595648d998ab5f0b4f2a4de9db2f852d912542f9cba4348ba1143826f3ce9337c6544744c7fefdfedc5aee4dedbe45f4f5 SHA512 3e4fc91797c3be3af1970b03b3cfc432658d9309ff74a377431c72668d0d3f762c875d0959b1670c9bfbf5e0fc5beebffa5908e3dfbf7a6901e05670fcc29689
 MISC metadata.xml 386 BLAKE2B 2337a8c68f44a5898b08934636a22d18da0a8b9555cd181b5b8a9b6bdb7d3e0ea081f2fa7d88439619470548bf1d682b5a46a38740ae141e99097863bb09791e SHA512 fc01c4318ddc50ac7cd2a616f98f5248dbe93a2aa631c89b874af6171977b66e326d8f366df0a1badb46096cf6c87f8b614fd6e2747382cef5f442ba05bc73bf
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
new file mode 100644
index 000000000000..41a7db096c72
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/semigroups-0.16.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/pgp-wordlist-0.1
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
index 233f1a3e0d3a..2918b999fbfc 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -2,8 +2,10 @@ DIST primitive-0.5.0.1.tar.gz 10372 BLAKE2B c8b3feb5228db084b0fd41d06ecbabc31fa4
 DIST primitive-0.5.1.0.tar.gz 10482 BLAKE2B 2507da63606de91bb4f20db6db156fdb5ec16a065658f71b10a2f4a2e9ffa47b3ff1eaf65603064a904f6b52e6724a604459296011a445e4ca6ca0bf6727f2b2 SHA512 23d0d0afc80e2b1a674d93feb059d8b240a81793ffd53f496562b87d7b4abc605f66549ac7f23774d8c36fdf8a6768f02cf15b962c75b5052358a1c8cd1664de
 DIST primitive-0.5.4.0.tar.gz 11966 BLAKE2B e6127adaf508955903569c86fdb8e0a300645d61faee4f7fe31a51847e7d706fce368e4a94007a207c61bcc59c41d6d8a7480e02f06d04a1f3706a95de0083b6 SHA512 8d0203834f09be52aea6a8f46d556340583ec79f8490e240f660326d670ddd67510caef1c30ee7d7374d88b812a9f5761c1528152212e46b56cd7c744f7aa656
 DIST primitive-0.6.1.0.tar.gz 12857 BLAKE2B a18d7685279f13090284c8f6414e3844f2226a4db4e3bd1722f9e04a11cafb2debb431fb1f7181c77375290610a456bc7634837d8886c9e91638bf139d2768c2 SHA512 7d75602732aae7af4ea5fb6678f669b103c5c40035c2fa2cc27d940e911054722d20f1b53865cfd0b430785baa0843de89de7195bb2d72c5bc1e5aeb4fdc5f82
+DIST primitive-0.7.1.0.tar.gz 52184 BLAKE2B c99f4e3bb37981a1c290914636460304203083817be8e83c2d756820b139b185e9594042fa41b9cafce03ae849a55a58899a6787890f81e4d78f7f35c5057c15 SHA512 8ade11d0b2221cfdf042da0263b5b5367a7ca2a9b9e1141844e4a65bb0467df879c92cd3515440d715b59345860c1ec3cb3efd7a3d702269ea15e18692586367
 EBUILD primitive-0.5.0.1.ebuild 601 BLAKE2B 88e7d1c3c9c6522a50b5d861b5cb9b93cb754e4413c0eefa224ebe50aa55366fd25dd1f450459cbac00ff4fbc380aa4dc436a81b8836a5092c84942d5c2ac9e4 SHA512 ee89bdcd6590d691e40eba438ddd1e705143e8895df482b3bd378e4ba33d3bbcbb3e3f4b5b3ac7e70a9ed776f4eb47adc7b3d0657f13b8c729a66542c4a6a1bb
 EBUILD primitive-0.5.1.0.ebuild 611 BLAKE2B ac4c3d7a4b76f30088ced4998be17cd1f748ef64e017b634774a9d87bf312b033ed0799490a99c3c9436a00ada7605b792717c5b25e8a5a7a26e80c9216a00cb SHA512 bbafa288ea7b6d925186ab2db336d0107316e461339da36d2dece6ea282b50c2f354b98f453db71ccd6c9215227ba4b75d6131aafdf77e825ed20dc2d83ed82d
 EBUILD primitive-0.5.4.0.ebuild 709 BLAKE2B ac04248fe05fadb219d41fca7c9e3b0761a5b489c6c6f8ffb6c6f453a8981a8289b492338432fc1b148071703f0873b536038837537a9e137bc45584959bafc5 SHA512 00bcfb11fb0c1046616c370d9a5f8ff257918df4a3099227695e012742fa67ed69a5e51e5fa4b6c4b1fb3a8a5a730fe8d5ee0b50480df905573714778971e2ad
 EBUILD primitive-0.6.1.0-r1.ebuild 842 BLAKE2B f6e7442389c9f3164310f14f11d43d18160d98d6c45972e1d0b25e182fffcc9f546a5db4f5b90c4da00bb089de2657c14bded132bcddbee6acdb2cf7a76b6885 SHA512 a222bef0e7178aebf9ea68eb4d8880215ceeb9c0ea830b7b386528622fb054ba5f29db5085e2b8c26bfca03ac4a7ad6b4f024f6a4ab85feec2c1e965a72bea77
+EBUILD primitive-0.7.1.0.ebuild 788 BLAKE2B 19f42b91d661138806bc88ed5177c47f863f1a35a39943a97971b4f587966f6b26ed6fc3b9953f102412ee8d98471d5c3da36f595340d6b705bcb3c707ee3702 SHA512 29d37ff869a662ca52f4901fabb10653b64560a1d2f19d7f47f8d117bce3cb237649a40d569752f99761737c922afb5f6a47bbc5bd7ff4bb8b489a78da4d2e43
 MISC metadata.xml 1013 BLAKE2B ca2e0bc9843f49ef6d42cd1a4e9e55adfee7adfe1fb2d86f6e0b31cfdb685d952940b87c81ba7057ce2c523d16ed9d2085e24a862bcf0c4a1a8bd11312bf08fd SHA512 a0d6b463a62899f7f58a197787d85bd60b3179c2fe3f1a91b17cc521a4d688623680f9cf0a78f1a0baf53093ef52ebf889bdc5642489b0073ae768992b4acea8
diff --git a/dev-haskell/primitive/primitive-0.7.1.0.ebuild b/dev-haskell/primitive/primitive-0.7.1.0.ebuild
new file mode 100644
index 000000000000..127196afe010
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.7.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Primitive memory-related operations"
+HOMEPAGE="https://github.com/haskell/primitive"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+"
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
index b42e5b9769a8..a9edfa1e7e4d 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -4,10 +4,12 @@ DIST profunctors-4.3.2.tar.gz 15816 BLAKE2B e898cf6ef1814755bfad4e89b38df1b5692b
 DIST profunctors-4.4.1.tar.gz 16997 BLAKE2B 576fcc51a5d06369e4a6eb546b0762acc043f21112cc742fbf15c1b17c2a5de8de91f673024db95912da45bef1ed6d25df9dca8998735e2d9b16fccf1f3726c7 SHA512 66c6a81e2109f7c2f755063b06f54444bd932c679c701880c0ec1a8ee8a50c63b4bab67f7341af745c0a77e362ff74de9da8116e2641d5f99dd59250657b7f50
 DIST profunctors-5.1.2.tar.gz 18845 BLAKE2B 7495e7897dfa191dec2c1b62381f4488c37222d4e989f99a6f69e41ee8852dee6161a0df1f959637b6fa1e3c5434629c87c809b904b69d74065163220df4069d SHA512 420c3c7beeb17ec42354fd805045bbcd26d406cf4b37a5f70f1f2fd5185f309b97138008959b5a028ff79144562316221c1605917a1d784315d618c1d61b37a2
 DIST profunctors-5.2.tar.gz 23236 BLAKE2B f81d0a08c8172cae7566710dd33d183dbbe92eec5a8589c649315c3103c82c97099d5c23a0eebcaecc39fb487d73aa453bc426a054ff875e4749782933ce8e12 SHA512 e158bfdc681913c131daa766138474654b56ec8e58944995b614ebeb11460458ae8409cfaf9a7398beb759e0f88b2e5139f9a53deffd3592bed859faa5b695fa
+DIST profunctors-5.5.1.tar.gz 29825 BLAKE2B 6a2fb21790e7ad7edc1cced8fb14cd02dab080ad832926edbd81a1aaf95c3aa9590c8c6b6216265103d1be9977ed64bbefe49000d1fa350d26af29a850c98333 SHA512 6f2b3cfe7ab629dd224319eef020bf92068a0b6b66019ab11dacb0e3540a2581605849037a9f2c0e1bca4330a4bce63266c9378cdb1bd612cdce52e7dae53481
 EBUILD profunctors-3.3.0.1.ebuild 639 BLAKE2B b31a5815a06650e59a73b9ffe55453e37c5b60474bb5fe7b86da7fbedc090ec343bf435beebb3adf735afcc96cb0a2466e1939f74e77be3dfa24bb8aedcf9bcf SHA512 fedb97d682adbca18026bbacc51aa6379d66c8979c23a4405c7319694c2c8cd68ac776f69f042fd21f47bbd34ff6ba336ad02c1837c2d4a63e1fe44fbda0fc07
 EBUILD profunctors-4.0.4.ebuild 842 BLAKE2B 9ac47ad2f9e6d3fe5f831624a4358ca30478ca7687ed6f5413e224f114df02b3880f4ec71d78322b9bc822b1cf9c0a38444ccb6168f7cd775ed64b008bd39063 SHA512 fe05160dc7f3d5075472b3bfdad061b2fe2348e9730c66de256a52f025c3f5cd76b2b4664bad2323f921d47d7512ed9dbb142362c2afaf10934d1b88f2fa738b
 EBUILD profunctors-4.3.2.ebuild 927 BLAKE2B e10d9a58b716c12d1574551cf21314bb4a50b025839530eade271f4f4715c8e76f3ef845681ba2efb577063d1bcb5a8ccf1b7787f59b1a50dd606bfc70222d46 SHA512 90a4ef53781ffa8bfced397848e99a0a9dbc4c6b5fde9345561e222accd63b022542878e155889d01a13da0112eca3b345a6e4e5857f3e60bd4249948310cc43
 EBUILD profunctors-4.4.1.ebuild 927 BLAKE2B e10d9a58b716c12d1574551cf21314bb4a50b025839530eade271f4f4715c8e76f3ef845681ba2efb577063d1bcb5a8ccf1b7787f59b1a50dd606bfc70222d46 SHA512 90a4ef53781ffa8bfced397848e99a0a9dbc4c6b5fde9345561e222accd63b022542878e155889d01a13da0112eca3b345a6e4e5857f3e60bd4249948310cc43
 EBUILD profunctors-5.1.2.ebuild 1005 BLAKE2B 7795704e23300da735de145c6540c8481791ad29cc39f0fdbe0b832e9a79a2ae5e7f88b4ec337324c0f96ac74a16dd317fbd39d649605eca9fdc22a224be3da6 SHA512 5b1ff757cb83f4f155899c7b769fbf56a435eaa9c04d47c6ea1ab83b1574cc6d9ab8cca09408222863c5ded5d55fc7b9e7fc2639c1b453400cd3916d779dcc44
 EBUILD profunctors-5.2.ebuild 1093 BLAKE2B b2b719b7b76c3295445ca78ba0ba84d27bb96bf36e2262447d62bb7e47a3bfb8fdc4b953ddbf8db20333c09286b182ede40f61057b482e3a2d8c8171c473008c SHA512 756074685e28c49eb898db3717a32d9eb202b4b0bff19f572012489e3a1ec6afc7959290edd23afb04067f3d8608e0d06893a64b7bc3b207dc6f1be1411bfb71
+EBUILD profunctors-5.5.1.ebuild 1102 BLAKE2B 8f2830db8478127e6afb3221cabb9cf5f08eb908e63dc94690343e7e7259ce47cb923e298506b70eeb9dee663ef6b65fe1c9ffb74a470f28ad4a2cd768f66927 SHA512 6654b1377d9d6326454bb0d2b630c1742c6d3befcf15a0a504c1896b182e9958958deca6b28be24f406a9260f39b99e4721f1dcd5a43df50be9187272adf619f
 MISC metadata.xml 396 BLAKE2B 59cd2345f6fa525365975734826b7134123743d4ccf9495f12c7b6de3acbcfa4f8859430393fe732ca877d6eb305549becc7644f22e82f027a3b94c7a7a79871 SHA512 cea3941e4e5bd88ad72b8edafc079775c13321105c63fd9bb2da44e3e660915f792513d958d021bc8f51572f076348a593a3d5ef17d59ce180fb30a2e1415458
diff --git a/dev-haskell/profunctors/profunctors-5.5.1.ebuild b/dev-haskell/profunctors/profunctors-5.5.1.ebuild
new file mode 100644
index 000000000000..af45db76dac3
--- /dev/null
+++ b/dev-haskell/profunctors/profunctors-5.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 profunctors package"
+HOMEPAGE="https://github.com/ekmett/profunctors/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/project-template/Manifest b/dev-haskell/project-template/Manifest
index 95e3f0cd29b2..8a4708c70b1a 100644
--- a/dev-haskell/project-template/Manifest
+++ b/dev-haskell/project-template/Manifest
@@ -1,3 +1,5 @@
+DIST project-template-0.2.0.1.tar.gz 8321 BLAKE2B 30bc962a82cff1a6c48c74265de6a2e074e255e84508ec3d0e868a418e2941ddb6cc90b1f5e13e1f65518efaeee918aad4f78d38e4c5f546f9ef0bc9dbf34459 SHA512 bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea
 DIST project-template-0.2.0.tar.gz 8251 BLAKE2B d8f15dbb5ffb221dbcfff8152ecbba1701cca7c70a4e5c1c62a4603de15ea028b78035d8b0a97550aed6a4eba0fe8f213b0fe3d957cb259da79f73dbb90d3dfa SHA512 923c0d9e5cac14c05474adc743cfb8030ed8e08e69c4eb35b77c2cb1c64b44f10058693d1a5880ba983040ea9dbf1f28f815cd274a75de302f3afdb928210cad
+EBUILD project-template-0.2.0.1.ebuild 902 BLAKE2B b1cf113ca69d8ed9e3d9e5bf11a1a78ca6f539bcdddf5eabd75a10baa9dca3e2db3e04ebeaa655fb0c920fe25abc126426460ac10d65f3b94339561870c5fe50 SHA512 49a6c4ae1aadf94826702acef488dde863b606b8e6a326aa196e39ebfd17ceab7fef340ee0b340f072f1cb001123be8f25fd7d2b23a4c95e849c87adc0b99155
 EBUILD project-template-0.2.0.ebuild 939 BLAKE2B 96e257c03a6eb1782a408977136eb984b288e355fd7b40993cae63587a2bdce2ba9eadf157d535416e346bc9592d22657bc62dd540a24f1eb61f85b8640b952d SHA512 6f74744642279d6181519098ac75f741c2aa500ac132a285307091e691db56abccd2815914ec1ca2839ee49b874a57b6ca84108590f1e75b16fbc99f37c094f9
 MISC metadata.xml 473 BLAKE2B 44833b539388eff5933fd11cfbd44e13e8ab4e2467db43abd30f3dd1ad1321d138fefa5f8159addae0055549dc2b9079246291c8d4e2d1376f578e65d660fecd SHA512 01ad6354d405c737c1e54aef0ff5f3d643c2abe73239a0e3663c7d23d31bbf3cc8f187c98a77393ad13df105e344af384bce6e33570e7a4d60aa2f7e1b307de0
diff --git a/dev-haskell/project-template/project-template-0.2.0.1.ebuild b/dev-haskell/project-template/project-template-0.2.0.1.ebuild
new file mode 100644
index 000000000000..dc702ce20bff
--- /dev/null
+++ b/dev-haskell/project-template/project-template-0.2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Specify Haskell project templates and generate files"
+HOMEPAGE="https://github.com/fpco/haskell-ide"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?]
+	>=dev-haskell/resourcet-0.4.3:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
index 499213d17d63..b2699571cb17 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -2,8 +2,10 @@ DIST psqueues-0.2.0.3.tar.gz 23782 BLAKE2B 4f756e1c394d9e88381f22fa61e27a9ca3805
 DIST psqueues-0.2.2.1.tar.gz 25605 BLAKE2B 3bcece8b6652045ddbdba3a2a0ae78324c1c54d67f39fb63f1915e32878e913c1e86f44959ee8867b1b2c8f5ad588fc6aaf98aac7975e8c032adb36b9e85be86 SHA512 b34ea7301a61760e6487441bf3251ca1f31be88489cf75bbf81049bb74a79e31e9933e1ad5378dc3715e763a1ac4ccd6130e03b877a4ceebcde9f4a3be6fcc8c
 DIST psqueues-0.2.2.2.tar.gz 25622 BLAKE2B 71db99c8fdc93c243f1aacc2fafc1fafa7d8b9192baed25487107f9025e80cb297821c150e5300444d722ed4516e2eef15558da801e1d478f896a899576e71c0 SHA512 0ecaea1fa9e4546f39b3e936422a3fc3c24f3a5f4a5a70c2503038102dc7f7586add40b4efcd3c26e1ded6df6dd368f161664e7ce7790d74da13165c2684582a
 DIST psqueues-0.2.2.3.tar.gz 25624 BLAKE2B 26be1d6c592c1ee41b95a81143253b95143cb2e8ec86344f370ba23be1099ae94d4eede42db65a51b58d92dff0f46f54d8fd9550b3fd5eb1f1aa736231899edb SHA512 7753f5beeccf32841f6be1294f9ddf8627fafddcae5d09784077b41864016247d8fc4bcb901056ea804ecbe3ab93a15d9de221e5623aeafd9107edc2b402121b
+DIST psqueues-0.2.7.2.tar.gz 27455 BLAKE2B b9d69b445173c4b8972e3f4a0a601c2e1c9d96c02b4426c5fbdba7220274ddd4c45138bfe94b23744b99cc0b538d114fb045095c1e9d2cf1d7e1f3295466662c SHA512 cc70bc22568d24b8618d43be7a2261ab7b55005e7e68a49a4d09b323e03954c05fe8d4de2c344760cdfef26b04bc6937bc331f7e310e1bc9b6b512068eed3be3
 EBUILD psqueues-0.2.0.3.ebuild 1001 BLAKE2B f42e7907816984515a5172d9775149526abcac43a80e75eff7ee49506ac892bd471c4497034462b215d67535d00050b0a8885bdc37b19d034f26054f071b18a9 SHA512 a614566e4ab734d5d26482d40fe16699a70528c3f8e48a332fc046012fee87a4aa2614cad8d872e164424d516c3ce551a4af99646eacecbef4e98f23bf47784b
 EBUILD psqueues-0.2.2.1.ebuild 1001 BLAKE2B 3e4e1c867ec9a0dad0eac5b2d65bdaed229d0af513c6fad451acc6adde2a15f31f9bdcf549eb36cd268b1944c18f53e808c5f20446a31428ee36bb137d1895df SHA512 81f57f981592366fd6cc4aa438eff3129dc4c6411e1df8fb56f1c4bd9d684f53059a086d24250d714dfda5c560a7e162533594185ecbc2938f145d3db483beb9
 EBUILD psqueues-0.2.2.2.ebuild 1000 BLAKE2B 36eb4c5037a68d0f2ce9c25f3efe5e9a7853032b6f97fcf222aac9699e2f83cca9cdf0e0668688517535940188643339d91d7051486a233143c911d6387f8bf0 SHA512 85311b10ec08bac7448e3bfbd9f45a4d856a0e41be9f2201ebe7147e705ddfd446b6dd1c12a58493815cbf0c555e9bd5b1b35d87c932a022a1f8534a981f689a
 EBUILD psqueues-0.2.2.3.ebuild 1002 BLAKE2B e9ccfa3c01cc1c6f9776e3c780ccfda69d925bf801f638f72d3882701636ce05719db64b92af33db41ad22d5b716d2e1a0fa83284d7d41454e9292cc90dea8c0 SHA512 b6657621408963eae7140fa5ba8645b69ba56d29ce971b548739152f6e9dcb17ed9c53041676cdd50ce3c6dc6cbccd010058e16bfb22e66c5436707c374843a7
+EBUILD psqueues-0.2.7.2.ebuild 947 BLAKE2B be3dd992d0fc762bbbd1d3fa5fae83ad3c2ada0b13b18b8e4177b0d5951755ae6cc9dfcba8bc8dd53f8e9785fe33814c95c7781713db474c89acc29a4488d643 SHA512 247ab966b6edc80ebf6e7734477bfe9143577db48126312a093ddc40e491e465d2434f95d4348e1bc290cae3284ac83a98f22f3aaa00e9201f384105617332ea
 MISC metadata.xml 2189 BLAKE2B c4e3a8a4a791e9cff160cccefd6332348afcc9faae5c08dde60d07a3fe34952769a9999f091eff52e50d1581ee3df4d50b30855c1bad7b472490e37d9581f7aa SHA512 ba3919a870ed42a1a440995a6337247f6c984d67f3065371eb72c6301a1e316b39fda29cef5814628e54921a849bbc27033ddf7c2f3fc1bd7d3750da993ed94e
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
new file mode 100644
index 000000000000..99369e84cd07
--- /dev/null
+++ b/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure priority search queues"
+HOMEPAGE="http://hackage.haskell.org/package/psqueues"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14
+		dev-haskell/tagged
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
index e676d02f3472..9c8224ef9739 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1,6 +1,8 @@
 DIST quickcheck-instances-0.3.11.tar.gz 6024 BLAKE2B 72b1b2eed0906aa79f557ef158de922714ab80433fe9b6659a80287de3899e935933f35d23d28dfa7b63333084a1cf4907c4fe8718a14636bd155814ad8bf258 SHA512 a19c97810df7a028af5c6190f62bd9c858444ba210bd016eeb37b402aa9ff942a3538263b80d89a9c156189220ce32058fb81b384c1317f96df527654cb59818
 DIST quickcheck-instances-0.3.12.tar.gz 6437 BLAKE2B 28df5a7872e549f55bb09daf9983a0a447e7730babb4ded4b439acd9cb1166c5a57853197438a9acebce926c0bac87f4a737fcf927799748457737db43afb84d SHA512 471e9e4324ca6d655283d8ed149587bdad981684dce9dc5db5db417fb7614d3a1b6d41388af228e4d600b989d2e14e0496af63c09275cce3f132db7d71c35f98
+DIST quickcheck-instances-0.3.22.tar.gz 9939 BLAKE2B 329117de28253bd6319b84a7e51c6428b90fed4ca4f49c7bb127ed1676d2438ce682a80fb819d60df300d6b56c005a9dd424e3b9d7c858119cb0e871d19c06f1 SHA512 cd36e6833752fbc5501a4fe8459381fe3c07f73b706a438effee06bd1b5e17ecb12b1347fdacb65556e339de58ca8ac32480dc1339cb43b1416c4aeb4f714f8c
 EBUILD quickcheck-instances-0.3.11.ebuild 949 BLAKE2B 50a2a977c3555d2b085877d8cb9491bddd7e23600ebcc312f20e99a99468b8c2a089247fdcdc3f090d72ed5b4f76e000d4f5be2c8814289f12e6668cd0fae058 SHA512 0887da4fc8a9aa0e3eea834792721c9eef606205b546c41c4cb4f73bd841ace12b60464154393b5266487a42b7b40718ca147797f51c4c1911faf9895297081f
 EBUILD quickcheck-instances-0.3.12-r1.ebuild 1161 BLAKE2B 5aa7d60299d0c27729d2ddec12c48fa2b4459e79ea2c814be354fbdfbee72d7ad94f8e8bd0e5cfd1ed85858cae1f7ed96d37859a24b8cf54c3b553d7ecb0dd29 SHA512 b615e4d956e70e0189afa4826b2ae7d549ca5954f7866b936eb4fb87651d5f1445bc0d96533a0cb6349655bb9860c55d84b0d6a0111caa99d64614661337b83e
 EBUILD quickcheck-instances-0.3.12.ebuild 1106 BLAKE2B 2baa67d42f21a00ec7ec73c760152f25e4ada4307e2a812e2e5caa5baf6933f8ffffe52dceb05cb29a30505e3057061f19c6a5157748afe2882f6ba2384e07fc SHA512 9abc509f9b0daa18864a7750abac52bf1d915b6cf075ae7e50db9aa62e4cef0018f4ec096ddf0dbedfffc3bb6f6b2cec3f8dec16a60432c68452e2926fc1c742
+EBUILD quickcheck-instances-0.3.22.ebuild 2110 BLAKE2B 2105437e84db6c6cc7281dba467ea6d67496263bc5dfe7e7f8f4196ed5a13a6c6f2d85b3ef87e9ec6cb5158958d1e67ba3392f56042618dc7409168b26052436 SHA512 0406cd5a2ae210c807ddcb1134e031abee4ecc77c1731c97065738c175131a10583d28add97076bc07979ed36bc953e0c19e5bc618fdb3ce9bf1498939ebaa3b
 MISC metadata.xml 839 BLAKE2B d4e97fd85081d8e42a6ee21b0a7b57d7f12c8a7660805a123c73236276d9ac35c2cfbf337c5de429ef4f52e88d386e074e587435e0abe593d5f5249004abacb4 SHA512 27a6d53be280a86b6adae1b34861ee9bf6916aef62968a2944975998d66e8597356c61239175bb06f2b71c9def7bb98234974ac11f54ff3b76b03993c4c87724
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
new file mode 100644
index 000000000000..57aaeb77b538
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common quickcheck instances"
+HOMEPAGE="https://github.com/phadej/qc-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-0.9.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
+	>=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?]
+	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >=4.5    && <4.13' 'base       >=4.5' \
+		'base-compat          >=0.9.3   && <0.11' 'base-compat          >=0.9.3'
+}
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
index f7fa3c5517f0..b301bb87bc78 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,7 +1,9 @@
 DIST quickcheck-io-0.1.1.tar.gz 1646 BLAKE2B 5265db0739e4d2b5fdc06b7d087b0d04870046feafd52cbfe87a458578ea93cf0d19359ff05e3aab1f676c890d5f9a05dccfda44176a4d0c2b1f19befc1969a2 SHA512 440e15d8600f7b0f662cacf176dfb1c00371add4204fad3ffcf56e092d92b3405a2e5a0a6e03b265c83dbc2ff18f3f47213e8086164840d5c8da35b575ebb007
 DIST quickcheck-io-0.1.2.tar.gz 1784 BLAKE2B dc3360c61cb5c6e8f69b9a7e92dc99590cf55c0ab68b4af82cadd3e128abd8e2d902d5958bc7f9cf50a2e058be4c72ff334eedc50c49b65470cee00d9e9e50d4 SHA512 3a3f1ff1bb8fc4924396cc6ba7dc827f41f2d7186707c78325eca3fea5bafa0257cad4d69debae0d7847c10dff88281fa3c9bd63e1882a1fad7c1f3448132835
 DIST quickcheck-io-0.1.4.tar.gz 1808 BLAKE2B 02772839b9934f0a98d7cec02d34b6280adf73440881ee03a6546707547f68cc25a844525a247419144ea96a51d7630c36cb55a36c7fffbfb5c0729e2f638618 SHA512 791e9ddaf973238adb7049163682e3ca7caee3f676f2534e68c0dd84ad9059eebfa3e6544531cb346e2c114586fde6d81247d867e101a8017d48bfaf58841380
+DIST quickcheck-io-0.2.0.tar.gz 1843 BLAKE2B ee6179ed912313a17d0506c35ae79853aba4e31fab90c1f6727b59879bf3b172f739eb6be5186af1aea47342aa8a357bb4565299a820beaf104e642338db01e9 SHA512 02e1f40bac8f31f27c21d1d2df9f226816f9da871092b09f0451a8321e250c9e94887f94889be421c9d0034e0a27b02c907d16eb7da5a4376df42c7c1fbd01df
 EBUILD quickcheck-io-0.1.1-r1.ebuild 640 BLAKE2B fc503825f88640db571681dbe48fa39dc72915b17de203aff94d1425f5db2a5cc2db898d0637da2633c168f5fcea00222b49d0a8601cd71f70e14ba1ef823440 SHA512 7ff240fd3dd27c4306bf08053ee00028a0f182b3404e31991fe7c33bc2b1ef94bbb707bd06c4768ec3f0622aa37dcf2dbb8f533e97506558d4bb3b78ef85b648
 EBUILD quickcheck-io-0.1.2.ebuild 639 BLAKE2B fb06e63df004cebe4795cc7fb6b6d5ed50a61106ebe5ccfa1b20ecd8c6fc32f19138ee97582029d080fbe03a0fd0f0cfd4b2674f8bb8c65dc92cac7e85e522fd SHA512 58f839b2bcf50b79764337ca8e309f5369266ccf3f9049286812451ed59371acfa8d92f6885868c7a7b342c840d3b4093e10cc2f4c1e26a7d872f3e6b6470096
 EBUILD quickcheck-io-0.1.4.ebuild 637 BLAKE2B 9938312587b0980280179aec09c5f7e3ff0f9802cb57389293a75eafe79005c7e0f6c54f19b63c8e69213d3a9c6a04551959cf3f26283fd613ba7b9466f42fa9 SHA512 75ec140128cd12d1d7ad4b1492557b398fee54fd447d196579fdee1a4383fb52abb6e69f054b420f285732da51c01c034efdb54312199832e2fe8f61f17028a3
+EBUILD quickcheck-io-0.2.0.ebuild 637 BLAKE2B e7df3508c8e8633141831a7f68de757002a35f4bb8bcfaff97eadf94d5e6ecc2f6872e8b2f46694b04e0ced5f317a5f2161bfcb69acf5b8d530ca2a5493a3c69 SHA512 b946822697d3814189dd451695d74b7b0e91279047dea073d62279a0d2b1d444385148851ece58587f6a966b44acfb935e2d0d55870e06ab5cbb19697e191407
 MISC metadata.xml 483 BLAKE2B 87b16eefe2052cac2bda82073ea123fad841566592ecdaf48648a5bc397bd61da7e20834a21d90f4e3275b567dba02999b0fb33508806b70a897669819292e42 SHA512 d5f62058fd6c574a87e4c87fec15f0718302019c3a682a616a4ddb7b97b2b12544cc801806ba0e823f61e488b68f701a264a99c5ace84a66b4b1c8658a20a7c9
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
new file mode 100644
index 000000000000..9e063340a407
--- /dev/null
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Use HUnit assertions as QuickCheck properties"
+HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
+	>=dev-haskell/quickcheck-2.7:2=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index ca9418f2fda6..443bdf9ab453 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,8 +1,10 @@
+DIST QuickCheck-2.13.2.tar.gz 70427 BLAKE2B a2676dfd98f8aafa2ccc2e0dbe32d23d70d811e940ec8f6ae7e85b65feef07094d8edd66548961b6217b05eba30e19b6a76eed3b15cdd0293591d97252c9662a SHA512 d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98
 DIST QuickCheck-2.6.tar.gz 26466 BLAKE2B e8b4ba40cb403fe487fe483a133be8b951e36ab1ebe748a32dc22eb490e7f9b5e15da010353777651e65668e8cf5cc4c9919d28becde28238a0ff3ed8292779f SHA512 17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166
 DIST QuickCheck-2.7.6.tar.gz 34513 BLAKE2B e8f8252655426896f899162f374f447960c95ec5d57ec08d23f64fa3ac59040864a13bd455e14d58940c4015e0ca537e08723602a6114ba6aed1f7aafe5a01a7 SHA512 21e17fbe6dfc2425a948c789ac7d519cfb21c48df68b63de68e6af192d9642d24e1e46ba0b356767e2a10461a3032a4742a6608248574ae458fd2f03649f0451
 DIST QuickCheck-2.8.1.tar.gz 38999 BLAKE2B 6c53c760cfe9ac686f9b41a3a440b25cf84f52246bf4a42652eaf1cb3938586566cb597d2ee8f2ed632b4e31d0fa45ce2479e1573cef30e64ef19f06349fc6b8 SHA512 def1f7141b80be5b508e396c069f6f270c9b890b0ce03df41e058092e6dad28ed8c838734814066307777e6b8b93f154d1b0bf9b4a7052318ec018ef0901c1ef
 DIST QuickCheck-2.8.2.tar.gz 39725 BLAKE2B a817a03677fd44fe9554e54b86ba71ba32338845c397e1debd9bc128200f1351acc6262deb1e2b2d26a9c75811b688220c2a02813e7f4ea898953679caa6ba9a SHA512 661b9e5285f56f69f8807ad0679ca4e18d0ac648233d5f6cbcfda548fcfcf3bc1b790c409f66fdf67cc4a3b769a248b43b0cd1abd103ae6d9a596978c5af4aba
 DIST QuickCheck-2.9.2.tar.gz 43417 BLAKE2B e4721bdee29b2e6d4f349758c6355a633fa60574c34fe59a6f7698a4e59ebeec4ad9d01ecd9324723f9495b2819606588c235c74f6243e688d96c4380fec09a9 SHA512 7b8bad1995e6ce5484f627f9edab91cb8d124b63444e9f62b613b0d1558c2639101dd30d6c455e7f66ffa613f704aeead89faceea56eb411ba8ed15472edb917
+EBUILD quickcheck-2.13.2.ebuild 976 BLAKE2B 9a1ba164938a6fe803df96e5b2774dff9f745b222adb9416659c9356aad22d4ca66ca1c3b4e80f20d304e1fa58f518614f5c0811c3d26de2cf225fcc42b59b0b SHA512 aa7f31eca0764df583df869823f8573d3674c96b8674b02ac7b63f33dc186108eb22b283ff4710e2b1f65bdab03e2826b55e393de262fc0fe265a4394682a9c5
 EBUILD quickcheck-2.6.ebuild 835 BLAKE2B 124ac18a03eebae0144b0a1c46da2d7e064bbfc236026ea983358c55a99be39ab4c784bd96096ca3c260810454f82cb0ff9c27b990a8d3491fe80c0bcce58ad7 SHA512 96d0bc2ae34dc2fea8a696cc6d63d0f85dc43f9ba465aa4b4ea97fa2c3c9a10efcb9d74cad8418415d96cabcf9bb2709cbbd2f4d023a5aaaf4998e79c839cefc
 EBUILD quickcheck-2.7.6.ebuild 1056 BLAKE2B d01e70386ba7d2f9af905372320d59ac6987187cc9c38daffd57920df805daaff77c22236170550c370a47cc8c75e85e1bf1bee806a781a7e007b55535e69467 SHA512 b533fe634c5d0737b6932830e86b8dea417a452490b822f8bb762ed354517b82dd6713c5982e9f47236111dd07bf748528b83c87fc2c100620e99f3e13e6674d
 EBUILD quickcheck-2.8.1.ebuild 1058 BLAKE2B 6603057f6cb3692450a731887daf201c8169298854162997675a95e0a1e56839cff42794419ab1d939ac4b1f8781b119dd44966ffd5f034ece9c1ff65e4a5dd7 SHA512 eb98a7523bdf6cf1298f27ebb89aae6ca081cd5698ad0f5d6068df062d6e1ee660c7a94be97e780d47e3e120ab08fde0ceba3aa59bbfa1b98e6d3d10016725f6
diff --git a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
new file mode 100644
index 000000000000..b22abf4396ab
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: +base4,-base3,templatehaskell:template-haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/splitmix-0.0.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-base3 \
+		--flag=base4 \
+		$(cabal_flag template-haskell templatehaskell)
+}
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
new file mode 100644
index 000000000000..6cff3940e8ad
--- /dev/null
+++ b/dev-haskell/rebase/Manifest
@@ -0,0 +1,3 @@
+DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
+EBUILD rebase-1.4.1.ebuild 2186 BLAKE2B 38260ed79e87c79f6d05a06806842932f09b9165e6caaf9a3800c9f0349b87e0d255df2f934476412494c153076c33fca31beddb9d10f60611987420eaa2c83f SHA512 9aed2662cc3b70af4d702bbec1d73c233b62124f8b17e61100933a8a1f412e75a87f8dedd8ffe8ba3b30e5902e0999d2e0eee69f49447b3dec29968060226e70
+MISC metadata.xml 1156 BLAKE2B c94eb0e35285de40e539f52d34783668348b1b654b4c272e727214bb25a4c0cfee2b0c664bac0a74624b2e5f301e7d84719a8479ec63126a12164a4e3228f93b SHA512 9233440a20e9736ca8ef80d2e76265055e63e4382d460d55dcacd5a38a900641bfabf64864208e6b823be3e9373918c4db24451bfdd0cd4f30ffac895132c67c
diff --git a/dev-haskell/rebase/metadata.xml b/dev-haskell/rebase/metadata.xml
new file mode 100644
index 000000000000..f74069f161de
--- /dev/null
+++ b/dev-haskell/rebase/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>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package is intended for those who are tired of keeping
+		long lists of dependencies to the same essential libraries in each package
+		as well as the endless imports of the same APIs all over again.
+		It also supports the modern tendencies in the language.
+		
+		To solve those problems this package does the following:
+		
+		* Reexport the original APIs under the \&quot;Rebase\&quot; namespace.
+		
+		* Export all the possible non-conflicting symbols from the \&quot;Rebase.Prelude\&quot; module.
+		
+		* Give priority to the modern practices in the conflicting cases.
+		
+		The policy behind the package is only to reexport the non-ambiguous
+		and non-controversial APIs, which the community has obviously settled on.
+		The package is intended to rapidly evolve with the contribution from the community,
+		with the missing features being added with pull-requests.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/rebase/rebase-1.4.1.ebuild b/dev-haskell/rebase/rebase-1.4.1.ebuild
new file mode 100644
index 000000000000..7aa91c52580e
--- /dev/null
+++ b/dev-haskell/rebase/rebase-1.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A more progressive alternative to the 'base' package"
+HOMEPAGE="https://github.com/nikita-volkov/rebase"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?]
+	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?]
+	>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
+	>=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
+	>=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
+	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?]
+	>=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
diff --git a/dev-haskell/regex-applicative-text/Manifest b/dev-haskell/regex-applicative-text/Manifest
index 1c0d3b98847c..0eb57db48750 100644
--- a/dev-haskell/regex-applicative-text/Manifest
+++ b/dev-haskell/regex-applicative-text/Manifest
@@ -1,3 +1,3 @@
 DIST regex-applicative-text-0.1.0.1.tar.gz 3975 BLAKE2B 87623f18720173712b8245c86902a30471779e27a5a2e8a938934f5a1b6cd8ec9f41e480f82cebd29db2c9e383e983a6f6ba03856e509fb30a67c51b158707a7 SHA512 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339
-EBUILD regex-applicative-text-0.1.0.1.ebuild 669 BLAKE2B a3621add2272e5a9cad9d125b65ad23829a753060f0e91e0300065b1312f002d4071b05f79e49183ac32045a498f2df8e08a8e32e13c530134b650dc6139a032 SHA512 d166e10cdc35afd76f238a664b310f8555398d17e5d9f26648eb1c2ab6ad218e04ee3c9b691bfad967f4f23d32096c54c325160c818d51d955a33eea4b3757f4
+EBUILD regex-applicative-text-0.1.0.1.ebuild 753 BLAKE2B fc0357558ac9183018c364fc63e6eff0d15801b4d9f493552a01e923309e6d4c0d079f049fc648f6b072df241090519bf696489f934849e1b81122e68792be98 SHA512 8eb4f6030b664acd9a5b0e6a4af01dc456cc2d5c0f5500c9524a1aa1bad96f0c095eaf1219fd1aa0a60629fe86bf31f27128402a60ac569dddba03f3fe55ae68
 MISC metadata.xml 345 BLAKE2B 6704253b4f88074897e127230e324c3a73e121e9724bbadcae265f479bb3b6f906d4eb3d51e4146097355a26359544d3939477eebee94d769a980986d1d6c9f6 SHA512 4b3eebf8920a71985f656c1f4c896da4d102473a1031473acd08405c58e8c5a1ca3c34f38f82846eeb667ac6d1f4626354ffd094550fd953d4fa03549070245d
diff --git a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
index f3c8945608d0..5060f2bba01d 100644
--- a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
+++ b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.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=6
@@ -24,3 +24,10 @@ RDEPEND=">=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-appl
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.3 && <4.10' 'base >= 4.3'
+}
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index bb0754cf0728..4dce2552b94b 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,3 +1,5 @@
 DIST regex-base-0.93.2.tar.gz 9156 BLAKE2B 160f749c5c5e4c9911c18a4ad3dbe46865c9872f419457387e249747c5aade2cd2afae1f80757d3c0788398f332ea243f35e826f77f220517480ae4b42928a21 SHA512 4f6269cb1c1fefa2164d999e2e787118edc5fd88e356535e50f143d0b98de4fa1854959955e183aed27a77335b81063a2385bb6bdeb8cb80e7fdd812ab96d22a
+DIST regex-base-0.94.0.0.tar.gz 9679 BLAKE2B c998f856c51e3d3abfdc389ea6f8451198f6c6f2d0b3b56c79704febb53f9a3d54c7ed57ddabd10f97c465e1f591cd7f06a4b9c8aaebc6e67fd2741d26fc69b2 SHA512 4e7120e1a2b63fd3e4e15cefc540e82ab0949f51e19f495d4cf4edbe8428ffdf2f114df3504f66049fbb790d5310c59daaf0ed3a71c5acccfe205dccc4567045
 EBUILD regex-base-0.93.2-r1.ebuild 726 BLAKE2B 9f726da966c26baa38bcee4e75cf8c642e8ac3a5a45b4d0548d349c7948bb5311a77bed712eef93b0ebd7688f0e407a85424a739e81675f742d04528070e1128 SHA512 a0e5b1d7dfd6f30f3b171eeecb1d41cbcb8c6bf925aabf91d650f1e811c1650109c9476684e6ec1806a19fa68ffded7c1d952c310be8213db237c9869ad2a27e
+EBUILD regex-base-0.94.0.0.ebuild 904 BLAKE2B f8eb7523d0b211db14882871fa8daba7f0d7d28eacd110c53c35395996e45aa79779cbc1578973c9d362bf50812278a1661a0f8d7d5be85c085988f5bd17db0b SHA512 805a16270bb4085971ad748c186db90df8726cd05700bffd46dfcccca0ade1639bab5105fe278564368739b2c86a1c374ed9f7517c8e248b04837fe14d964cca
 MISC metadata.xml 307 BLAKE2B 5ab47214d8394b181d6154e5a14f96b81e75ffcaac86044ce2b8829919c57130578dbf2630bc9920b3871e945461bcdb4b1f24a5a1c71247cf8ddad2e28129a3 SHA512 c86869a5bc6099f9458564de2b1aa31002fe4bcbcfc3a5e87f524f38f4e25933e3eef11979d19276a10208bf8338fdcd20edb3cb26d8a13ace39cac6634f47a9
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
new file mode 100644
index 000000000000..2714a28f0916
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
+}
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index 684ddca6e9d5..f74f92afa293 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1,3 +1,5 @@
 DIST regex-compat-0.95.1.tar.gz 3968 BLAKE2B 5c1bf6b9e7aa148cf7b033f08a9d32d7e508e73da88e7c6b2d27b2549dc7e44e287ca3010bffb37fd3fd1d7dbf4060a2772f64e1ecf531ffb5f18098db63b0d2 SHA512 9fb38b001a4cdca5b3630d88e8fcb2f359f6e8dd49fbe13d5e2a1c99b4978b33ce639b344445b27daf68abbae1cf2c9905d48ff68a81e02b4e54aa92dea956e2
+DIST regex-compat-0.95.2.0.tar.gz 4019 BLAKE2B 13825a59d2edaf5df3c4726f3b040d9354eaa95220cc907a74e5141aa95d2299107bfaa5037d327011bc3ccf3f0aeeb00ad9bd086e20b393eb898a19a46e5ca1 SHA512 8b1b421f5e7688a1d4a61711a255505a047e90e9f9283a8cf2ebfa9774631e8fb3a071d61877ab22548a0c63e30237603196f043dac9cb64da4df2fdc4422300
 EBUILD regex-compat-0.95.1-r1.ebuild 823 BLAKE2B 31b79a65a708c99b2fb8b8774c104ecf85198b6a3f8867fcb2270d5f47770dd4ba47a12f074157651caa82d30ef10791bc0d44c1acec16b07672e9e5435b8531 SHA512 f05398e7d3195b00bbfe9863d6d3edd3243961f5191c9bf07dc430dc1443e990dcc925139916c7e357e6cb464fd286d4dc122c218db1d98149da75e05b1898d6
+EBUILD regex-compat-0.95.2.0.ebuild 932 BLAKE2B 010da5315bb381871c699c89713ae2f982c59bd286822e49be1ef6b92c7553fab18b214eadc8c5541950463757756d6b17fc81ac134d4ea1ae2faf99c3aec697 SHA512 22d97e72bd840d5948b001341cf6a6d870b32c8b1203175d9ea630217c94dd9214f564e305b2e19fca1697c3d73fc245bb6f57c7afcedc3bf44ef98c387a934b
 MISC metadata.xml 307 BLAKE2B 5ab47214d8394b181d6154e5a14f96b81e75ffcaac86044ce2b8829919c57130578dbf2630bc9920b3871e945461bcdb4b1f24a5a1c71247cf8ddad2e28129a3 SHA512 c86869a5bc6099f9458564de2b1aa31002fe4bcbcfc3a5e87f524f38f4e25933e3eef11979d19276a10208bf8338fdcd20edb3cb26d8a13ace39cac6634f47a9
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
new file mode 100644
index 000000000000..43f773662051
--- /dev/null
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: +newbase,+splitbase
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://hackage.haskell.org/package/regex-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base        >= 4.3 && < 4.14' 'base        >= 4.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=newbase \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-pcre/Manifest b/dev-haskell/regex-pcre/Manifest
index ef9dd054e21d..32aa8fd2a3b5 100644
--- a/dev-haskell/regex-pcre/Manifest
+++ b/dev-haskell/regex-pcre/Manifest
@@ -1,3 +1,5 @@
 DIST regex-pcre-0.94.4.tar.gz 10814 BLAKE2B c6d634e240194d1099b4b6126fedb00bafb9f6118c9b11fff87d862b45e84b87005c6b2337871b17687dc63d15a74203b820aa04dffbae9517af34cc27dce71f SHA512 b14db2fb88f9a70b60cfac0ecc242554929d03982b7ffef18e36a2a8ddbef3bbc3f7f1ccb549aa805aec43f30b3ca22856d2e4315dba15e9c22ed34638dba92e
+DIST regex-pcre-0.95.0.0.tar.gz 9766 BLAKE2B 05df9a80021d436fe1b7c6d6328cf23df96a481d55407f3e737ab70dd92a73f70a06eede4b3355c743cbdb813a1ae422c5aaa1faa30c16608fa04d513317d8ad SHA512 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
 EBUILD regex-pcre-0.94.4-r1.ebuild 732 BLAKE2B 916c9e6a94d047200eac60c561bce413ceb79f04d524bc49c28e7e9796a088343b74673c8382789a5b2be194f4e0397bbd4233aad974f759b93fab2c63f3a0f4 SHA512 088ab116caa3ac4cf1f1a2cd061accc9f4ee64324759ba32fcbb42b46aad7a2badb4d5ef89afbddd57c149f554969e5d3f9972eabbc835fdf0cb7aa4e9b98018
+EBUILD regex-pcre-0.95.0.0.ebuild 989 BLAKE2B a31d3bc8c7b9d8555e774259617b2620a2a1ed8cf06d8884cd0a68101f95cc6f8ef1b9ae85dcf7bacb33b38d14e2a970697719eb1b6423ae21a97fef26f5b7c9 SHA512 5fbcee73366b58367df42011760c56e4e948be16280d1f5d25f33004ab546b2952f439ee19d5d03c6ce367b5b552fee05c8db217a09c94a92d7713277ef8d134
 MISC metadata.xml 349 BLAKE2B 2a3c999e20b1e6ea4b1da5b942f84f326f93f5157df07d21c989d792b44d9ef9f26a31bed0004fa7445367fda8b3d1c7fe6734794437c96b62690798ff868978 SHA512 935f429a9ec311d5d4a6d78f30852946dc2857c6018beddd9b2e0a3e035c0e1213b5e2024828622f1ec2777be9b9ecd0dba41fd97e53cbbdafb8868983d7b432
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
new file mode 100644
index 000000000000..22d4937215bf
--- /dev/null
+++ b/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +newbase,+splitbase,+pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://hackage.haskell.org/package/regex-pcre"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=newbase \
+		--flag=pkg-config \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index 897de5851ade..d7c14afcc0cf 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,4 +1,6 @@
 AUX regex-posix-0.95.1-ghc-7.5.patch 554 BLAKE2B ceec0b6593f49a6ec9965c988e8b440a87ee11b5bc1e210d4466c8a84bc8044c34fcda91b8a359b763b9ef47b697f59fe1bdf5711f9a71ea2a33e00bbb717c44 SHA512 ea77dfc50967f5d3c8beb82ece23a1c48168fa59c08d7ce58b16c22c708fb4e49c76ab8b8aac0ef5306a2babb8666385f916295bd77f57b149cad5991ebb5516
 DIST regex-posix-0.95.2.tar.gz 42916 BLAKE2B 3b0192bf2eac5cf2376a5cfd73be4f138be2074fd3b80fe43c659015a2a731a61f1cf6537dd207c36e8fa893737b30f61516f23e815a8da52dc8866b36fc58d0 SHA512 2d22951f0302de144483d2c11d0711dc2cbd2fc6a0eac0126011eaa6f577837ae8c2a9516badb4beed6c18311241458dd6ad9f82a11d6f3763891880ebbc8c41
+DIST regex-posix-0.96.0.0.tar.gz 12529 BLAKE2B e949fd28a8fee8c0ae056dc0037dc9eb03b3814145740a053752ac121f6ffc60bad5db72832626340f0f201d06ccc649225af9506be671f63fd5b850e20bda6c SHA512 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a
 EBUILD regex-posix-0.95.2.ebuild 653 BLAKE2B 93890d896d58168932785ade260b4b3feaefe20b68948fad65bf609241b1c1d5e9f52880a9f9b535e4c04f5a56e268f24361da7d017689d73020bfcbd5e0597d SHA512 4742863f798de1f3330004fbca6c5288f0161b4728deca22bf7653eb9d123d966fd8c72306482ffab109e5f920ad6735f72bf7860c9ed4f5cd34464e2e04204c
+EBUILD regex-posix-0.96.0.0.ebuild 1027 BLAKE2B 827f78519f3641f81e8dfb4dd1fe9a87df27656be57edb1f004834137c1e42d8ad0b8e8a8115d6fa2c8018442339252157f6289be06f17b53992a776c29bd872 SHA512 4f36344d4229b0ce414be32ca91a959cd8ef34d34de80038fa6620e4df0acc7b68ca11256ac3930dba58dd8fc6b3c8db461f361ff70025428397cbd607d59cf1
 MISC metadata.xml 409 BLAKE2B 521ecdf88b2947d4a498d4efd608950ac471dd05d501d767e047711f77c4847e0ce1d32d5710ce274d77591e2b7da7ea60f1e71a797e3b22166b531d67108f9e SHA512 7268260f6f6f43ac70640d2dcdedf01bb465c7e5d34c0aec154e67be1e1a13560be1653c6a47e38cd9aed0fa02fcbc64ecb3fc9cd13ab4221968d9c9f5965626
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
new file mode 100644
index 000000000000..bee82d920301
--- /dev/null
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +newbase,+splitbase,-_regex-posix-clib
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://hackage.haskell.org/package/regex-posix"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-_regex-posix-clib \
+		--flag=newbase \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index bbdd50a6705f..4611344a7a51 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,7 +1,9 @@
 DIST regex-tdfa-1.2.0.tar.gz 66039 BLAKE2B dd9a0d00e9608968d9e3a95428bb934661c17847645d73f5c1c0a6a96f83df8d99520971b245f217ea0dc2634ab70c7b7fe027aeacd86190d9694a997f14d01b SHA512 d4419c5d5062dbe63ec5931bd9f11020b3aa3227abdb66cac0732417e34cac9a3a9d564bba8114a77570e3b1bacce404062ab04536dafe10b764886af8e491c9
 DIST regex-tdfa-1.2.1.tar.gz 66108 BLAKE2B 105b048e48b98197b776249d99b60ccdcf6c81c2fddf362b19751abebffee6bb8b41d5549724218adee5b56f1ba80bb78b9d646c20e91781afd2cdc4148ff2a5 SHA512 04d3c7235c126695ceaaef0bbd5e6ee6ebffe7c4fb96b9f5a3df28bebe02a680cda870f228bd2e0e30ed98f88eeed4b4d4cdf6dc5ccd0b8e45c8427b6d7fa85d
 DIST regex-tdfa-1.2.2.tar.gz 65969 BLAKE2B c533dd7fd39e973ccf73d1bced6c35e65ce3a57a543e3e6c15c191748c2073c7d4a230f995168a2c52f4eafe152961950edcb28fa72c064a70bd058a49a28896 SHA512 86241b9bfa27351302e4ef18fd2cdc8a58341d6a8fa12c92e3ebb11cca93e58e5a69b97b545c61ce704bd6e2ac0b7a7c1a3555f138ba5ee9cf9728175f43d26a
+DIST regex-tdfa-1.3.1.0.tar.gz 77767 BLAKE2B 2993a19f68ad167446ac8e7fbbd3552176de5cf35ca69627fd8e0d6be877986b90253dee13aae1f95f5328b6b30bb96c2ed594403c1bac1ef4d8cf0283675d5e SHA512 becac929003ea2c1a8fe1e890a53d3cb914eeb02090a23d014120d04ee144e24c2c7bdfaadd58a2dd70ed49df1e0059a3f8a94faa4ce0a6efd533ee6019c951f
 EBUILD regex-tdfa-1.2.0.ebuild 839 BLAKE2B 9a8ffcabc8bd2d6343c320edfe1b41e1c6a449d7183ef75e10898e21652c1b5d89f4fac4ddae472b7f56532f7747166baf0cc6da391b9f413b0ec502c34769a5 SHA512 88b17db2e2b7b2274c83120fb3ca8126e9dcbb0706f3a196cf6e9d8df0e421cb5015fb6b3e9532669a26925105349379d59ce498d829c480c56c77fbf5673319
 EBUILD regex-tdfa-1.2.1.ebuild 839 BLAKE2B a3f2715512441f7cacb65423e55017c43d976db801a739b57f9f168247762d91d0fe9eddd5187711f7b320a797eda322423e67848226665bf4b500be74b7b916 SHA512 d42a73d5d416edffc651e320e05150543c9b81d024b3e4238272007c01c1fc92ffbb46c2cb420f178f06ea7d8b3197cdbd0bebf60d8a78f551a766d2ebb2a9e6
 EBUILD regex-tdfa-1.2.2.ebuild 782 BLAKE2B 05b96af14d1f2f0d20d28158cdef2f31aefa584cef3cd489f293a38c053a4b93124dcc341b0c3ed34b14c9ad65a1be2246e2d30c18b82c0f3cc20f9938f32a75 SHA512 198f8bded69bc1576511477c6de6690c0b60bb58194b53cfa0258f4b88d4b0f11ab4759ddaaef90c3fdaef6382d3d9bb8201a79263b324e0ca9474373f7c5d0a
+EBUILD regex-tdfa-1.3.1.0.ebuild 1361 BLAKE2B fc417da59d99ae293289ba57235a4261af81082a9e9ccb7e51e31d7d843ef0dcb2c8a077798a33c2701dbd16e1523a6506abc2f8432b7ab62a859e272385d58a SHA512 af622cbd40104bf678e6d1c2189c67d35f8f1465498855335acbd6fed533850267cee1b7b7e4bc5fc98f959edcfc8633722084cb61de6c97faecf8dde53490f6
 MISC metadata.xml 444 BLAKE2B 0d14326afe1d69dec62f60c7b41e77ed8dff408f212f638f4a2f5eed25adc1865df2a6994c71e25b6a7394d6fbf4c40e75296bd08869e509f614362bdea3ae5f SHA512 6b72b58d486e2613a573d36ec714244b8bb9b23cceefe0714a4ca3778522a9f6435c4055b442d7ec465b4b89d6c5edb61890250b98d4d077d11638a84b711937
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
new file mode 100644
index 000000000000..123b86bbc5bc
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+#hackport: flags: +base4,-devel,+force-o2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( dev-haskell/semigroups
+		>=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base               >= 4.5 && < 4.14' 'base               >= 4.5'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4 \
+		--flag=-devel \
+		--flag=force-o2
+}
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
new file mode 100644
index 000000000000..9abeafdcd5c8
--- /dev/null
+++ b/dev-haskell/rerebase/Manifest
@@ -0,0 +1,3 @@
+DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
+EBUILD rerebase-1.4.1.ebuild 602 BLAKE2B 012b7f48e9e0a3c312948224081e0fe20e87e94f22af5ea6b1b9a6998c67bb509f0e251365d75e2d89c33bd8dc835bd83c0b059be3fe191f882e6574f95cc151 SHA512 2f4b8c3f796e6c8e4eecfa0cdb365df69772e65679c38fccd0b757af7ec1351f8a9d82a498534e72b3957495d32e3f354d80b4b9eb1b253fa5a7536fc8cb77f6
+MISC metadata.xml 460 BLAKE2B 977cc8dec4e7052b62ee4e45369c44a917c249de0c2cb4cb4afd71d154c1543657e6ab6e65f58dd479f336a3051cb0bf1ea7f81b690ba443972f21bbdf13e918 SHA512 23581ab5dfbef7bd3557e6305aee8b6b57401c23b417e2ea91caaa7f171012a19da475c84846d0fcc3e18c5f9739705acd7addc79ee2887f2c4b501c4879fc65
diff --git a/dev-haskell/rerebase/metadata.xml b/dev-haskell/rerebase/metadata.xml
new file mode 100644
index 000000000000..2e10d5a26a21
--- /dev/null
+++ b/dev-haskell/rerebase/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A rich drop-in replacement for \&quot;base\&quot;.
+		For details and docs please visit
+		&lt;https://github.com/nikita-volkov/rerebase the project&#39;s GitHub page&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/rerebase/rerebase-1.4.1.ebuild b/dev-haskell/rerebase/rerebase-1.4.1.ebuild
new file mode 100644
index 000000000000..bdbac1e730ae
--- /dev/null
+++ b/dev-haskell/rerebase/rerebase-1.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Reexports from 'base' with a bunch of other standard libraries"
+HOMEPAGE="https://github.com/nikita-volkov/rerebase"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~dev-haskell/rebase-1.4.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/resolv/Manifest b/dev-haskell/resolv/Manifest
new file mode 100644
index 000000000000..f4c866abdf2b
--- /dev/null
+++ b/dev-haskell/resolv/Manifest
@@ -0,0 +1,3 @@
+DIST resolv-0.1.2.0.tar.gz 156710 BLAKE2B dbad867d764db2075724a06d9f9dfa8dff882683849883cb9ade6d0654fefe9f024445cd137dca516b80cc2982544b794de7c82fd5d5f482a3891422a699f2c9 SHA512 fae2d0717a109b0d6cc19c51c773bc68c64c0048b9d930528cf5622ee270ebaddec180c1d444542e8eb036262611f5b88deadeea223fb2ef2b15b41369a2376e
+EBUILD resolv-0.1.2.0.ebuild 772 BLAKE2B 1998e676440fe9203b23c886aa3cfbd4df3758203d1e452e9c3c76eb8f557299e2ed0dbc64e4fc5efc4f65a9840d9d975141ebc99d9225f469ca904b0d03a511 SHA512 8f779635cc8920602d0cd8c76d5721b3a1ff75dda990ded6ebe854188d0da5e4e5b627bc5a77f2a5b24edf76a96bc87c53b961ec7d617301618d1cef8610f4ca
+MISC metadata.xml 1960 BLAKE2B 8b9024347be335cf065c2de0ef64dbb9473fb5f90b451b0cab65328f69d9fc5e7e271cf0c2c6b1172eb064ed8310930b9339e769fbb74bbdf55811c4cd67222c SHA512 c5c19481ca52a233c61124462b0560aed68d6c4b9604c9d401f42d2dfdb7556b54ca000133f658fc6c114b481d94b6a92fc365623bb8dd52c1de11179bb02259
diff --git a/dev-haskell/resolv/metadata.xml b/dev-haskell/resolv/metadata.xml
new file mode 100644
index 000000000000..9990695ff28a
--- /dev/null
+++ b/dev-haskell/resolv/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package implements an API for accessing
+		the [Domain Name Service (DNS)](https://tools.ietf.org/html/rfc1035)
+		resolver service via the standard @libresolv@ system library (whose
+		API is often available directly via the standard @libc@ C library) on
+		Unix systems.
+		
+		This package also includes support for decoding message record types
+		as defined in the following RFCs:
+		
+		- [RFC 1035](https://tools.ietf.org/html/rfc1035): Domain Names - Implementation And Specification
+		- [RFC 1183](https://tools.ietf.org/html/rfc1183): New DNS RR Definitions
+		- [RFC 2782](https://tools.ietf.org/html/rfc2782): A DNS RR for specifying the location of services (DNS SRV)
+		- [RFC 2915](https://tools.ietf.org/html/rfc2915): The Naming Authority Pointer (NAPTR) DNS Resource Record
+		- [RFC 3596](https://tools.ietf.org/html/rfc3596): DNS Extensions to Support IP Version 6
+		- [RFC 4034](https://tools.ietf.org/html/rfc4034): Resource Records for the DNS Security Extensions
+		- [RFC 4255](https://tools.ietf.org/html/rfc4255): Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints
+		- [RFC 4408](https://tools.ietf.org/html/rfc4408): Sender Policy Framework (SPF) for Authorizing Use of Domains in E-Mail, Version 1
+		- [RFC 5155](https://tools.ietf.org/html/rfc5155): DNS Security (DNSSEC) Hashed Authenticated Denial of Existence
+		- [RFC 6844](https://tools.ietf.org/html/rfc6844): DNS Certification Authority Authorization (CAA) Resource Record
+		- [RFC 6891](https://tools.ietf.org/html/rfc6891): Extension Mechanisms for DNS (EDNS(0))
+		- [RFC 7553](https://tools.ietf.org/html/rfc7553): The Uniform Resource Identifier (URI) DNS Resource Record
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/resolv/resolv-0.1.2.0.ebuild b/dev-haskell/resolv/resolv-0.1.2.0.ebuild
new file mode 100644
index 000000000000..f488bd337f9f
--- /dev/null
+++ b/dev-haskell/resolv/resolv-0.1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs a port to new srcloc
+inherit haskell-cabal
+
+DESCRIPTION="Domain Name Service (DNS) lookup via the libresolv standard library routines"
+HOMEPAGE="http://hackage.haskell.org/package/resolv"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails to build test suite
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+"
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index a050463755f4..5b765db15612 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -4,10 +4,12 @@ DIST resourcet-1.1.2.2.tar.gz 10665 BLAKE2B dd7c24c11b6900a3a5e76c0590116bb6a9f8
 DIST resourcet-1.1.7.4.tar.gz 11674 BLAKE2B 97c9d36d1b7142a6ee36335279f9345f8ce25cd9847df490c143de03f1e34f15df87f57cbe0f77477737bc20f99a1b2ff75bd60dd6fa6809d11db7f749e28ddf SHA512 b61c117a12762b15be2de2676c4fdf9bf89b72ebc4875677a70f5b66358fb49ddd4753d6b1a541ae01dab41368b4e30cbd796caebdc4b8cce6ebf75c9cef08b5
 DIST resourcet-1.1.7.tar.gz 11627 BLAKE2B c0a01bcd14e5e4a988ec41ec6014eb8021217c8bb016f9198dfc5878071ffaebb44be9e56717090505dc710132fc984d9d0db61f198a0d065160c303540c0954 SHA512 27a348354fddfa348882217cb7a66987d843c87658c53f7d173276731e11cfc3438312028d4c35f7821db087a30227979a6d1018bc7e4ca516145c4f2a91a231
 DIST resourcet-1.1.9.tar.gz 15215 BLAKE2B 7ed72548d067e8c0382cb7e0fe423d14b3baf8df742d24375e0886f87e9df8ed480d3346f0f2b86e9660b0eea57cd5da07a7deda938e6a428d911773712a7b42 SHA512 e26e627c19198c1f25e368dda67ca15d52ad41eea70a81acf8ce244b30880b476d3d33b097199d12611bf80a3521196587d669684b18c47999e7abb5c00a7ab9
+DIST resourcet-1.2.4.2.tar.gz 16862 BLAKE2B 041997adc9db44e4e99d878f001191eff853fc2d473f544a107d3526924273bda32de9ff39ebd93ec6fddb81fa1dd1180f6a6e1c06361a33486bf7c56a98c750 SHA512 9f415a902261e64916e8c937a3d464eb29ff3a59fde511a17304aa4aa58c01f882d29c304375a0f23d87fa770763f09c84e428ed9f75c9b187fe2aabbbf4adf2
 EBUILD resourcet-0.4.10.ebuild 1025 BLAKE2B 81f5f5a5374b6a32387d6902792f0d95ac0ca02a4f70d4afa5e68f22f18b83bb4741dd49e123416b08db2a9442b654b5c75c53291cfff97275aaa5a50f18ed3c SHA512 1dee9be1c3af68560c3343b30fe6049e058344b2f3bc47161bd30d9bc1264cd86695dc014b80f6022e6e4bd2e1b117dcfd75d974d23ae0186c7cb8b51c89f865
 EBUILD resourcet-0.4.9.ebuild 1025 BLAKE2B 708d8b965374106d0e6d55e7c8cf8bed6ae7ff5be44d9d605d7a77a4c0662e1640efcc90f3e9932689c2fea8a18f3ac2a9122cb1d2ca410171638b5bd0df1eea SHA512 757de18170490067e93c8d16d34ab0125d243cf48d3217bcc6a6cdeb83e03351177407ce3125b720fb9ce034e85c2383e007f220a55ef6352a12b41e97084763
 EBUILD resourcet-1.1.2.2.ebuild 1067 BLAKE2B a6e065442fb44e6b5794ab1c736c0664df2ae0f60e205bbdcafcd7ae59c3212c390d944f7822a4ef682816c19b3725640354ae67dd9fb873eff4a7cb0f6d59b1 SHA512 845918f8ecfee96c39715290f83ed98a49bb34dbe2bce55454c00700826618c0e2586754415dd9c0e11048653699833328b46c75854180216f576965aba5c87b
 EBUILD resourcet-1.1.7.4.ebuild 1118 BLAKE2B ccda5da53919e2e820d432fc12d59c7687dde23df815553e0169d3f02c32c88edc5ffc254b72fd6b1767ea753092dcc22d6f2bd73761fa6fb6eae3b0b3902f86 SHA512 999e4256f26d55224c35587406e7c80b4c9da4ecc0297a5f45b32ec8888a8ffd5d94aa9ae8bbf2d95baf051d792e3fad20826653f19cccbc8091f467f23dcdeb
 EBUILD resourcet-1.1.7.ebuild 1162 BLAKE2B f7107cea0b70a21f693d689e10d863ec6f6c94ca0a55e61337de3e6dfa5d32e70feb8efd891b033fd63c1f505597a7faee388eede58a9d42abc592d3c5e94e8e SHA512 7b01d1957526186ea53b70a63779eddf45c702115d45ac74afaef83143b535edddc2b5f55a69a81646100618896289986e9f81b29ce8ead90b1d93ae753f552b
 EBUILD resourcet-1.1.9.ebuild 1103 BLAKE2B 545971bfce2f81088f39487090eb646f4ea044ad82d34d8fd06bdd4d58d4f5ec6878a8b3973bfbef77d9b0ae7e0948f530d3685b789ab292803f68ee4ceafc01 SHA512 7b216b482426f336dd860300b6853c8c0f829232bfd08a5d5c7617b8fe0a77e789d96f61f746726bafa7861819528bdccadb54c3596aa1396130687f8683fa7d
+EBUILD resourcet-1.2.4.2.ebuild 856 BLAKE2B 1c01c4fa82dd2a41c02c666a81969ff3097e3dcbea54615da799b5574b83e1183899d2fbe8434c76d42d7ec916b4332a22d032b5ee4530ef8e61fa9335f00a04 SHA512 ffa72d193e2c98d8942ca2daaedf750ef601441b6911faee1333c802ec617454004e6b50f3341b9f1d0722b580c6c45a565c82f31972c5c676ee87f9fdd34ea8
 MISC metadata.xml 544 BLAKE2B 394f5029f5accd2d702704824311737801c868f568dff2f63ec5566466c75e3c7dceaca1351a4308d6fbbf7d410904727b6f7f93efa1d1a6a6a93ecc1dbcea8c SHA512 ff84b8460fab34313f1f38fbab60bf5a228465c79eee21c52a83bd5621334ae50b2fb4a69051c452e6ed206dfb365744d3083938b7816c46c4cd4f40c0d42093
diff --git a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
new file mode 100644
index 000000000000..79b84d5108fd
--- /dev/null
+++ b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deterministic allocation and freeing of scarce resources"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/exceptions
+		>=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
index d33490908994..5099c98aaaa7 100644
--- a/dev-haskell/retry/Manifest
+++ b/dev-haskell/retry/Manifest
@@ -1,3 +1,5 @@
 DIST retry-0.7.4.2.tar.gz 9721 BLAKE2B 419f36f128ff3c1977daf6aff15346a499a199c444f1867d08b4da6351465f28298f85e77801fa197c26844558111853abede237939bfdf22fe7f1d977620c3e SHA512 5caeb55225759eae466dc0b0a78ff2538380fda75fbd52758639c12c20e3194d2b272fb9286fbffaf70366418654f2e46088954921a9840720b590598314ba2b
+DIST retry-0.8.1.1.tar.gz 15800 BLAKE2B fa01f4e6df405d1f71bcb8c7cad6ba9b166222527c70b687feef7b6577446bf790681a189675995bfba3bb362257130bd74119e35893f4497a4f9f57fb37491d SHA512 6907d04314b10fbcbb6680608bbd5926ab56f5916fc032339d5793f2813983d5db3f40d4fc25f8e0befcb3649e753aec737a7ef3cf98fe05252a3a8c1bd546a1
 EBUILD retry-0.7.4.2.ebuild 946 BLAKE2B 9f7585fd02e7cef0f5ad493b910fea5f05e1e227a25f018fbaf104eed2f7d230582de12e64cb6b6b2a33418c5b5b6520cc3331d278a8bf910abb1c0706e745b2 SHA512 80d652620e1b31ade4d8fb0a3d2f6d17a3ab4025c3ce7c2c8c52baaa5c5fbe3260502f7714d648fc7c8f519ac480809bf7dc8312be445a1a9ccde1e19a7aae60
+EBUILD retry-0.8.1.1.ebuild 918 BLAKE2B 15f2eefa330484756b9d726644aeba8963e3acb5ac4559fbd9feea0b4a92042d54ae73679e7a7374bcd27b12560e49f0d03d4ef41d4203eb7fe80a5f340faa80 SHA512 413ded44107072ce5bf9dd2f834421b30c55b5c6e1d1c01bc422133b4e73accb69a4d469c57bd2c23804daf02be3b76d8c1a9afd29a4c34bfe957689ab0c0b33
 MISC metadata.xml 828 BLAKE2B 39e47fb53e0a6197850173d421049327a61f09ed8d24c44a5a09901b84af7a4529985d98d8eb340e34eaf1c766892cffd1b123de7dbcfe84b75ce9431b14cfc4 SHA512 59c32a88a5c3a50ac820c0c768f33f66f928b2674fb89a12b6f2be318a94b0043ef31d6b3db45296bd52989222a18947a5ae582b75232726daf63e75aa42d277
diff --git a/dev-haskell/retry/retry-0.8.1.1.ebuild b/dev-haskell/retry/retry-0.8.1.1.ebuild
new file mode 100644
index 000000000000..e6991bfb0f39
--- /dev/null
+++ b/dev-haskell/retry/retry-0.8.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -lib-Werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
+	>=dev-haskell/random-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hedgehog
+		>=dev-haskell/hunit-1.2.5.2
+		dev-haskell/mtl
+		dev-haskell/stm
+		dev-haskell/tasty
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-Werror
+}
diff --git a/dev-haskell/rio-orphans/Manifest b/dev-haskell/rio-orphans/Manifest
new file mode 100644
index 000000000000..27bcc3677976
--- /dev/null
+++ b/dev-haskell/rio-orphans/Manifest
@@ -0,0 +1,3 @@
+DIST rio-orphans-0.1.1.0.tar.gz 3098 BLAKE2B 83308c4dc8c1306e8c00c6ef0365169e6787a159a17efff86a754eb2ba797328eb8358a6a83069b97389399a0416a45c945fc636c941bfc5930a76e25c6b41ff SHA512 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a
+EBUILD rio-orphans-0.1.1.0.ebuild 860 BLAKE2B b38cd9f7548d160dc805c1af1c2df6fddbdba92a2e67515d95380ffd270896e2eb9957a0a9201d8ce96fab8b8b7087bf11a579ea859c078df5eb6e75b1c0ea06 SHA512 58826389e1a4031c2e47108bc8795301b1009740b7f653e7e3d919b4e393c40798ff2a40acf06e3893d5dcf4fdc5a513c361b0dc7ab83f5bb8094e3617d6a618
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/rio-orphans/metadata.xml b/dev-haskell/rio-orphans/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/rio-orphans/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild b/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
new file mode 100644
index 000000000000..0906c97f03f3
--- /dev/null
+++ b/dev-haskell/rio-orphans/rio-orphans-0.1.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
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for the RIO type in the rio package"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+	dev-haskell/fast-logger:=[profile?]
+	dev-haskell/monad-control:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/rio:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/rio-prettyprint/Manifest b/dev-haskell/rio-prettyprint/Manifest
new file mode 100644
index 000000000000..7f3f60680c8a
--- /dev/null
+++ b/dev-haskell/rio-prettyprint/Manifest
@@ -0,0 +1,3 @@
+DIST rio-prettyprint-0.1.0.0.tar.gz 11154 BLAKE2B a9b4dfac2db221fa97f16e4184325d336a705465920d92e283a3d9783524888e3f8c3cec2ec39d08604ad6d8184cc70cf544a32967b53ba5c33c056a0b7ae1d2 SHA512 96599c19f5c49824d5bd76c109e2304153170269ecd4c6595f03705216154750670542110fdab450a7e36db00d6a6a0d3acca30e5c7c24a855760b09703a4658
+EBUILD rio-prettyprint-0.1.0.0.ebuild 909 BLAKE2B 390efcde00224a9f19446dfcca7bbc73fd6c53bc4326a7c6157aaab1e62dd4890e97098b4b64123d167d948bab54c3a0b6559c2fa358f97a95541275eccd2943 SHA512 980785f8c009be8b7e3a6d2d3bab1a41e39a566e9ec02f6fbd916007992afc9a04165d653c3b52014481282a99bc403c086bca47ab33099f66ba5d02ef6b52b4
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/rio-prettyprint/metadata.xml b/dev-haskell/rio-prettyprint/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/rio-prettyprint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.0.0.ebuild b/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.0.0.ebuild
new file mode 100644
index 000000000000..0a05fcc0b797
--- /dev/null
+++ b/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Pretty-printing for RIO"
+HOMEPAGE="https://github.com/commercialhaskell/stack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.2.4.0:=[profile?]
+	>=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?]
+	>=dev-haskell/ansi-terminal-0.9:=[profile?]
+	>=dev-haskell/cabal-2.4.0.1:=[profile?]
+	>=dev-haskell/colour-2.3.4:=[profile?]
+	>=dev-haskell/mtl-2.2.2:=[profile?]
+	>=dev-haskell/path-0.6.1:=[profile?]
+	>=dev-haskell/rio-0.1.9.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
diff --git a/dev-haskell/rio/Manifest b/dev-haskell/rio/Manifest
new file mode 100644
index 000000000000..0271b93ad16a
--- /dev/null
+++ b/dev-haskell/rio/Manifest
@@ -0,0 +1,3 @@
+DIST rio-0.1.17.0.tar.gz 57839 BLAKE2B f5e2b85b10e20277214a6fc52985ddb51b9c7bbcdcd8e04227f3588a367bba486f42cb1a141973e5f67d6989a524dc3e2d0acc49e3ef3015da0092ab091b1d64 SHA512 a6de6217d3e661063a77bc2af4d8800f5df2967bafb12f30315c59e88aafa238f24a9ed46a6648980cd2e17f14b80e0feff9e1323798e37498a739f7085fddec
+EBUILD rio-0.1.17.0.ebuild 1057 BLAKE2B 35caa099c15a39e51cf93fcc30a7aaac15b63985d462aff3f483fe1bc5e9077533937be9d32613a15b8c56f0d7b120ac3a7186a1ca43ed19e53a40e46d3ef095 SHA512 a9f7fb2fe522e7a67244d61ed07a59c13cfc8f30c60a1dee8dcb6251896d48d0606dc3470f8efff3207460085587526d2c0cc686d8bb1d6a37b8a0107938a6b3
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/rio/metadata.xml b/dev-haskell/rio/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/rio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/rio/rio-0.1.17.0.ebuild b/dev-haskell/rio/rio-0.1.17.0.ebuild
new file mode 100644
index 000000000000..bf055c82a79f
--- /dev/null
+++ b/dev-haskell/rio/rio-0.1.17.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A standard library for Haskell"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/microlens:=[profile?]
+	dev-haskell/microlens-mtl:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/typed-process-0.2.5.0:=[profile?]
+	>=dev-haskell/unliftio-0.2.12:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/rsa/Manifest b/dev-haskell/rsa/Manifest
new file mode 100644
index 000000000000..5870af6483fb
--- /dev/null
+++ b/dev-haskell/rsa/Manifest
@@ -0,0 +1,6 @@
+AUX rsa-2.3.1-p1-ghc-8.8.patch 708 BLAKE2B 3f51a181c5f9b46c1ab44c1229edeb5b3c9a509ac30334b964accd937bee51bf61722fb5ad2a4d7319682d1f5a373fb74dd8f800f39437f7b7b323e188f26802 SHA512 36a4b592e021410a434f17f09cee4f508633290b0eea03fbe07313d14d4f1b39a8a65013cd5cfe7eee3f0ad9f49faecb1cb736a8a879568dfeaaab0fe9a071ff
+AUX rsa-2.3.1-p2-ghc-8.8.patch 829 BLAKE2B 3668415b8435bf760d49724cb7aa1936454c3a26dc5f8167802c55127872f1f900aef317596608d51cd494d1456c6aab70f93686b66043881b4e3a43c8b18089 SHA512 6fa30afbc5c26674b3269ff1bc746b1f353f46c718969268160fd58dc4688d6ef834c22f0f24f5ee70680cf673167f33ddb246a1f952918b7d383226713403fd
+AUX rsa-2.3.1-p3-ghc-8.8.patch 779 BLAKE2B fdb6da83db5d9a3d8d0955680256fdbcfe20e6b6e53102544f87f381198fe947aa9499c9a8b5e340019935e317bbeae47d628a73efce067bdc53e708056281a6 SHA512 a104d8f7417c06db043f6dd5a9de269ad954e0526522b4c4821221fca70d45cc57a1a098d46556f90257eb5d2e6fb6fbea55a07686aaa2932f7b36e1f14edb05
+DIST RSA-2.3.1.tar.gz 14705 BLAKE2B 065341bd3360410ca1e2ae1057b6b8112bc6cf1253ef12733d9d9564666b7c97e8088d35e0736a76768ebc8d40f497536ec0bb84565d849285666c591f1df3c6 SHA512 b4d3f406cd7b97237c2b36e2ba659f35871e02a6144b6cb48482fdc7999d9822758472c25b9eaef9ef6aeb8c503fa49b424350a543897217f3aec3084dd7572f
+EBUILD rsa-2.3.1.ebuild 1585 BLAKE2B f6babd900b072d6fbcbf734fd02c9c7d78699659f4af091928e8a89cfcc49e123b2f995606cae9939e8ba242bd965a2af6f57f9e3353f5d7ba950a3314fa0fd2 SHA512 ee14a24214960dd85d02bceb9342476b439ff5ca6fa4ccafe9a3227b12a76e380e7fcd6f9cf4cff770aaef67604d7eb245de99522c56c67351f7b6bb310002c2
+MISC metadata.xml 651 BLAKE2B d7fb17d99721f6a24568ae62fc8d9a40f4a89eabe7f23193af1cb1de8bc5b98e31cc3918f8970a1bb87e1441e41eac92049034ea9b2034d7d0b4bde1774dc940 SHA512 9f0c074841d168110be69469e8ce01950b1256e26f1e0e00db4a933e1541c3d55cde298715c82619757f4bd1da65035b1370d6c591f766acdadb8b278ad89610
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
new file mode 100644
index 000000000000..2c985b3b5f62
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
@@ -0,0 +1,19 @@
+commit 8d867a693f91406f9b45e24d79a0637013c0e272
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:48:23 2019 +0100
+
+    Update Pure.hs
+
+diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
+index 8e0f483..a69907d 100644
+--- a/src/Codec/Crypto/RSA/Pure.hs
++++ b/src/Codec/Crypto/RSA/Pure.hs
+@@ -111,7 +111,7 @@ instance Binary PrivateKey where
+               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
+               return (PrivateKey pub d 0 0 0 0 0)
+ 
+-failOnError :: (Monad m, Show a) => Either a b -> m b
++failOnError :: (MonadFail m, Show a) => Either a b -> m b
+ failOnError (Left e)  = fail (show e)
+ failOnError (Right b) = return b
+ 
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
new file mode 100644
index 000000000000..e2c7348eb38c
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
@@ -0,0 +1,21 @@
+commit d621ae1603f27b3de867b46e5ad4d28460097dac
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:52:34 2019 +0100
+
+    Update Pure.hs
+
+diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
+index a69907d..e3513a9 100644
+--- a/src/Codec/Crypto/RSA/Pure.hs
++++ b/src/Codec/Crypto/RSA/Pure.hs
+@@ -111,8 +111,8 @@ instance Binary PrivateKey where
+               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
+               return (PrivateKey pub d 0 0 0 0 0)
+ 
+-failOnError :: (MonadFail m, Show a) => Either a b -> m b
+-failOnError (Left e)  = fail (show e)
++failOnError :: (Monad m, Show a) => Either a b -> m b
++failOnError (Left e)  = error (show e)
+ failOnError (Right b) = return b
+ 
+ -- ----------------------------------------------------------------------------
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
new file mode 100644
index 000000000000..6aebe6fab6ce
--- /dev/null
+++ b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
@@ -0,0 +1,23 @@
+commit bb712862c868975ab033e1079751d9e3787d3a33
+Author: Ollie Charles <ollie@ocharles.org.uk>
+Date:   Wed Sep 18 14:54:22 2019 +0100
+
+    Update Test.hs
+
+diff --git a/Test.hs b/Test.hs
+index dd61302..4fa26ca 100644
+--- a/Test.hs
++++ b/Test.hs
+@@ -98,10 +98,10 @@ instance Arbitrary LargePrime where
+   arbitrary =
+     do seed <- BSS.pack `fmap` replicateM 4096 arbitrary
+        case newGen seed of
+-        Left _ -> fail "DRBG initialization error."
++        Left _ -> error "DRBG initialization error."
+         Right (g :: HashDRBG) ->
+           case largeRandomPrime g 64 of
+-            Left _ -> fail "Large prime generation failure."
++            Left _ -> error "Large prime generation failure."
+             Right (i, _) -> return (LP i)
+ 
+ data KeyPairIdx = KPI Int
diff --git a/dev-haskell/rsa/metadata.xml b/dev-haskell/rsa/metadata.xml
new file mode 100644
index 000000000000..72836dbae97d
--- /dev/null
+++ b/dev-haskell/rsa/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This library implements the RSA encryption and signature
+		algorithms for arbitrarily-sized ByteStrings. While the
+		implementations work, they are not necessarily the fastest ones
+		on the planet. Particularly key generation. The algorithms
+		included are based of RFC 3447, or the Public-Key Cryptography
+		Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/rsa/rsa-2.3.1.ebuild b/dev-haskell/rsa/rsa-2.3.1.ebuild
new file mode 100644
index 000000000000..aa735c7441d2
--- /dev/null
+++ b/dev-haskell/rsa/rsa-2.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -oldbase,-buildtestexecutable
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="RSA"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementation of RSA, using the padding schemes of PKCS#1 v2.1"
+HOMEPAGE="http://hackage.haskell.org/package/RSA"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
+	>=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?]
+	>=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/crypto-pubkey-types-0.4 <dev-haskell/crypto-pubkey-types-0.6
+		>=dev-haskell/drbg-0.5.2 <dev-haskell/drbg-0.7
+		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
+		>=dev-haskell/tagged-0.2 <dev-haskell/tagged-0.9
+		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.10
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-0.5 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}"/${P}-p1-ghc-8.8.patch
+		 "${FILESDIR}"/${P}-p2-ghc-8.8.patch
+		 "${FILESDIR}"/${P}-p3-ghc-8.8.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtestexecutable \
+		--flag=-oldbase
+}
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
index ea1cf861501f..9685d9409eee 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1,5 +1,7 @@
 DIST sandi-0.3.6.tar.gz 18463 BLAKE2B e480b127b08edf6d83504b06732f4565ee4e8c8438110a7fea6092f28a552ddda19b1fde93f021400272e9ebd1b5184cc09c902fdebb1fffc9bc2b1b426a736d SHA512 8a730f63e72fb648e2ae478a3785ab364b437a319735acda80558639cc0a43027639ff01dd2b630277348ebc31a4a5fe30ede8f4208229c1c8810f78d350bbf2
 DIST sandi-0.4.0.tar.gz 19319 BLAKE2B 87727c706832e4020f4e7794fa9c562415711766b5d37c4090f4f8ac3b71dfa840ae788b077b49c967ea885b2b915e16a7bd7845e62f46cc3c86fddcd1ca1005 SHA512 8d67d4630940b2bc75eba74e1aea169d604f27701015a19ecba6dfece9a2dc8a215a786991bc9ab1fc6de8c91c3b608144239b83c4cb01be0620b3ddb12ee8b6
+DIST sandi-0.5.tar.gz 19115 BLAKE2B e6fa5ba8757c2ff96a556cdad50217344eb188e5b258c770acc2228e0219f2259891789b4ef33d00a64a8f2d3f1b633d046517fc95792fa21b1dfea1dd2a19a7 SHA512 8abff3496d0d3f082f12416eea3189e06d1663fe78d996159396ab944389b2a816853c0191edced3b176fc506dac60e9ce84347ecaf2c255e5ec0d6b1590c012
 EBUILD sandi-0.3.6.ebuild 1029 BLAKE2B ee93735b3672e293b9ff017458555de255ae4efd85bdc8976abe518187b5f950eb19e38cb62367d79e8d8645c7652948a79f6fa98cf9620ff8c631edda3ae958 SHA512 3370f0d01bfe7e4d8e5f709de62a26e1ab25198638175d196dbc1db8a8141e40e3d1910368ddc0202bd8642b14112f5c539771bc44b29435c9546b7506c3e628
 EBUILD sandi-0.4.0.ebuild 1064 BLAKE2B 080d7ea077e82b212326b9057d672cfcf77b4305c2e671866b75d50237573fd6bde6a34070ba56205bdf67e800f19dafcd079a0954c91e2967993548400b42f5 SHA512 264e6e4a68450ee4622d8c6e923a6bfb05236ed4d4c4b15f4269a72f98f11e249f3f7424a43d8309ca1689fbf9277d8aadfef0ba2518e2fdccff2d05519ab17e
-MISC metadata.xml 398 BLAKE2B a71e1c70366bebe2a04bc69c27ef2130c588992c31931ec60923e94ad7f7831138f090a1c8f234d180f31a1baa3bf5d5826f0146fc91762e791b9d3be534295a SHA512 4f801519f877ab3ae401c93f45d2ff8cc902e737cb5fcfadce21db337eb1d9ae3426df32acb8ce2ee5cfbb9f28df673444f16479970c7a13bcf4d936625caced
+EBUILD sandi-0.5.ebuild 870 BLAKE2B 7118840a938c327e0dca5d67e76957d162ad8851183d60c0035fbbd10cff0c509bf05075818847d914ac8b64b0a17deeceb49ee832fe5c3e4c014bcf4bc3745f SHA512 6770a62a1fa90638c5a2c9b25f0c3ce60101d0168c42d99ae57fd889c88fa7cac78a66a5237242c6322d265dd804dc1234cb1804b1a1f5eb1acf29e0d946a047
+MISC metadata.xml 447 BLAKE2B ffb2a5084e00e722ed859060361224766383173298f1850d0a771790485f258fceba587cb2d314caceac16213051030cfb3d9f919dcf9eec76f22ad6c65e67df SHA512 424f33517f49cfb09d2bc2f36c9f9e4fc5bd8b669cee1cc6906775f1a094fe7bb421f4299ddb6ff70b8d08a1b33385a5341d5d810e7a1f172de3e068d127bfad
diff --git a/dev-haskell/sandi/metadata.xml b/dev-haskell/sandi/metadata.xml
index 7f88c7da76c1..5c43ee36847c 100644
--- a/dev-haskell/sandi/metadata.xml
+++ b/dev-haskell/sandi/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="with-conduit">Build with conduit</flag>
+		<flag name="conduit">Build with conduit</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/sandi/sandi-0.5.ebuild b/dev-haskell/sandi/sandi-0.5.ebuild
new file mode 100644
index 000000000000..c432eafc7d45
--- /dev/null
+++ b/dev-haskell/sandi/sandi-0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: with-conduit:conduit
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Data encoding library"
+HOMEPAGE="http://hackage.haskell.org/package/sandi"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+conduit"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	conduit? ( >=dev-haskell/conduit-1.3:=[profile?]
+			dev-haskell/exceptions:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		dev-haskell/tasty-th )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag conduit with-conduit)
+}
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 0e828e369f75..86a406d6fb4f 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -2,8 +2,10 @@ DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156
 DIST scientific-0.3.4.4.tar.gz 21646 BLAKE2B 9ca2e989cea77dc70a1ce26de4571b0ccdd1ec68c7ab84f00bbb32d7a121963feae9cdd4acb7d51e417a698222143fd4a34d838af21e6f86551fb5f9e097e05f SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217
 DIST scientific-0.3.4.6.tar.gz 21932 BLAKE2B 5d78b981d5627b172af677a35a9bde73bd96053f06cf5e7945957400d3b2b6455bdd6d5039dbf21df16a8bf5f68889a54d9ef71eaf977e0908e21e7792575744 SHA512 c4d3f3c166c45395aa420ff598671128faae130cf85f22b651e338dbbdbe9215ef3b75c58f6b495978a4dd36a49fa45de9a68c7b870151296dc09095e3c79e09
 DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df7156c9bb5013995eec5f9ee0817be61ad8caf4cc41d07f4b022467de1c6e6943eb630e93cb1b1d9760b6b2b0b58ee SHA512 10b317f6d6aa39883891d4fafaad3a8bdcc8390705f981144f3fe040191ffc7364e0505fde07ab7a3fa9d0b03f97adf42be48fcea2d13ef521fb1031590c0db3
+DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
 EBUILD scientific-0.3.3.8.ebuild 1311 BLAKE2B 8dbc0e2bb80b57b5fc64a50f8ab8dc3e974c9ff40237a3b5d1f7faf7ba37626184f800fff701d0aeffe18d363fa8555e8023182487700e3e331e3dc5004d09ef SHA512 0b9218d391828505bb4cafeda2b8cce466942931e1557e11bed8eabac12c529a4aeca7829d53358e31bad197b51958b109f4a5057384ccce6d1ed4e7dd27e523
 EBUILD scientific-0.3.4.4.ebuild 1462 BLAKE2B 87f91572f9a97f0b5abe4928ce5908b5a2c4e16544ee2161e1482071d1b53fcbb94f28d951ca6a247b8b003664390f01ff533bfb146057411b58ebdb4fedc856 SHA512 40b73de4817c99dd59b47f46b1efa938b154b71a5250cb72943f98728898037ad5ae3784d6722747f751e463f64d14b026a3f0da184ca8b7cc852fa08b2db94b
 EBUILD scientific-0.3.4.6.ebuild 1462 BLAKE2B d6b96237f8ee33c081e6e29f8ced684b11af9a45e7aef1a134aaf6a9526d145f857c9e000f655b5450c6a657288e27c6430f4bfe6ba93ec7da396c3d7cc6ad5d SHA512 0ea071927c7cfc4920c23a76dec9c4fa5ca9e779b3f29c56ab55ee6cbfa996aa7071c2450db56e0027282edc49e42b8b24d44765a53c70b551776f6621e392c7
 EBUILD scientific-0.3.4.9.ebuild 1433 BLAKE2B 0094267797c399fc3d40ac034d2f8f9e0fdc81779274b80a6ea214a135af28ca37d69758d34e7e7c804c40cdeba4fbccb1e271c82dd6c10cce3e9bf23deec553 SHA512 529748a4a3ec24061b1f504b7a4bd91bcb354bad1104ccd44cb588ff7a27937168506f47e5428356999ea71610c2e358a66ef8f748545c73e68a113e14e39dd5
+EBUILD scientific-0.3.6.2.ebuild 1003 BLAKE2B 74568fe34148084cb21513d016e5bdcd4deda8208109486d67312c43fd78f4bbaf22a96176bb4f1020b61291306514567499db7b2672158f267e6d9da0c1a936 SHA512 f746132e49f8cf3553b3347df977a61ae2706c34c98b76da533692aefa64b1765bb2c1ce0cec06b56ecb7e013a2873f8633efabd8510d9706b2f9ed4a521242d
 MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
diff --git a/dev-haskell/scientific/scientific-0.3.6.2.ebuild b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
new file mode 100644
index 000000000000..a65f4fad1a1a
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -integer-simple
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # disable test-suite: circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # circular depends
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=dev-haskell/hashable-1.1.2:=[profile?]
+	>=dev-haskell/integer-logarithms-1:=[profile?]
+	>=dev-haskell/primitive-0.1:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flags=-integer-simple
+}
diff --git a/dev-haskell/selective/Manifest b/dev-haskell/selective/Manifest
new file mode 100644
index 000000000000..be49171e4a71
--- /dev/null
+++ b/dev-haskell/selective/Manifest
@@ -0,0 +1,3 @@
+DIST selective-0.3.tar.gz 29161 BLAKE2B 786df49e4c05a53537e34f4ab4ba56075166140cee721db1ff517dfcfea92889a97dc3c558877a4a4c91a390e1cbcf684ddb6c2287079cfabeb75f19f3be7c35 SHA512 ecc5777c4692680032c2b758c0447200df3f42d4c97de0aef3d732d38c0813f85fec2d6f9825b044cf20e918631ce649b6f6cc932580277f50692ff609973dc6
+EBUILD selective-0.3.ebuild 772 BLAKE2B a5af12f5cccd1408f41a3ad38c44f76282e0f2499b2323fd9e366921a6517cbdc50cc04a0ac286ef1f52ee2c76205d6d285ef398274b3ba28476be326e15b5cb SHA512 3a114db6564127c2d1cd2076d3e78185234481ed118bce78f0fcd78740fb1ce5311c1fbeec97953331646a7f26d96bae9f1d2bc55607538dd1cd77ea773b6579
+MISC metadata.xml 656 BLAKE2B 524da28d10f98d183b2334fdc193142ad6478a8bafb381ba79cef5ff369da7558b3c319bac6472b62288a2f820c71a806d2b23cb112d2d421fdb6c2b99eac963 SHA512 1e66d478f60343389796acc3bf37107ed63bd92afe8c4835d054040c01f3bf0c252da1a41ee039eb39a8e2486fc26e7ed9ef3d2010f694ed6e8c3a6dbeb30a47
diff --git a/dev-haskell/selective/metadata.xml b/dev-haskell/selective/metadata.xml
new file mode 100644
index 000000000000..3f13fa4c8a2a
--- /dev/null
+++ b/dev-haskell/selective/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Selective applicative functors: declare your effects statically,
+		select which to execute dynamically.
+		
+		This is a library for /selective applicative functors/, or just
+		/selective functors/ for short, an abstraction between
+		applicative functors and monads, introduced in
+		&lt;https://www.staff.ncl.ac.uk/andrey.mokhov/selective-functors.pdf this paper&gt;.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/selective/selective-0.3.ebuild b/dev-haskell/selective/selective-0.3.ebuild
new file mode 100644
index 000000000000..86949794165c
--- /dev/null
+++ b/dev-haskell/selective/selective-0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Selective applicative functors"
+HOMEPAGE="https://github.com/snowleopard/selective"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/mtl-2.2.1 <dev-haskell/mtl-2.3
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-expected-failure-0.11
+		>=dev-haskell/tasty-quickcheck-0.8.4 )
+"
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index b59fe8da2da8..811543bdf3e3 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -4,10 +4,12 @@ DIST semigroupoids-4.2.tar.gz 16395 BLAKE2B 92378cabf6fdd49ed31344ee181b5cfa7e8d
 DIST semigroupoids-4.3.tar.gz 17190 BLAKE2B 6bdab910b519086dad7f98f78c6d0833d34151d0fdaec7acc359144f44269ad6af9cc5ca555f369a95f4beef7fa8b3d78502883b398cce7ff7141572ebda99dc SHA512 2c914071401e26f4c3aa312aab4dd6f5f3d232e0d3368b3c0dbef867bbc2fe1e75d574831994cb6d2b8dbf797b54b9b6573ed3a54392b300bb119779a0c5a961
 DIST semigroupoids-5.0.0.4.tar.gz 20795 BLAKE2B 349c25e8a660501ab5f87b609f12d2141e38f500d16c0ddf6c77c1e851531dbcf0990b83297fb987caae4d5e1efb6a80006d27532d7a24ab70b332ecb8ff4254 SHA512 f1d394a4a6b3f45f9d6cbd338245aa1b70162a91285900986376003799ab67e473a46339e986832ee40de525ef82f54a4766e1b29997425d94a42553e67e43fb
 DIST semigroupoids-5.1.tar.gz 21664 BLAKE2B 98e06a99dbaf2ab8425b3346cb2be2894c8b1839b56fde342471671759e5f4faa01b3cb681afcf3e900867b28050258e06c14d6cb0b6ee7476abb1b296bc4a19 SHA512 ffb02d3192f6a79dffad9cbd4f787484eeed6e49d9cfee412d1abdd4b552d151ca6d66711666f8448cc2c724383b5ff47e141088bdc69a2fb0d2122486fd4dc1
+DIST semigroupoids-5.3.4.tar.gz 26307 BLAKE2B ad22d061c6b5773c6717d00226a41f3b765513a50034d7a805605630314fd4d284b80d1eeb0f85829877ae9a51c8b5e0408e53c27d8dd206216d7eab893885ee SHA512 b4053a856e1c2d3f20f984216f008ff264cedd2ccc3cc39ca3b70bc296d81ea8c1e6dd655bb8a6d1b9a44084e02d74a26cd4eb7264e4732e98be3ec351dc6e3a
 EBUILD semigroupoids-3.1.ebuild 851 BLAKE2B b6ed8e8490dfb8a396e38d70add1a2207f6dbc3350327eecb89b1b7f4378f762c40a5a707da0de0e5473eaa898aa6ef26c749c70f57c047080fa2a2126bdfc55 SHA512 01f8c36983b6dc0197b0057b097c15ba8392d6a1ba982e4828812a71137ad2b675676b3adf47b088ad8329e774815728d6acded7faf1bd35ca9fc96b51233f40
 EBUILD semigroupoids-4.0.2.1.ebuild 952 BLAKE2B d647c99b8281a4608deea10a0fea010568773f93eda721a86e1697e31e78004b9f3bb16492d146041c1753d523b8bac4f00b77dcd7ac7bf88cfc21359ac86a84 SHA512 1124e4d98b64e8b47792929ee3c23573bf7182601c1c93bb91165313649538d6b0388fafaee91ee3f6e4a5877e9401115d17c7e3b2f104e1c0a1a6540070e953
 EBUILD semigroupoids-4.2.ebuild 1265 BLAKE2B 3f5af7ef2e12678cd774be8b41b6e0b1309268f97913e1d823deba5876d054bc3e3110678b0e9146ed5d582eabe49f548165a85cb00b42d3a84f04593ec10560 SHA512 269d2f75ac8cfbd0cc02b80221c74d16e38f41c0ae1dbaccbdc2826c0eced759d22a25fbd09aad54c4bb27efe66997ce95ff156a8d007ae16dbd37e61b252563
 EBUILD semigroupoids-4.3.ebuild 1387 BLAKE2B 4135ea69c4ec911d9b77c499d3d9ab346ff8d90e8701f2f51868f74e392817ad055d18dac58e6a28505415cf380c93d292a945fc512da030e956deb08fbf8b09 SHA512 de322dd6914988cbb84beac5df195d1908752e2799e622dfc060ae2939f8403234ed208854765b70e90120c7230d2aef0099b20f01841dd2e4c5b64409bb9822
 EBUILD semigroupoids-5.0.0.4.ebuild 1781 BLAKE2B 507839f57398eb89d7f158ed5fe23868521b8a690ff2993e6eba7791890025756bccb26f3161b43d81ac3764726af372b0893c120ab17a8b722f9a713c245e77 SHA512 6446a28f8f75d83e283a3c4b7935b21a6f6dd32399eeeb75c9ea67833cf5f294c03dd117a02e7e7a461fdbc0dd62f4cb478fda193344b494133ab0c21019ff22
 EBUILD semigroupoids-5.1.ebuild 1779 BLAKE2B 9fd2b5d4ba4cdf41b864407a6b637baa897d5a602d0ba197f9b9d7d1fb0aa8c3bfcce63d6548d2ca7c4af5d8dc5ac6a2ead9beae6ebb474f1560cb33f49c96a5 SHA512 ea1986227519fb5d933c8224ae674940fa71f88630f4ea566e25750d4a7c3d746b8563fcf0b610882384148972ca83cfcb115b4f3e5c7810fa8aa8ac061d20e2
-MISC metadata.xml 3901 BLAKE2B 610d61a659d9603532e67bcc12d0a3b04e00716fcc1bd72a6627d70a2df5a22dd026baafe2ba5ceb206de14e5e8eb2c13e0958db3c97e03aaf7a0129cdab5cd6 SHA512 abd91a8feaf1f4fcaa1c19aa9ad33c075fd9a002b7abb9e1b37399faa2fa430d67d17380bc03e7430fab5da56130bcbbb5700ffd05d4456c6cd7a546f4a7a930
+EBUILD semigroupoids-5.3.4.ebuild 2088 BLAKE2B 146312bb4b99df7dd4d712d78c8b2a3c298e1d23bdde688edd7bd96b33381258603464d95719409111462e04ffacdf39ce22307206b425fed5fd3e52e54825f6 SHA512 384ec45f3ff07b6594e569ab9e938fb85b7aad76841ed93094d111169c4848eab47a91c0f2e4970a5ccf2a831eb02f1ec0cf1d6196c5c894bbd26d1da55480f4
+MISC metadata.xml 4173 BLAKE2B fe35f3e632947e3e9478ba3b75e288c9533fcff318eba867c3c6855ad0273e2ba240f070c2e21c2b507097ccef5559651f4f0599f5ef78439539856bb0f27bab SHA512 669478711f4fa21c65fe8975c966f123f541345f45567ad723d16fd3de17005a8f6c765bc2f03131ab60cdf5fc1d5990833941ab8b10a5a14146d5c258338404
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index d6c06edca015..97b788ac85df 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -67,6 +67,12 @@
 			configuration, but it may be useful for accelerating builds in
 			sandboxes for expert users.
 		</flag>
+		<flag name="unordered-containers">
+			Enable the use of the `unordered-containers` package (and also its
+			dependency `hashable`). Disabling this is an unsupported configuration,
+			but it may be useful for accelerating builds in sandboxes for expert users.
+		</flag>
+
 	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroupoids</remote-id>
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
new file mode 100644
index 000000000000..9ac5ac13aff1
--- /dev/null
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +doctests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroupoids: Category sans id"
+HOMEPAGE="https://github.com/ekmett/semigroupoids"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+comonad +containers +contravariant +distributive +tagged +unordered-containers"
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
+	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
+	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+	tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag comonad comonad) \
+		$(cabal_flag containers containers) \
+		$(cabal_flag contravariant contravariant) \
+		$(cabal_flag distributive distributive) \
+		--flag=doctests \
+		$(cabal_flag tagged tagged) \
+		$(cabal_flag unordered-containers unordered-containers)
+}
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index fb638f22693c..4a116a05169e 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -5,6 +5,7 @@ DIST semigroups-0.12.2.tar.gz 10546 BLAKE2B 65940addc7f040cc9e46a86c73ca821f3eb7
 DIST semigroups-0.15.1.tar.gz 11715 BLAKE2B 1c755b29b80663bc11c55c9f2b1863c7d62ffee88466a623181d7552ea4eeae5cc3f3481855197f738c59e21c50ddd527da268bde378d592a72d5ae947231c88 SHA512 416bbf402f2e928fae81ba955d48d0fa636f6451c1a7ff02bcca2ff44b4e34eb91d8f2bfa39316e646d8bf2c7829858d795bb93640e70be049b232d1ec74d886
 DIST semigroups-0.16.2.2.tar.gz 15159 BLAKE2B eda7050147fb9aaca8051922601a42e19e84282cf88958a60ab66eea2a544e32b6034272f3cf3f07109aa15df73e81b352c818f4b20d1be6b71e459f8c0b8c98 SHA512 c40d666ae14f0f1052db3887b9327282ef2c535becda8bf2aa4dd8688d1744a738a6e7227e69c1b99255433e0673d67efaea287e26236cca2b13c3db951c30b3
 DIST semigroups-0.18.2.tar.gz 17026 BLAKE2B 68112f907b9251656751987f476dee67fd4e2a31b4f2cc81071558f6298933bf8904442eda053eb520cf505d255ec256e54060182a2474d543c8044506ac5b59 SHA512 db43500859eb041eee800727f1606a96bb9367fa7032bb15ee02b7d34a9d5e46bd8d4ce991988058b05b75816351f837e180e1f8df7dda78548cf3fde7a57e45
+DIST semigroups-0.18.5.tar.gz 20162 BLAKE2B 6580b1f1ac5bf85aced9dfaea1fc8d6daf4a0536395428f629af651b3717d06d36a33b1d50e38e0b420937cead33fa986d060243a788d83e440dfd73b5413572 SHA512 c1a3376041ea32e9f4ddae79ad5ec649ff3a09c5e0a07ac4f731c05b7615ac2c33deadd24c5c9ee81a6747373ae928f3b3bcaa131dce7a7ff1e3efa56cf57db3
 DIST semigroups-0.9.2.tar.gz 9653 BLAKE2B b73901c69a6321ffc478f79a7fb7280074010e512955f7aed5dc4f91742b4838b0a821ebc7aca23d259b0fc38589ddfb18c27a2f163843f729d4c93f65487066 SHA512 43385abeed142425fe858632f0bab265e8dda078ab24b270c0b22f798270af502ccff28863200c330fc4e2bdf88fd625b60be25480a9879328e517b2db09c2e0
 EBUILD semigroups-0.11-r1.ebuild 921 BLAKE2B b2e5382ba9b18c24c5fc143e962c972db6e72d11b6571dfce7608173540dbf072a55ccdba445d97211325f7ce30ca8961d06cfefbb23287685662c766c80cc44 SHA512 68ab9d6ecfc88989d03072acf2dd15f0f8ed6a6c7aa6bcc6ab42f4ab50200b11cf09ba42cbd76760073c1dd7c50e128604548335b5aac7d56d1169b521836666
 EBUILD semigroups-0.12.1.ebuild 846 BLAKE2B 549c2a4d55e5569626b269eca5559ddc40179e272d3c86b684ebec9c2b7c2888a821737f90ff0605577c8053ec766fdb4d45c378c642744f27711e2a0599ca21 SHA512 93b95fc9547b09d1a948c2b004c6f5b86f6342c9bfeaec3a8094aca50dfd3a7474cbb970224361bdb2d1922e49a0d2be25cf58f3fd650118f8120f4d1b6fc624
@@ -12,5 +13,6 @@ EBUILD semigroups-0.12.2.ebuild 844 BLAKE2B 3e2aad89c3a786afb69e152c93c9b35f9f1d
 EBUILD semigroups-0.15.1.ebuild 1268 BLAKE2B 19b63458188b0545d571393b595a51d472532e00ec8fc1383de8bc0389db83607bbad3422a4ef09f70bf4348768b6f669365a473c2f2237cb1744e1e4163d3ff SHA512 c7d91ccb3af401ace1fea85cc969e2e38fd0933ca33bec3d787d648745465efd1ebf5d911bb29693aefbae21ec7f4b3a649adc9092eaaa74228cb2708912adcb
 EBUILD semigroups-0.16.2.2.ebuild 1253 BLAKE2B 24b1dd626ec79427c6535348e73e1b5bd3e309a08e4b6243ff79d5b0e94d51f8770c8727203af8e99a9383535edaa7f7ebd618728f78d18c6559fe395736cadb SHA512 69bef876ba2530392a8b73ce9370562fc77a3d5a6fe73f342bb5c965ecb70c0e3a0810b5057b4a14b7d3f96824ede69a37fce0cc17c59f2e2f83334ffffa19ea
 EBUILD semigroups-0.18.2.ebuild 1579 BLAKE2B 359f93c8c20c299bad6aecd2eab10b7f50717cf89427a0a9362d4adec0fb7efdd212224891cd4363d1a8b9cd25a9ab50428eee24e83d8cae11fed4e176ab5744 SHA512 5d685fe2d87c86b4b6780fb2baa7c710d55452bd5ae92b6c38936c4047c133d571b15908e117b8f343876f8dab44bc22b1c76fd1251200d8aa9246dff6cc6f67
+EBUILD semigroups-0.18.5.ebuild 1522 BLAKE2B 80e139211554e01ca6384eb52bebc6d84121244ec5133b6ef3270fb82bb298d1c554c3db03a21fdb903c79dfc6d3241f6d09d594ccd20e48199b92adc05a65db SHA512 fbd9406c2b3a2573b364687b54bedccc9920789007a63be33142c5d950805d8eb1d1cf8386442a40c5ff3f492dfb393aef094313f1df739f33afba95abf4e80b
 EBUILD semigroups-0.9.2.ebuild 560 BLAKE2B 2ca9aee26691a5105d2d0fe55f645977cbff7b0d2f3b6b8adb46196db416d3edefcaf9bf7baa053bca2e49ce148c1f712a9f5bc288dcf9b7767d5f0447799241 SHA512 94f1e0bdc2d9a3379155690c7cf57125b8d657495de365012795497957c0d20f23a53eeb147a5d97a25c74b1ea25fd84d1ce4fd85ec28f8d698cf6535a65a801
 MISC metadata.xml 2414 BLAKE2B 5205548612df4c16ac0a5d789cbc28c65e2d1f0a17eabb3dd43b2f164cfd6d71e472b6adf154fcc90a668b0ef1880f846cbfa738c2096b3d27f2fff081e529f4 SHA512 b92533ce71503fc7367f82cc9e9cfc9e2588bb342ea90aaf109906f344302e501b8f877a013dd576151ea272d9766e6bbc125e9f5aaa35411c62d84eabb0de0b
diff --git a/dev-haskell/semigroups/semigroups-0.18.5.ebuild b/dev-haskell/semigroups/semigroups-0.18.5.ebuild
new file mode 100644
index 000000000000..bc5b5eb0796c
--- /dev/null
+++ b/dev-haskell/semigroups/semigroups-0.18.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Anything that associates"
+HOMEPAGE="https://github.com/ekmett/semigroups/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+binary +transformers"
+
+RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary binary) \
+		--flag=bytestring \
+		--flag=containers \
+		--flag=deepseq \
+		--flag=hashable \
+		--flag=tagged \
+		--flag=text \
+		$(cabal_flag transformers transformers) \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index aa6063f67eee..cde7ff6851f7 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -5,8 +5,10 @@ DIST shelly-1.5.6.tar.gz 28264 BLAKE2B ec1a51e8799a7d0e37f31f737cfcf50bb78063609
 DIST shelly-1.6.5.tar.gz 97274 BLAKE2B 0cb2ef6482f509e9547dc6571b8d7e2eaf61fb0ceca2be5ed5ab423118ff69032205711b697a539e45c27551149ec79fc95e176f5b6afe7d8ccdf3c8b1f46208 SHA512 6a5b418987392d755e7faf60206a3e9283e98f56a4d9d9f956c0385074ff8909fb6bddceb050b00dbd0f8eda55eeb4897d9afd2f8dd2d510367567336a7a6770
 DIST shelly-1.6.6.tar.gz 97529 BLAKE2B a171ceba324ca8775604d7ddedb0bb26697d1161231f5b0fed5611fb9f035e2db61011891f4be9bf8fcc7df1b4d3d50b89f7fed15b48f5bc1a5bfb1c6b891802 SHA512 1b78cb84d126f6bb67db3a3d5e669759e71811e2770831af41a4867d094f89b32c3cf39363cc39c808e71019d6e7eca18d25e854bbf4160bd3388c6769a8665c
 DIST shelly-1.6.8.1.tar.gz 97802 BLAKE2B 08f0f5d7e86b803804f6fae7c66fccf2cd5ae044dd8cb164f49254e311644bee4d103cf04ca9c7b20fb4d29e742ed9480d6c714205bdebb07656b5f925491b4e SHA512 76ab37289a9b6c51ecb6d5326161b326a4015ed27f6c61cd889d4dbf8f6417e6629d0059fdf65ec40f4093cb921ea3b4871105ccd77c94f863c2a087e3c2fab6
+DIST shelly-1.9.0.tar.gz 73344 BLAKE2B f12e8835be5dd648427ff92b73bc9a37215a47067e65456c4c3dc8e9c2e5bb610da171648aadf9759e9a91eb075fa74d06241f83977a5380f49bc861643707cc SHA512 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254
 EBUILD shelly-1.5.6-r1.ebuild 1257 BLAKE2B fd7bbd8188be51f6fa385a3b46bed71bd82c927804c3a4c2d6aa76422267d5d6b8a7fe664de719bb7269c326829e44e2dd5635e8b4097810691671d90bca5191 SHA512 b29891625fad29908f81ee9f95c020c96d8fe2e59b007130912d8826ea66f81606675c654a54a8b0c49ccbdbe0f99883f5fbac68f2a5a735412a83221eff7359
 EBUILD shelly-1.6.5.ebuild 1381 BLAKE2B 03ae43fb79dec21bd3a27621ba275713b920e0d28393ce756d6627683afc6a7981e47ece3bbb4bfbcd68ebf20d014644422fbb6d56ff20a379ef903b971b0769 SHA512 cef508b628b76b966c4909679b302b9ea2c54efdd7ee61f6cd8699635662462dbea89a6b6dd24f93124f2e482a954d62b2ed93fb803a774b89e7124bbc6b66a9
 EBUILD shelly-1.6.6.ebuild 1551 BLAKE2B d45019891e7a8c058beaba165a16c8ca7c70201c52ceac44d7934bf28f64984bd04688fa08e048345c4fe75879d27d1b505c5708dabac9cbe48b2e0e5b0ddba5 SHA512 91207025c7f6f63c1c10b8935b74249585d674cee2b34e7efd466d3b762aab68a4fe2022e524dfde4d9106f999a19fcd11bcf137407f290c376e40c4e8ed86f3
 EBUILD shelly-1.6.8.1.ebuild 1623 BLAKE2B 0422df5918fb32a095a46dadac4f55d4c7a04c105b9f6796bc0ab82c7433ff08797775652b6316a809dc462257e98ccd8a30ba7f744e112d8ce0888150e9ece8 SHA512 bbc04a6722557ddcd6e6cdecf3a13a0871e7d6ea810baa88deda2609491985e08a26424bfdd0ca685dab49fb168fc7912e41130a7bd9a8b44727c4823cfe7f04
+EBUILD shelly-1.9.0.ebuild 1287 BLAKE2B 7db2325edb636fe11bfeead166cd2dffadb40f5e50bfe79e352cc3ac5fe4f1b2ee6a0520fd0f5d9972f7f934e49e723c587db5c7ff7eb9a7130fcf10c9261526 SHA512 f9bbbf69d39203e31b8237d9fcb5bae3a2b8c57ad8bab2ef547d9b8432acb249d6d0831a68c388f04d064359e14ba360ac32f5f233ce01ebfe13a1c7160f827c
 MISC metadata.xml 1068 BLAKE2B 92ccc8747907426957a475c110516beb04d036015f4a79a8d8732045c4cdca61e1b247087675bf85b7957d1b73b69e80b95378742229969cfbc38827d6ac2f29 SHA512 e27e2b45c197ba0f7696ff142d6b6b69df12ed35074d0f9924cf87b043fe9301ad17f1fd2874a904347781825f691ce1feefddfabcccc20a186072992dbb15b4
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
new file mode 100644
index 000000000000..9d59c59b5930
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: build-examples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="shell-like (systems) programming in Haskell"
+HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples lifted"
+
+RDEPEND="dev-haskell/async:=[profile?]
+	dev-haskell/enclosed-exceptions:=[profile?]
+	>=dev-haskell/exceptions-0.6:=[profile?]
+	dev-haskell/lifted-async:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	<dev-haskell/unix-compat-0.6:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( >=dev-haskell/hspec-2.0
+		dev-haskell/hspec-contrib
+		>=dev-haskell/hunit-1.2
+		>=dev-haskell/text-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples build-examples) \
+		$(cabal_flag lifted lifted)
+}
diff --git a/dev-haskell/singleton-bool/Manifest b/dev-haskell/singleton-bool/Manifest
new file mode 100644
index 000000000000..20ad7ded6085
--- /dev/null
+++ b/dev-haskell/singleton-bool/Manifest
@@ -0,0 +1,3 @@
+DIST singleton-bool-0.1.5.tar.gz 3598 BLAKE2B 3825990751089e403b8056e6f8d39714b19a06dd895e422bc04c7539131d63435ac351971a400310c2ee63ae745203f64d8edbe93487557108d0e9a9ed158c80 SHA512 a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a
+EBUILD singleton-bool-0.1.5-r1.ebuild 738 BLAKE2B 4b9628128671ae3c3642f4b55022041f3fa8b4ce154695da567eeea4369e78f6bcd3585bab28ae7084f24c1475fe57dc7b404e6e482eba56e5b9731ec17da51c SHA512 975a445516acd4ddc927331c016c051a936e648a704d789aee947a83c2fbfc719b49d3790134a3f6357b98c6a7ed7f19508e92f1806aa7375378c01861c211d0
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/singleton-bool/metadata.xml b/dev-haskell/singleton-bool/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/singleton-bool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..933efdd4c828
--- /dev/null
+++ b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type level booleans"
+HOMEPAGE="https://github.com/phadej/singleton-bool#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=dev-haskell/dec-0.0.3 <dev-haskell/dec-0.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base  >=4.6   && <4.13' 'base  >=4.6'
+}
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
new file mode 100644
index 000000000000..835c0fa4dbe3
--- /dev/null
+++ b/dev-haskell/skylighting-core/Manifest
@@ -0,0 +1,3 @@
+DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
+EBUILD skylighting-core-0.8.5.ebuild 1393 BLAKE2B cae9c111639ba16103db61609b380cae0268753a54eb3a61894b112e18768b041702695d4a2a84c58b18e5b38268c4371bb80be5796124a708351a3d4c350018 SHA512 aa65fb1f748c102c539bdc3f869a1c86a97716538588346ca5231fc37ad21837739c280bf885ac49b05331357f1632c80b5b29ee6c1c17b6cb66813d4d112d0c
+MISC metadata.xml 860 BLAKE2B 168a330230e8a77fcdd7da5c60bbcc88546be72a0f383aa9e5e55370459982437a2cfd0a3a1645c4542e15a04e56a250c486650d13a18cf00bd6db03829623bf SHA512 e09699b10db27bf3ae4b794fcdc7e84f5a6ed870ce0fe28e269e337457f9be90e234d8f104e532d8c9c3dee0346547d9beaeb8f4a3e24a0d4d1a1e7553b7e225
diff --git a/dev-haskell/skylighting-core/metadata.xml b/dev-haskell/skylighting-core/metadata.xml
new file mode 100644
index 000000000000..4dccbfb7b1c7
--- /dev/null
+++ b/dev-haskell/skylighting-core/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="executable">Build the skylighting executable.</flag>
+	</use>
+	<longdescription>
+		Skylighting is a syntax highlighting library.
+		It derives its tokenizers from XML syntax
+		definitions used by KDE&#39;s KSyntaxHighlighting
+		framework, so any syntax supported by that
+		framework can be added. An optional command-line
+		program is provided.
+		Skylighting is intended to be the successor to
+		highlighting-kate.
+		This package provides the core highlighting
+		functionality under a permissive license. It also
+		bundles XML parser definitions licensed under the
+		GPL.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild
new file mode 100644
index 000000000000..97378ef65296
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/ansi-terminal-0.7:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/colour-2.0:=[profile?]
+	dev-haskell/hxt:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/regex-pcre:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/diff
+		dev-haskell/hunit
+		dev-haskell/pretty-show
+		dev-haskell/quickcheck
+		dev-haskell/random
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index 8a2a0d5e8d61..649a1e4aecea 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,5 +1,7 @@
 DIST skylighting-0.1.1.5.tar.gz 584235 BLAKE2B 87226657d721b1491565f6003eb0d9087edd7f25a67549bc60b219f4c0ff5a5d799a9aa1c42b087a805af235434ea288f1f659711eeb2299395ce5f976a734b2 SHA512 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef
 DIST skylighting-0.3.tar.gz 537701 BLAKE2B 5589aed231b25bd33160a314b5924432fe2c508bc58fbe1567d0742e19ff46784069c3e33f68888751e1c5252ead8050c7895d6fd6a05efd9588b79aee74eecf SHA512 5ecff7f3fcf244d58fa21a83ebad9358661079cd559802a7b7b888bef7969f40587f2ca80aefae5b5424e05c1fe6bc168a6df034eb843b3613f7b3fc0abedc04
+DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
 EBUILD skylighting-0.1.1.5.ebuild 1246 BLAKE2B ec67c69c4f6a1fb5a6e12f50defb37c0a66153b813bfc505ed8c656cd2be346c62fe6a0533d1449e9ffa69349b8ad1d79548e470570088f896c6d4b4efa72c3c SHA512 25a57188d4b839c42278d69dad380eff6818c3b43050aa4136b68770ed4d147d93b645b2aa07618773fcbc14f6475f0b825df343ae45b599d95355d12cde15e2
 EBUILD skylighting-0.3.ebuild 1274 BLAKE2B e7f974139512aa212d64600c1e3097cecf49db30d2673bf4e6e39231d2361df3275adc7d9fd6792381869585507c073278770bc651dbe1a9fb77edb15a5df797 SHA512 ca016183371b14ef7bd855c6189fe4f0f6f5c936d5956f96b6fc17840d0037ac4640ba9f003882683c28de574ad9a299cab1980c2c8bc99de5d9cfe2ac520ef4
+EBUILD skylighting-0.8.5.ebuild 898 BLAKE2B 628371708fba84fb319cc1174b8f2a9f12a41152da8857b31987a1be294d71431f0f0af26a253f5f5178bab06de7269e9b02a724a3e3eec6977a808aa76f411b SHA512 c4fd303427acc18e85d1f2aa76942d406257e778f4a45e147305f7a09414c4cb78cdb002f5a6d28d68453510de13b4a32bac412e511b2286a7b891574deaf3ed
 MISC metadata.xml 824 BLAKE2B 40102d8937d28fe2b98f055019288ea9fb08307e23702e46c2f10e815006e4a3f4fa11a34fd787c1053441f30a27c138252ce853e9c22867523b3be8fa711f3c SHA512 377bf69b015def5abcaa6dde5865890fb97188b09b4539f13f704880d61aa352df3f4a8f5a76bcadc51e4938ed6336e4732540a8ee12e705aa6fa39e58f9b792
diff --git a/dev-haskell/skylighting/skylighting-0.8.5.ebuild b/dev-haskell/skylighting/skylighting-0.8.5.ebuild
new file mode 100644
index 000000000000..d6f9599badda
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.8.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.8.5:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+			dev-haskell/pretty-show:=[profile?]
+			dev-haskell/text:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bootstrap \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/socks/Manifest b/dev-haskell/socks/Manifest
index f34e6466d362..affc5240bc6f 100644
--- a/dev-haskell/socks/Manifest
+++ b/dev-haskell/socks/Manifest
@@ -1,5 +1,7 @@
 DIST socks-0.5.4.tar.gz 8021 BLAKE2B 46496752c8ef776a3a54263a11f8c0ad5912af778ec2121ccda317334b597a9d33973fb81784d31e41ac9904cdeeee024cab2abcc9c5428fc42d923bd36bad26 SHA512 eba119e40e521f963ed779f8247832bd54db7c57267f433b89a57f72395eb212231d51fb5c56bb910185bc273aaee1044999fa781ad31da56e6d0ec03f07e783
 DIST socks-0.5.5.tar.gz 10159 BLAKE2B 36f9c43fe0f406bf88cc24a3a2d73205e7bd102a870dd2f02aa5c0301577e9fd97737571e362e34253bf25e813aa2cc5c7f618c0f4d7753e20eede82a098884a SHA512 cc811d0175d9a20c0aaec2eb593145908d25792f2ad5fb6b129564922bf8b64c3cda6b1424ac7e8ad2abfd1bcde7ece7ab717550266b75a5b360b4b729a768f5
+DIST socks-0.6.1.tar.gz 9759 BLAKE2B 6a7e14d87274b97bf709b6e154e6ec5835fd16e24fcde6857020139bc31553203c1eb24d244adfce54e34500df1e6d21b9f440160bbf0d992c885792b9443491 SHA512 ff56c1b356491e36888f9c1b4187fbd0d00485692960a27ec2f03dbd3c3fb961869d99da1f7a301578ab07df30739d8a0d4ae3c7559c83d0e2493d5de158175b
 EBUILD socks-0.5.4.ebuild 623 BLAKE2B 034a5b05d3b9a3216d951d13d30e57c9cef219a9dd2a50cb81ebee222ba77fcd31110f4a211d44396f64df648d714a617696c949e24600da77dfd7d1dbad99ea SHA512 aa21c1b9aae6ac2f2031ce6c4c1cabb3cd50dc907aca35479cd4d35ff6017b839a7f5c36a8a113622798dc925fa58acc461f71d49de8a7281f9f7cdaf5b0a4c2
 EBUILD socks-0.5.5.ebuild 616 BLAKE2B 63dd6063bfbe322939dadefae4eea3b9ea0d2ca2eb1af4874303f66f89b68d0f4f45b65988dbdd33a334988df5cf55d818cf903dc3225b2922ea56d71ae58ae9 SHA512 c514974a54a60c24a83c711b4c78c1d64285287ee39601fdff882312b37221526a27cecf03f9ab2f758c47f4703b47eeee85d8580549d9a19abeb5d616d9c52d
+EBUILD socks-0.6.1.ebuild 653 BLAKE2B 566692d424a834b40354cbb91c1a69fa943593f7963643ecd805277f725ce4866f3d2a066101f915b1f32b0c3b44897d39fdc8eba2530d01ddf4d4b95d402da4 SHA512 5169857f66ecea2c59d68c1cfe05b2bc769c968978d10e5ef8abdc644323d0099b6fc60d09b26283891e31362df1e9215d15daad7b74021134ac69192add8a1c
 MISC metadata.xml 413 BLAKE2B 20b6ce579bd30d5674c0cd81e12800c30d1d6efeca6f3d60fecd0166e6bc2799c9b84e4c097c559ea1d8be7581b9deaf0a834771fc7cd94d795afda4ac3c3aa6 SHA512 8d6c9d814d711df8745bcc5f0068f10c5987e4fd81a957d3b17924ad28f264eb029acb1e84e29a5e1f0ee0694c15db0ad835afd5b06710aa3fcaffab23bee5b6
diff --git a/dev-haskell/socks/socks-0.6.1.ebuild b/dev-haskell/socks/socks-0.6.1.ebuild
new file mode 100644
index 000000000000..1ca6acd551eb
--- /dev/null
+++ b/dev-haskell/socks/socks-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Socks proxy (version 5) implementation"
+HOMEPAGE="https://github.com/vincenthz/hs-socks"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/basement:=[profile?]
+	>=dev-haskell/cereal-0.3.1:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
diff --git a/dev-haskell/sop-core/Manifest b/dev-haskell/sop-core/Manifest
new file mode 100644
index 000000000000..b2e3dc12967c
--- /dev/null
+++ b/dev-haskell/sop-core/Manifest
@@ -0,0 +1,3 @@
+DIST sop-core-0.5.0.1.tar.gz 28666 BLAKE2B 66e40ecddf994165a37c7aa6d6d06cff3a114b15ca380fadef135df6fd19e3aa31c8602b2e58fa794ce4dce0e10fe8fce17e8d9e1f06dd30f0610aec7e1f32d9 SHA512 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
+EBUILD sop-core-0.5.0.1.ebuild 533 BLAKE2B 8bb4cf0ca64e0dae2494e38825da5a12310ebcc11bfd6144ecbbbf1f618ddc770479052eb06d7aa769ffcbbe08876f7f15e3b9aaebf9d618d574bc5c71ff8f94 SHA512 c9488869ee55025bfe257e30ab6343c030e0ff0083017a605683bcdd501dbb5053fb0af5acbab7ec949254af2b26e7062d4daa4c3c39f558190be8d9cdad670f
+MISC metadata.xml 822 BLAKE2B 85ca7655d27efba163ae8f65d081afa03f322db7c8a8ffe7534989896bcf5f8ac804b46a35b74a02552312b282f2a8ede15bd286e5b69b9e1e182d5f863df91a SHA512 ded57dff45fc59fae385fd2fafd4c35a72c3a28e39a0b0a8ef8746d85a5d16c597bbc70f293da17aee685996747d7cc3625b87bcff8eca2f704e439303d883b8
diff --git a/dev-haskell/sop-core/metadata.xml b/dev-haskell/sop-core/metadata.xml
new file mode 100644
index 000000000000..7e93c91ee66a
--- /dev/null
+++ b/dev-haskell/sop-core/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Implementation of n-ary sums and n-ary products.
+		
+		The module "Data.SOP" is the main module of this library and contains
+		more detailed documentation.
+		
+		The main use case of this package is to serve as the core of
+		https://hackage.haskell.org/package/generics-sop generics-sop 
+		
+		A detailed description of the ideas behind this library is provided by
+		the paper:
+		
+		* Edsko de Vries and Andres Löh.
+		http://www.andres-loeh.de/TrueSumsOfProducts True Sums of Products
+		Workshop on Generic Programming (WGP) 2014.
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
new file mode 100644
index 000000000000..3ac7fc12a23c
--- /dev/null
+++ b/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="True Sums of Products"
+HOMEPAGE="http://hackage.haskell.org/package/sop-core"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index a4ac19ae38b6..7428e8a262ae 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1,9 +1,11 @@
 DIST split-0.2.2.tar.gz 14666 BLAKE2B 77ec6491edaff1e0de17567694e9b34bedf837462bd47e696b8f1e4f3c6610a4ea13e08fd7f11101d7a5941807cf82c260ea6ebff692a7811e696c02079fba68 SHA512 d3e1a0d875632d15b12c0e454188382b705f2b9d93cb99d64f0a2a150ee7b7458628eff95da7da5f51fe9ed4ef3bd8ef3640f925f66e8f6f61253f679326614e
 DIST split-0.2.3.1.tar.gz 15623 BLAKE2B aed85fbcb6e1c7aee14f3d4517fce632f3fa95bf63f13f46d454e3dc64f4c88d970e6253a891b184e79e981bd3a9c7eee08cacb9268b7dfb1624fbb4639113ac SHA512 7b56be09279c1279120631a75bb5305bfdd6c351d582174a326985a7a630933aab747f32dd9d4ef13c81528255fe95337488f6a9117c259fe967189651828fce
 DIST split-0.2.3.3.tar.gz 15681 BLAKE2B ef395e623527b07f11d8b13d330c301870bb4e7fc96af4fd10c1708c0639b67b0d0b501962464b22371e6cdfdeeaa6ef26c299176ec20581e3518d5376fe24fd SHA512 40283ee2f5e2ab56207b05a1a7bc7de114ae0da52dc37ed32bd4e1dd3a3baa8d3346fed04af979fa5fc263b931c0b830832c0cad69e98d151f5550542af6f475
+DIST split-0.2.3.4.tar.gz 15942 BLAKE2B a4133badeadcf172901756f23e73490dfc4dce5ac7dda348fc38e4d33c43edb0509262e16b88d5d81e192a5c3d842e3fd3e2c8c135607b2a19efd9d48715d45f SHA512 a60566106a5f285224b0d555d30b2af3315c707012f5c8e9384d4b8216894e6a6263e838b0e367418c4f8bfb5f4f2cc056ca14acb6b27a5ca3446576b057ca15
 DIST split-0.2.3.tar.gz 15545 BLAKE2B d0494d299a9d6d109bfcca3f5e2f86d80357abd68038595cb94873a1b0eb0fd11ccad5439b67dde611d11c45118168a56376ec074ee2a5080ba4257694f06ea2 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece
 EBUILD split-0.2.2.ebuild 688 BLAKE2B 73de20555b2967b70173d5bdc9a7d10e4dd71d8e4806212c8d09e44a846ef0fdd848ec7f9bff54e53e57e16a3771eeb6e47833bab08f2f20877fb266fd1c20c8 SHA512 12a5020e213b868e87e6807e0c19f7c17367a32d3e36fb2a0253ceea81b4fa17f966acbf8e5104e51b34dd67bad30272820989e68d1d63fc4034c48adff3cad6
 EBUILD split-0.2.3.1.ebuild 627 BLAKE2B 8881f70f09f6e76f0c14f05cfddd1827a0baae74129b6aea095b932bba23dd3d7031e6dfec4247dd8e25e42019b45551efff970d8711484318317e77b2c9957f SHA512 bf313b4f2a610fd0f2eb46efc49769dde208197a5554d1bc3bdd02877d7590ba2485150f9323806520922c0326bd7c09f5713aed0222dfb6da4d859f30a22b56
 EBUILD split-0.2.3.3.ebuild 696 BLAKE2B c2a2f1b69cf64178633d24229779a44526a62b2232642f4fabd5d816fa27ea70f6b3c637c0b8c9d46e8055f0c26116b7250557b68584533574e4daa92b365989 SHA512 c053bd02d6ecc625967277065a6075687f408c9d3baeebfd7db8091621225db05c36e60f26d3a26454c5d1426c2cb848edeaec08c96a08197559df78f8e320c4
+EBUILD split-0.2.3.4.ebuild 695 BLAKE2B 93fb3171edd660d0b0b3d9f1ce180a31ca1415344bc4ae46351e90f7675bee4ada22028db298a0442057c4d89cfe40679bb349e5660f04194b2302e303c4da2c SHA512 f4e5087c3df0d385bbec078fa051f9d167d912c76e9efb375a49d79745a5aa3649ed7db1ac3f4af836fcef23af5e938b946784b41a9d00eb83cd3ac7c75c1518
 EBUILD split-0.2.3.ebuild 695 BLAKE2B 0ad6c09c2dc0f120ee1f99c34422633b7b4436145428b3a04f49790b2a11213618c2bcbae2925e5a3b935ef0dd62904ec8810442d99ad2b33e83ed24275318f4 SHA512 d81326b18540002cc74515e4c759978e60c02aabbf1a556ad76ea32932be6fa18c404c02b0abb96895945ccf1319446e260c6a25ad968d2472ffc0811ebbd345
 MISC metadata.xml 352 BLAKE2B d2a1a1b1ff1b2cf8270771c1fcaa662f6e89f82d167c36ba17e75969d47f802e89c71e594c2b28760fcb47c8e4a5c9f10d80c7e28d0d46a8797e1d43a23eb5d7 SHA512 6bcfd09102e3e42d6d207ccd14ec2dbd7593d9c87fd5a260bb5d0428dd87811e46ed3e30025e7a07d7d11a703092a1b04236b8f724b430bed0951e70f019a7f4
diff --git a/dev-haskell/split/split-0.2.3.4.ebuild b/dev-haskell/split/split-0.2.3.4.ebuild
new file mode 100644
index 000000000000..3f73fce0d12e
--- /dev/null
+++ b/dev-haskell/split/split-0.2.3.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists"
+HOMEPAGE="http://hackage.haskell.org/package/split"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.4 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base < 4.15' 'base < 5'
+}
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
new file mode 100644
index 000000000000..629900235509
--- /dev/null
+++ b/dev-haskell/splitmix/Manifest
@@ -0,0 +1,3 @@
+DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
+EBUILD splitmix-0.0.4.ebuild 933 BLAKE2B b164c536065dd507c4d6503bd7ae6d22a6d23bd6a1e118264d516fb305e4aa87a76e024b2282e869840d648a67552b20891f11cad479d677b2d2c6c1cfec0dea SHA512 71f6af61515961dbb863dd277f46db73c541acab641a530aa13e1f837acd609808b7d10b80530d23af948883b089b8c73b89b51025fae9577a1df5a3e2a0dbbc
+MISC metadata.xml 1590 BLAKE2B 8e40c0429c9292e72149f06cf3e90d5363daf1d153a7a57a1345789126d6fd0622b7319e68a55cadd7cbb446f57f72917a28f95d75cc1aaf24c6ca7a13131a00 SHA512 972a555b92eaa1faeec687b080ad6780a7d55b5da16772fe3928675ab8bcc87e3738c7dbf84c0b4cdeebee3be9f0f12a59a3e23b0bf81eaddc617b500ef13f6b
diff --git a/dev-haskell/splitmix/metadata.xml b/dev-haskell/splitmix/metadata.xml
new file mode 100644
index 000000000000..07dd5f4f5b23
--- /dev/null
+++ b/dev-haskell/splitmix/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name='optimised-mixer'>Use JavaScript for mix32</flag>
+		<flag name='random'>Providen RandomGen SMGen instance</flag>
+	</use>
+	<longdescription>
+		Pure Haskell implementation of SplitMix described in
+		
+		Guy L. Steele, Jr., Doug Lea, and Christine H. Flood. 2014.
+		Fast splittable pseudorandom number generators. In Proceedings
+		of the 2014 ACM International Conference on Object Oriented
+		Programming Systems Languages &amp; Applications (OOPSLA &#39;14). ACM,
+		New York, NY, USA, 453-472. DOI:
+		&lt;https://doi.org/10.1145/2660193.2660195&gt;
+		
+		The paper describes a new algorithm /SplitMix/ for /splittable/
+		pseudorandom number generator that is quite fast: 9 64 bit arithmetic/logical
+		operations per 64 bits generated.
+		
+		/SplitMix/ is tested with two standard statistical test suites (DieHarder and
+		TestU01, this implementation only using the former) and it appears to be
+		adequate for &quot;everyday&quot; use, such as Monte Carlo algorithms and randomized
+		data structures where speed is important.
+		
+		In particular, it __should not be used for cryptographic or security applications__,
+		because generated sequences of pseudorandom values are too predictable
+		(the mixing functions are easily inverted, and two successive outputs
+		suffice to reconstruct the internal state).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/splitmix/splitmix-0.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.0.4.ebuild
new file mode 100644
index 000000000000..a64e70868908
--- /dev/null
+++ b/dev-haskell/splitmix/splitmix-0.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # circular deps: test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast Splittable PRNG"
+HOMEPAGE="http://hackage.haskell.org/package/splitmix"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="optimised-mixer +random"
+
+RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag optimised-mixer optimised-mixer) \
+		$(cabal_flag random random)
+}
diff --git a/dev-haskell/stack-bin/Manifest b/dev-haskell/stack-bin/Manifest
index 84a5c4f07b6c..7c9d3b51e0b6 100644
--- a/dev-haskell/stack-bin/Manifest
+++ b/dev-haskell/stack-bin/Manifest
@@ -11,8 +11,10 @@ DIST stack-2.1.3-linux-aarch64.tar.gz 17019580 BLAKE2B ac176c211d2b4975f7dc8d577
 DIST stack-2.1.3-linux-arm.tar.gz 16124790 BLAKE2B cb6f42576e938b3838e7db26fbc00b9b0f87cda937a26841e50f5164a0c1a1f91f7f6b4d435e59fa6b8c35ad4c1541d6bcabd4ed294a0cd423cef657911d730f SHA512 005a508e003992af47ffc591598e69ccba3ed1e96ce271c9f7a369b238d7e8e4d4850b1d4fc13a63a147e56692622364b6ea3d5c97708acc82a895e55ccbf938
 DIST stack-2.1.3-linux-i386.tar.gz 14128095 BLAKE2B b48d8765d4a6930450dbfeea488fe7c41392984375100a730fee1824a983abf1f35058d880a5ea983495052987a733b9548e199e34282c49c81c545373893ff3 SHA512 a0911eb8aa73711ca314ad456f9e0e58696fa0b4e38619b8293c0971496735fe002d2271498888acce3d454c4da1c0d36727e0ca9a722a0757d1c2c4ddc17982
 DIST stack-2.1.3-linux-x86_64.tar.gz 14510392 BLAKE2B 0b5d229a006813abfa38bdaa963c1d3bb206508a49c177bdaa0d5028ab16973e706a44844161dae6ad2ee7eaccbc96d9f83c31f6da9e11243f1b2ef4a4bd98f0 SHA512 c6a26558316804df34e467601bc34cde11dcf9995727bd437933a38ce5b6cb1afb4f035415914c23b9a8ad36568e2f0b6ee17a7bb0f80af45e25b016a6b927e6
+DIST stack-2.3.1-linux-x86_64.tar.gz 14478645 BLAKE2B e49a4c47f9a2d03fcf9a8ddfac47ff89a39520799886878a824dd9fa1d636bbcb66bbca1ddb8d1b9b7308e4c828e510c0994fc90f3a44d3d344201d5e0af73ea SHA512 eef99b5a1f7593ca884708a05bcf6f7c3e8a5ade4f71b6a802c961bdc346aa560861762b238d8cd6b3c8b85e45334235ef5eaf97126df5970863dca701d83298
 EBUILD stack-bin-1.5.1.ebuild 867 BLAKE2B 9d7ecedf3bf826a8f6f582378f922b37bd8ccbc10646dc54c122a10df6d8b7b1b73f1b405920f07db498555853dfbd2ea92816dcca525c1fe9ab25db5cc07178 SHA512 aac7137f38781babcfcf3c64d605344ea89b70e094f98bd11c9e5f38a267577b6c0ae16b28b9ad57a503940721b2d87e98c2a873bf0979b49cf8fb61461a6b0d
 EBUILD stack-bin-1.6.1.ebuild 867 BLAKE2B 9d7ecedf3bf826a8f6f582378f922b37bd8ccbc10646dc54c122a10df6d8b7b1b73f1b405920f07db498555853dfbd2ea92816dcca525c1fe9ab25db5cc07178 SHA512 aac7137f38781babcfcf3c64d605344ea89b70e094f98bd11c9e5f38a267577b6c0ae16b28b9ad57a503940721b2d87e98c2a873bf0979b49cf8fb61461a6b0d
 EBUILD stack-bin-1.7.1.ebuild 867 BLAKE2B e6182aab5c423863f9010775b2611b784ec18c46fd91f1c3777fca1e9976e469b87582b701fdd84f4d279bcf5b8b317e543b52c8c99e2ce5d71712ed7ec251cf SHA512 07c56ae7aa1693a5f10c6aec8ee0d3fc29070fccec106f5fceafa9671866f1a173b2c22f41991e8a66243ba619204fa627eb6e563e9b95162bf906a89f6c73b2
 EBUILD stack-bin-2.1.3.ebuild 897 BLAKE2B b2384ff6c14055130230dc5e7f0c5d8c459d2c4e42285edd89f0672795f2d5f3ae71796731ebf155af407d8c3803210c3a2b8a74884f33371528bc23ec0105e1 SHA512 d61d6d0ed385c29ceb973444af635d062bc68a8aaf2c3161a21cd6cd5d264257d583b2989b42469db2d5caf71abeebe5381b3f0bfeaa0f3c7fc09da2d40bc74d
+EBUILD stack-bin-2.3.1.ebuild 774 BLAKE2B 98e64541a7129c031cdf42448f49f531689f551ba7b6898396d1dec36c90b5c2097fc84e4998fbb2607447fd3f135bd099ffee89cad949275463abbe8a46a8ef SHA512 2d498797af7cd5bb4a3bf07dc998027910eda815594fb611a4892e531fd581e383da4ecc8e15d5ce62ff55b69e01b088f697982d91596a9cac73339cc0b1b5d5
 MISC metadata.xml 569 BLAKE2B d9cd3865738b2e6d95ace1d13bc72f662a1aee4c77f0ffbcf844813a20e6287baf38cf0581c53b1ec492e42ef6307d6f7ab0e84e0ac2019765a574e85cd52276 SHA512 2e325913852f2545fb617c68310a4071c8e40e3ed4e0fe275db89ff76e3bcea47ed4cd1e8e6dabb7623659bb8402a162d6e247eeefd4d4ef7a03b1a4f6cb98d8
diff --git a/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild b/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
new file mode 100644
index 000000000000..525043e12021
--- /dev/null
+++ b/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The Haskell Tool Stack (Binary)"
+HOMEPAGE="https://github.com/commercialhaskell/stack"
+
+SRC_URI="https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-x86_64.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="symlink"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-libs/zlib
+	dev-libs/gmp:0
+"
+RDEPEND+=" symlink? ( !dev-haskell/stack )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/usr/bin/stack-bin"
+QA_PRESTRIPPED="/usr/bin/stack-bin"
+
+src_prepare() {
+	default
+
+	mv stack-${PV}-*/doc doc || die
+	mv stack-${PV}-*/stack stack-bin || die
+}
+
+src_install() {
+	dodoc -r doc/*
+	dobin stack-bin
+	use symlink && dosym stack-bin /usr/bin/stack
+}
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
index 200e4ed6f4f2..cbc94a4e251c 100644
--- a/dev-haskell/stack/Manifest
+++ b/dev-haskell/stack/Manifest
@@ -1,3 +1,5 @@
 DIST stack-1.3.2.tar.gz 502764 BLAKE2B 13becc53cc3b24036c3718a2d2f9d581239f231f948fa8dc610436d71201461f614695addaf145bad4bff18da0f8f3c923b317be3515fe64054387e9ef976851 SHA512 1805268fa548ea8c120abe2498b0de75d0e6a265c1a53aab1a6da51e8c4b00bc8b5c100abb1e1e822a3a68b2f469c3c82ba9c12ad7753a20a0819f8e0bd27d12
+DIST stack-2.3.1.tar.gz 570880 BLAKE2B 7bb2304f61ea58b0d76340a3f8a2b252b904a65ea709e5b0d376c79878a67e8e5e7456e6361143d1d687502b00bd0fdc12fdf98fbfd085b452174d2701c16b99 SHA512 b5bab09697d2be10445500911ff0b038adc0e9e27baa2b015de9dd3c7d18dbac8d813c20451ac660c43d3ed2c2f587b4dfffd759653ce9c23b159a936e345aa5
 EBUILD stack-1.3.2.ebuild 8511 BLAKE2B 39b2c682a43fdbae2f08615654881ea55b4770fd539ccee97abd7084f67048c9b750dfd642eff2ae7671ed407e12655f166507406b75036aae61bbaea42fb160 SHA512 704346e640ad82c3f9bbee8ff230486ab0367077ed3cac24250a7a52944fd1709d70370240a2368766569c6ff27b3e0fcf13418cf8052dbfa9b7a3ffcbf7cc71
+EBUILD stack-2.3.1.ebuild 4553 BLAKE2B e97e50ababf8f2463720ab65b061056cedbd5b1e6ba7011fecbef5e9692bf07378fe8e365803ac2efce01bfcf2e78dbc3cd00804027f4a0be0ef3a2ed81e30f6 SHA512 56cfb225b4b0ca1357662cab6aa2be4f3491f10da5cae78e550b40288ca883224e93de60036e2f67e676166a00c67b24e141fb9bfb7d669de5bede5d6926b940
 MISC metadata.xml 569 BLAKE2B d9cd3865738b2e6d95ace1d13bc72f662a1aee4c77f0ffbcf844813a20e6287baf38cf0581c53b1ec492e42ef6307d6f7ab0e84e0ac2019765a574e85cd52276 SHA512 2e325913852f2545fb617c68310a4071c8e40e3ed4e0fe275db89ff76e3bcea47ed4cd1e8e6dabb7623659bb8402a162d6e247eeefd4d4ef7a03b1a4f6cb98d8
diff --git a/dev-haskell/stack/stack-2.3.1.ebuild b/dev-haskell/stack/stack-2.3.1.ebuild
new file mode 100644
index 000000000000..75eb762b3463
--- /dev/null
+++ b/dev-haskell/stack/stack-2.3.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static,-supported-build
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Haskell Tool Stack"
+HOMEPAGE="http://haskellstack.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires network access
+
+RDEPEND=">=dev-haskell/aeson-1.4.6.0:=[profile?]
+	>=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?]
+	>=dev-haskell/ansi-terminal-0.9.1:=[profile?]
+	>=dev-haskell/async-2.2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.13.2.3:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0.0.3:=[profile?]
+	>=dev-haskell/cabal-3.0.0.0:=[profile?]
+	>=dev-haskell/casa-client-0.0.1:=[profile?]
+	>=dev-haskell/casa-types-0.0.1:=[profile?]
+	>=dev-haskell/colour-2.3.5:=[profile?]
+	>=dev-haskell/conduit-1.3.1.2:=[profile?]
+	>=dev-haskell/conduit-extra-1.3.4:=[profile?]
+	>=dev-haskell/cryptonite-0.25:=[profile?]
+	>=dev-haskell/cryptonite-conduit-0.2.2:=[profile?]
+	>=dev-haskell/echo-0.1.3:=[profile?]
+	>=dev-haskell/exceptions-0.10.4:=[profile?]
+	>=dev-haskell/extra-1.6.19:=[profile?]
+	>=dev-haskell/file-embed-0.0.11.1:=[profile?]
+	>=dev-haskell/filelock-0.1.1.4:=[profile?]
+	>=dev-haskell/fsnotify-0.3.0.1:=[profile?]
+	>=dev-haskell/generic-deriving-1.12.4:=[profile?]
+	>=dev-haskell/githash-0.1.3.3:=[profile?]
+	>=dev-haskell/hackage-security-0.5.3.0:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?]
+	>=dev-haskell/hi-file-parser-0.1.0.0:=[profile?]
+	>=dev-haskell/hpack-0.33.0:=[profile?]
+	>=dev-haskell/http-client-0.6.4:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.5.3:=[profile?]
+	>=dev-haskell/http-conduit-2.3.7.3:=[profile?]
+	>=dev-haskell/http-download-0.2.0.0:=[profile?]
+	>=dev-haskell/http-types-0.12.3:=[profile?]
+	>=dev-haskell/memory-0.14.18:=[profile?]
+	>=dev-haskell/microlens-0.4.10:=[profile?]
+	>=dev-haskell/mintty-0.1.2:=[profile?]
+	>=dev-haskell/mono-traversable-1.0.15.1:=[profile?]
+	>=dev-haskell/mtl-2.2.2:=[profile?]
+	>=dev-haskell/mustache-2.3.1:=[profile?]
+	>=dev-haskell/neat-interpolation-0.3.2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6.2.0:=[profile?]
+	>=dev-haskell/open-browser-0.2.1.0:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.3.0:=[profile?]
+	>=dev-haskell/optparse-simple-0.1.1.2:=[profile?]
+	>=dev-haskell/pantry-0.4.0.1:=[profile?] <dev-haskell/pantry-0.5:=[profile?]
+	>=dev-haskell/path-0.6.1:=[profile?]
+	>=dev-haskell/path-io-1.4.2:=[profile?]
+	>=dev-haskell/persistent-2.9.2:=[profile?]
+	>=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
+	>=dev-haskell/persistent-template-2.6.0:=[profile?]
+	>=dev-haskell/primitive-0.6.4.0:=[profile?]
+	>=dev-haskell/project-template-0.2.0.1:=[profile?]
+	>=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?]
+	>=dev-haskell/retry-0.8.1.0:=[profile?]
+	>=dev-haskell/rio-0.1.14.0:=[profile?]
+	>=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?]
+	>=dev-haskell/split-0.2.3.3:=[profile?]
+	>=dev-haskell/stm-2.5.0.0:=[profile?]
+	>=dev-haskell/streaming-commons-0.2.1.2:=[profile?]
+	>=dev-haskell/tar-0.5.1.1:=[profile?]
+	>=dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/text-1.2.3.1:=[profile?]
+	>=dev-haskell/text-metrics-0.3.0:=[profile?]
+	>=dev-haskell/th-reify-many-0.1.9:=[profile?]
+	>=dev-haskell/tls-1.4.1:=[profile?]
+	>=dev-haskell/typed-process-0.2.6.0:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3.6:=[profile?]
+	>=dev-haskell/unix-compat-0.5.2:=[profile?]
+	>=dev-haskell/unliftio-0.2.12:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?]
+	>=dev-haskell/yaml-0.11.2.0:=[profile?]
+	>=dev-haskell/zip-archive-0.4.1:=[profile?]
+	>=dev-haskell/zlib-0.6.2.1:=[profile?]
+	>=dev-lang/ghc-8.6.5:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-2.7.1
+		>=dev-haskell/quickcheck-2.13.2
+		>=dev-haskell/raw-strings-qq-1.1
+		>=dev-haskell/smallcheck-1.1.5 )
+"
+
+src_prepare() {
+	default
+	# not compatible with pantry-0.5. See
+	# https://github.com/commercialhaskell/stack/issues/5298
+	cabal_chdeps \
+		'pantry >=0.4.0.1' 'pantry >=0.4.0.1 && <0.5'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-disable-git-info \
+		--flag=-hide-dependency-versions \
+		--flag=-integration-tests \
+		--flag=-static \
+		--flag=-supported-build
+}
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index a447d853e10f..082d105393a0 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -3,5 +3,5 @@ DIST stm-2.4.4.1.tar.gz 10367 BLAKE2B 63cba3b6097d32f9740eea6a2a62f2ae7c642ed279
 DIST stm-2.5.0.0.tar.gz 12335 BLAKE2B 4b29efdb620e0528a42a34e0b98e2ba5a7e90f83009e1129f923a77abc427a5f0e3a32255f908d9771406983bbdfab6b9887b031cee7c1a98c99a7d810cccd0d SHA512 64516ff5eba42a469046af51f12cb55afca795c7a897b9ac16c3446d547ad3894d9b80be3716e86291825e8fa91335ee89e9c9c6738c95f3cbd8ee0739236651
 EBUILD stm-2.4.2.ebuild 577 BLAKE2B 209005cf43e40e6c566b4511a405630dd6ad861868466a2232570c944594dd503c7d7e17657e37daac82637a5fa2d729b3568e949369b8132d2c2890f9e0d59e SHA512 0aadfb177b316e49f8d581d182a6b90bce7d81141a7a095a7676b34962b7946a5e2f51697c0843cd4c19c626152e5975c216ae8bb51535e7c1545e1c72bf6319
 EBUILD stm-2.4.4.1.ebuild 580 BLAKE2B 159b5b8f72eb44117ec2e7d5f14077348641e0f3e3aef5adb062bc96dd2256fe3f3f5873ed8b519c3bd652212bde0f4aca6e07694e25a29a6d521ad3a097832e SHA512 7b36e8463281cdbf61b687fb1ae54f9a90e5a68d0297bc11de2c8c109354bb20a66106c513da4f3a135c123ff2ed0ed69af79e5e9e6d34bbd3711d385f11fdc9
-EBUILD stm-2.5.0.0.ebuild 822 BLAKE2B d48049e8c49a98fc6f8541825f9c8332600bb322dc8e1617c3b0be20224fffaacf60c717cd5ebe5452472eaf9953d3dfe52dbfb2103d7ab4891aae7c4ba18077 SHA512 b072a0ce22b53c80fd853f49414b7367c0707f0c6391fc1f836c845ba51d02802ba37df458134dd2f61c38dc6fe78130fe4649303c2b57d388c82f10229ee5ef
+EBUILD stm-2.5.0.0.ebuild 830 BLAKE2B 159f3e1549b7a902deef91a100e110c919be81f447232e08f33a540af44ef7a8b9e134d955d6287e6e9c2d18e1f6fcd9baf21005312906446b2af41d8828d912 SHA512 248f26b0531fa1e00680b9b559a1b6c1e7e3a6d919d7e9000331ee8399169185c4cbff5eb61fe82e20ef97aed2df5af96ff68228b8f6ccb02ca97a7579c9a54e
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/stm/stm-2.5.0.0.ebuild b/dev-haskell/stm/stm-2.5.0.0.ebuild
index cff39fc7ff3a..cfec29428a9a 100644
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ b/dev-haskell/stm/stm-2.5.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -25,4 +25,4 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
index 2bc21dbe9648..9c2cbff822d2 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -2,8 +2,10 @@ DIST streaming-commons-0.1.12.1.tar.gz 86864 BLAKE2B 636fde763da8f24e395b5fab2b9
 DIST streaming-commons-0.1.15.4.tar.gz 90218 BLAKE2B c4402ce5caa8dfdcad405e2e0d7bf3666b5ff6e14539794bbd75fe675343993afcca04b125d85c7abd38d7e748f8f8621a2caef07d14be76cfe77a41d2f961ba SHA512 d67548810e1ce06709f3e92345a18f60600a8754879aa348df8f8e4caae9075f155343f01dbdeccf992d20915df959a122a0cf84739efbff73e4048b8e4b60d2
 DIST streaming-commons-0.1.15.tar.gz 87625 BLAKE2B 154eb93235be6198c4e4fe9001be1ed9c88464a8365ba8555890ce582450d2f0341979b9d33007433d78bcf5a292a701656446c7abc4ca817fecc4036dbf9e48 SHA512 2391e0b667f2f011b3d1b09f72f9cba41f69fb16977804465fe4cb6217c1fa2d3461d93d76e3afced283f5ea8b06c57a6ae86a108bd167ed1c9f4bc28f03b053
 DIST streaming-commons-0.1.16.tar.gz 88494 BLAKE2B 6b3a8bd03e0d362c17d28a0066696ddcf23d45dfc543599baf3bd2a81d5603396a51ea24a8cc4690272172f8373a1956c8ba2facb565f56c7239fb8fc37724f0 SHA512 8833a6aadc7b7de9f1e51ceb2c1a6f3761a26dfad9f889a147a0c9f31f14ea6eceb8a6efed30e069e97582f7f5f9eb976aeaba2e5c2e7fd7e173edc163a5f712
+DIST streaming-commons-0.2.1.2.tar.gz 86776 BLAKE2B 01f4a88fb87055bb315278e0391880025b38765faa27e788d3b184c4942af0b8c26e147639e4413a029ae30e03991d083adf49aac89759b2fe2c058e945acd70 SHA512 7b6f39237f9ac13ca2d8205a43fee17c6edfe6609a1119903f8648aed151ef92779af7a8dfdfb108dea679cd26c83dfb5d21285d51f91dec0ad10debd100b8e7
 EBUILD streaming-commons-0.1.12.1.ebuild 991 BLAKE2B f0f689e80544b3cb227b4dadd6fa76ccf159ae4e0c5b73378fec80843b3df82cbb3ea04ca8fc7c06a8eb7acb2533d3bf4f379d0c472ce8a60505bd54521075fe SHA512 c3894f0a35c72a1158f84fece52eafc19a6a6893b72726737aef65fb0adc0f5a654125503ae8f43c0d70d2468a1a49a894b7edcb76577bf1ccfd86608efda7ea
 EBUILD streaming-commons-0.1.15.4.ebuild 1000 BLAKE2B c4f513a14b550a2db3be5e34d1b24d7ec4e9544312cf69651baa3db1265549516edf28ad261612263245c55c98901c634d92fd391baf7334601d69321eb43cbb SHA512 b5f422b062171914b5e963d40f71a397ecec68f076e2e0b122bf2781bb3dccc7221a7d67248195577a5ff85b6d9a754fc9f998f6e66dcf819c95a79203d5d919
 EBUILD streaming-commons-0.1.15.ebuild 991 BLAKE2B f0f689e80544b3cb227b4dadd6fa76ccf159ae4e0c5b73378fec80843b3df82cbb3ea04ca8fc7c06a8eb7acb2533d3bf4f379d0c472ce8a60505bd54521075fe SHA512 c3894f0a35c72a1158f84fece52eafc19a6a6893b72726737aef65fb0adc0f5a654125503ae8f43c0d70d2468a1a49a894b7edcb76577bf1ccfd86608efda7ea
 EBUILD streaming-commons-0.1.16.ebuild 933 BLAKE2B e1879b33a84cb9a31c5b8afa11f799b76d2d9b87dece312d08a5ae87522097724e6fdb2963e56d659f881eddb5df8cbcdc498343d6854e3706092f0ab92d0d78 SHA512 df30e8d0fb51dfb0f5505356ec6f8b159f76beb201bd366c58999c4b3da99d8a8104c2ae7f28e6b415c04bf1224165abd165e68110fecdaba529231f93200d68
+EBUILD streaming-commons-0.2.1.2.ebuild 882 BLAKE2B e0763178d0f86792c606a2be620a061b372a95a6190e2c01cfb288ff4e481fbcb1e17c11576e12ee684530acd56518a4b018f1af3a4363cbeef68e23695d7c65 SHA512 4caf9596f1fd7bc9e96b4cd647a7f4c5627ecaf898ddcd1a7b86271bffd5b7c280d20edd12302f82c2ea1bf9405149fe13933c5bc6bc2c47b6f538389e592d68
 MISC metadata.xml 495 BLAKE2B e58395c7df1194faa39b215ffa29d87a2a7a470c353d69b31bfa1657794da262dd0fade707bcd12747dda1086cc2c1762110bfe56d4e8aeb4ef4ae300bff089a SHA512 2f78ddd3295c802977c0036fb6b5bcb35b12cad399df1108fdd199f5fe3bd3566fc15efed74e59355470cd1d94a61911ce264777342a48c411bb3c8c09fb2309
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
new file mode 100644
index 000000000000..37b8e60c8f39
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires network
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/network-2.4.0.0:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/string-qq/Manifest b/dev-haskell/string-qq/Manifest
index 6caff5a826a6..5d08ab87429d 100644
--- a/dev-haskell/string-qq/Manifest
+++ b/dev-haskell/string-qq/Manifest
@@ -1,3 +1,5 @@
 DIST string-qq-0.0.2.tar.gz 1775 BLAKE2B cd1271b32323439a2f8119a56c469b724c4bf0b8f44a435696e057c7a6b5ff7b2218c8b035176563c4b19b703d7df7ea63778a21562429eaf9aade15c984a517 SHA512 3394f2e129726e5f317693cf145ab91723e9b0352a04e42eeb770e6b5bfcade2c3c8da772f61425641b7c4e48e98542cf1a7544d48cd7f67e21f930236dae9ba
+DIST string-qq-0.0.4.tar.gz 1784 BLAKE2B f52baf9e4635444545276a0609b4231ab87be9e6b1e75bec232910a282f1153bc1fd18e03eeeca03b0b2eac9c41941b2303239df693c9f884f4125722253834c SHA512 1e533afccc4e246da8fb0d76aaa63560c4b936490c002e466bcc0d08aabc0e66f393f935e0f5d93284fcd12a590e7fbe12e88175ac3599183f633eec04bf22b4
 EBUILD string-qq-0.0.2.ebuild 582 BLAKE2B 21c8bdadacfaa0324a89177f24d4004efe71c5d86fe602d907bbbd0035e737af997e98d8e8e6f4015fb8bd16eec5576b64f4ac96057e3e8b178f641217494a36 SHA512 043aaf20e829d9e6ccec59b62a7fa5a3f7936bcfa13cb497106f80b87a82884489bec94a43bf9f4d820f4ffeb1d0ab50978501331138c18105f877fe33cd8987
+EBUILD string-qq-0.0.4.ebuild 695 BLAKE2B fcefc0d92f017fa5c6bfd5449da7b507cd70512b0aef6cb5d19c3397045263964970f676c31d2084a50e6b6e34eb82e02a340f38f93e8107e3b48e8956d55bc8 SHA512 dda82b17f3db48c19d3343aacb7f1f4afc7c625c435ebf5131e40714d57e8efda1611388c0231031ba460222b7faf8a2edc5d70d356fece3f4c4cd3be8e412c4
 MISC metadata.xml 355 BLAKE2B de5831e0c5e64eb4c302cb3e825c1a74c9fdd0937a1b5b2402d3d902d1e11a1917579a73975566547964a21588d5f3bd24fedd8f25316540f077f3cdd195f571 SHA512 e86fa9b06d0fc63464c3c52839c4749cbbe0b39d49a90122fe65371ca804adbafa4f0c60a4d7c7ff97b430d06bbdde38a0425c2048a879e2899432a151813ee7
diff --git a/dev-haskell/string-qq/string-qq-0.0.4.ebuild b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
new file mode 100644
index 000000000000..875cc6e1f9c3
--- /dev/null
+++ b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
+HOMEPAGE="http://hackage.haskell.org/package/string-qq"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
+		>=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
+"
diff --git a/dev-haskell/tagsoup/Manifest b/dev-haskell/tagsoup/Manifest
index 537b1a45d035..f2c2256a171b 100644
--- a/dev-haskell/tagsoup/Manifest
+++ b/dev-haskell/tagsoup/Manifest
@@ -1,7 +1,9 @@
 DIST tagsoup-0.13.10.tar.gz 44587 BLAKE2B cae2de2bd1edadee09033969afbc3bd7b35eb22474a4d4f54ba58eb38525d222606b3d1bf2984379cdf93c69fbc78ef4333842a1221aae69db610cf87f301e54 SHA512 96a3ebd9864279e67ccf2a0c05a37d2dbf4719eb3ef0fba753bf4bb11f9161fb895ed8f8cf86e04e790f8fbe277450379fe517c59ecc068c4586d3ced316b781
 DIST tagsoup-0.13.3.tar.gz 42279 BLAKE2B c4b394e6c60a6e4f7d6964ca63da4dbfdf26b4f14b4adb99aa7121011c1435c1f4af7235301df34d4c4e2ca5a459577a14866c518ea4e76c32771b0381e95b15 SHA512 ee6e7c2459f395facfdf9c28c0903e5279c781d8a5cd0745c2e3648c8eed7fdc84c372b271febce13b8b433ecded5cd7c97a3f169121908f23bb28c2b2f104b0
 DIST tagsoup-0.13.8.tar.gz 43676 BLAKE2B 4b275ab4921934187c62f85013b7f4d452e5412b2c1891678cfe8174395a1b8535d42f7db1686cd3ffc3949bdf4790db5483e9788b409edf9317c047f6915af8 SHA512 e05325090380950467f5327c4988c31d8c1cb9fd45668e6926c428d5ad33d589c2dc5c6b7e38c5349a980587823709b60a49c242d5ffdf76b1a58264217083c5
+DIST tagsoup-0.14.8.tar.gz 43894 BLAKE2B 68688af3ef280058f51b35a99f654af53d1b90a2303ebb8a95b0d936e7c68aed70dd6624d2c14fdcfc9a8cfb221ef1cad3768fa770ab19e65cba3adb1d0d3442 SHA512 2fc0adfc43402e537dac043682d876cae29834ebe9bcec7b53cc26ba769324b987be9cd86f9174f52344635342b7ff8f6cc2186be92c5bf4b359968f3cdd17e4
 EBUILD tagsoup-0.13.10.ebuild 858 BLAKE2B 7921ffa786df6d4d14f84ded83fbc13fa347b6ba07e8c137509ffe1812db1c9dc4b1f33f3618dfd3da930668ccdc60deef017c8acea8dedf0ccc54a2354e4dc4 SHA512 1511ee35b844485b918c5096ad8c067769da84bc8e2d04a1cf1fb16e1453688a77347c4b735b7dbfb949489a8e140b5d9abfe0cc677c597b62a6c9a80b756348
 EBUILD tagsoup-0.13.3-r1.ebuild 949 BLAKE2B e466c754fb3a86949a2e09939b87f6619fe1019242cf6e8670e84216e9dad2b7904571f3759ff8acf190f79ce3269231c6e841108f0ec08fa9d4fb105bbe1a6a SHA512 387849c149d86fa12e088515934dd58311f6725a7b3baf9592133c5791926671e296f431756e114d14e5a20bcb5db182a1ec4b63abc0feb3a76cd36a63c4aece
 EBUILD tagsoup-0.13.8.ebuild 864 BLAKE2B be38f98453ecdb837a075026e2ed9f37dedc269feba17f8099124140894fa95ad878059002761148ba9fb5c4a04cf873ba967c226805974743e571d1f342d98f SHA512 7a20efa0a5fd53735794df00de959dc7af09059a1b927652c7a1f324847125094a1b9642632fd424d8c10337dece2f76072830f26f89bb27a6f9e581984e618b
+EBUILD tagsoup-0.14.8.ebuild 667 BLAKE2B 47b67aa02c8dd376b55da60617b301b125d593aad4f7647293d70225a019c8853ef7192455e0584e3d799aa3dfbe1946fc60d332e0216e46bbed4dbb0e5c3a6f SHA512 7ac7816cd32e5d0868c9e377b72a5a5b529967745aff8c167d97b2596bbe87046cbfdd0b9731a599e2912b67f8d3461e01b1abe795d242160a9a75dd4f5c386d
 MISC metadata.xml 874 BLAKE2B a27d654e00c9f42b7387ff71966f7b912ff5ab7a54b268893723759c51dd9ff007181bb94a1370264bf3190485ee1991b37574b54fd84aba5c97e5ccd194b318 SHA512 d82ee0b99c454a122614f61d94c2780bc31c2ed4a2c7ab1df4d8ef59de085e34048cd31027d568ea2c08732e9efb7d9517c9943face742406eefd607a3ff302b
diff --git a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
new file mode 100644
index 000000000000..7be66e504539
--- /dev/null
+++ b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
+HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	test? ( >=dev-haskell/quickcheck-2.4 )
+"
diff --git a/dev-haskell/tar-conduit/Manifest b/dev-haskell/tar-conduit/Manifest
new file mode 100644
index 000000000000..299a084ccc84
--- /dev/null
+++ b/dev-haskell/tar-conduit/Manifest
@@ -0,0 +1,3 @@
+DIST tar-conduit-0.3.2.tar.gz 44525 BLAKE2B 2e978f73fa78b3254106bdcbd7c2a5d6d6b7d624c717267b5f95cb69497675e64d9367f0dd5ea18575cc9574143baecc9e4f84b29600708b3660fd7d7b15477d SHA512 18efa362953641092ee5b4f65b32a3337af077608487e02421cf6427209592654b3b2d15f9b21835f4596434b65aa9a1f80b9f3408050c09b57f6be5cd2c73f7
+EBUILD tar-conduit-0.3.2-r1.ebuild 779 BLAKE2B 3f1c21c6ca9d7d822f209efcddebedd6b21c1c2a344522b2e1d377b53bdfafe45698cc66dc4f66024427ea83cf845d663a0fa3a12add50b782dc4bd842ce2396 SHA512 edef5deb98373e5712533c8528ff66f809f08ebebad8410eecead8ce5b86808b62c4a3c745e5936def0d157b773a4297df3393d9e89d3bc6e6194c6748f79db7
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tar-conduit/metadata.xml b/dev-haskell/tar-conduit/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/tar-conduit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild b/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..05f37b9e9fbc
--- /dev/null
+++ b/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extract and create tar files using conduit for streaming"
+HOMEPAGE="https://github.com/snoyberg/tar-conduit#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/conduit-combinators-1.0.8.1
+	>=dev-haskell/conduit-1.3
+	dev-haskell/safe-exceptions
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24
+	test? ( dev-haskell/conduit-extra
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/weigh )
+"
diff --git a/dev-haskell/tasty-expected-failure/Manifest b/dev-haskell/tasty-expected-failure/Manifest
new file mode 100644
index 000000000000..534ca8c01a21
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/Manifest
@@ -0,0 +1,3 @@
+DIST tasty-expected-failure-0.11.1.2.tar.gz 3781 BLAKE2B 04101b477457747abbf1a90fed80ab8692e3f771f27fae8310c0451839b38efadf1751ae302a1bac0f020e01533030563c45a2c0d75b03f9cda88ee23d1d8e12 SHA512 31f89d64a1f700a2563b291d287f559e023b0b1059cf5ad35eb9a8b2d4a7d90b2ffced828017b3e86d7ece0b125787f7512e9f4745c75d38bbc688e09031aae5
+EBUILD tasty-expected-failure-0.11.1.2.ebuild 745 BLAKE2B b635671f6f37788177f8ea8315558102b0bc80b45107b7f7bfcca1ffaca423ba1b184eccb19abcc67c952c3a3fce3108a383a9f83e0521b0ebebb3a9050a21cb SHA512 6a0d37ea7eda7932fe7128a53d3f01fd229ac152d715891e2219b2363e89fd7b8cbf74241582a1c9f9ca841f0a682aa3662f7792776cb7aebb71432982066b27
+MISC metadata.xml 1198 BLAKE2B 916fc5054a8fba5dafbea48bb7074ab2bcbd986191298d2a985b9d89f4db424d38277f4229baec55c5b327fd8142aa2510e0d001f69818248480009e2e7a2285 SHA512 1c2e7390095a26f26d3fb57b7715fe34afb209b63761e3597e578d72169b8b6f802361adfa15652c054560c210707dee0d00c43326e82c73eec7ff4df70e72d1
diff --git a/dev-haskell/tasty-expected-failure/metadata.xml b/dev-haskell/tasty-expected-failure/metadata.xml
new file mode 100644
index 000000000000..38e4a3a924f5
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		With the function &#39;Test.Tasty.ExpectedFailure.expectFail&#39; in the provided module
+		&quot;Test.Tasty.ExpectedFailure&quot;, you can mark that you expect test cases to fail,
+		and not to pass.
+		
+		This can for example be used for test-driven development: Create the tests,
+		mark them with &#39;Test.Tasty.ExpectedFailure.expectFail&#39;, and you can still push
+		to the main branch, without your continuous integration branch failing.
+		
+		Once someone implements the feature or fixes the bug (maybe unknowingly), the
+		test suite will tell him so, due to the now unexpectedly passing test, and he
+		can remove the &#39;Test.Tasty.ExpectedFailure.expectFail&#39; marker.
+		
+		The module also provides &#39;Test.Tasty.ExpectedFailure.ignoreTest&#39; to avoid
+		running a test. Both funtions are implemented via the more general
+		&#39;Test.Tasty.ExpectedFailure.warpTest&#39;, which is also provided.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
new file mode 100644
index 000000000000..8da7513fe22d
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Mark tasty tests as failure expected"
+HOMEPAGE="https://github.com/nomeata/tasty-expected-failure"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'base >= 4.5 && <4.14' 'base >= 4.5'
+	default
+}
diff --git a/dev-haskell/tasty-hedgehog/Manifest b/dev-haskell/tasty-hedgehog/Manifest
new file mode 100644
index 000000000000..88389c5cbcc1
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/Manifest
@@ -0,0 +1,3 @@
+DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b
+EBUILD tasty-hedgehog-1.0.0.2.ebuild 960 BLAKE2B 7fce4777dbb750879b7c7fd10e74f864d939fe5f6521875090864cc4843cce918a696bd242e0486065d0b4378a00af6eeccee3264367b3993b6fae12c3450100 SHA512 744a4f104b774810bf111e9cc8f9c65790d902f8d6a79021179976f20c85dd783b2e7c294fde4888f52bb027262da1cb0efa8560ca4a32c248235739875a4478
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tasty-hedgehog/metadata.xml b/dev-haskell/tasty-hedgehog/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild
new file mode 100644
index 000000000000..e02a9847ed19
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integration for tasty and hedgehog"
+HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.0.3:=[profile?]
+	>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.12 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >= 4.8 && <4.14' 'base >= 4.8'
+}
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
index 65aed3487bad..c9d8ff4988e1 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1,7 +1,9 @@
+DIST tasty-hunit-0.10.0.2.tar.gz 7403 BLAKE2B 04813c3d35635ee296e28e19d76136f59e3d196a8e6a9c4410f6a7ee20996178f4c10aacdf985a73b989914099a86b1b1ab930e21584e714150e041b401e3179 SHA512 82f70cd7813affeb756de89842a77070e688169eb35a386fbc4db36b65d8c960bca7b923294918e10b65281d3265820f9592398550af8af92027960d48562fd0
 DIST tasty-hunit-0.2.tar.gz 1832 BLAKE2B 329ff8f7e5078e92412f2ed0325bf11ac8563b9bc33b91893e786724f7a7f3256983b1c2dfec89d3a4f69b3e933796ee69a364f67a868f1f5ea687aa0e27c58c SHA512 0622cc120b40108cbb3d0af3f0593e17cf7ae9d27524b095bf05870c1b85b02a7acd8f0bef1788e32ac2ec64a081e4ade2ad627bd444b442cedc2464f6c60e35
 DIST tasty-hunit-0.4.1.tar.gz 1840 BLAKE2B e115e10605f101f875698f2bfc99fef1becb2f8b16eff0ab9e1c5c9ca81e25bbb12fc75049ef6a15246761f8adba0cbdbf31e4410b292eea4dba052d2581666e SHA512 6a1bcecd3b9889eff1296e2ba77810d4421fd570101a4db5e9d8095afbdc3174e5fcfdaa61f51f391237330c97c824f201e368eebc13e2a6ed9015716f8baaae
 DIST tasty-hunit-0.8.0.1.tar.gz 2100 BLAKE2B 4d35a3f92487394d79969a847511b76024604ce2b5baa33f66ff896dd997d956c4edc1eafde3bea04ed33b5b6857dc2719fd044561ab167841dafdd701119e1f SHA512 133a38d3e6e4d19fe7f0f91080a30a0d3212fc17416669710dea78b5d646aab0d2ab67959c6cd4517e74da795327fbb87fcade335161b67e9967f577a9730898
 DIST tasty-hunit-0.9.2.tar.gz 5765 BLAKE2B 94463efe14eba2c5a35a1658a60d29965ed3f7845bc064174447604fe08bec1738ec81912caf7850a0336edbb0c8fa7fc20ccbdfa814aca0ca9ea5360792ad1c SHA512 f7af615938d8cb9ec40114fc27f196a8bc9991b0aefca9c5de72bdb6872073b6d771f276472f831b8c583eade3d2d1413aee8f194befa450631bdf3ed50ed439
+EBUILD tasty-hunit-0.10.0.2.ebuild 616 BLAKE2B c5e5a037f7fd77848bf7efdb1428d0e537c540445708008ca90fce5dda267c4dac59063a6e1592554654155c5e4c967cb2072d8f78e946ed5f4ee30b4e1d9218 SHA512 a04eeafe2522773ae7239852fda7b59271f20808b487c64bc41d454c6b669dd6bd53ca2ea854f07211023552e245d31a142bb7f7c389942c3d4d0bbae0021654
 EBUILD tasty-hunit-0.2.ebuild 660 BLAKE2B 62110f64f0987d9607edbb2ab0a2969eb0b9b89dc93e5bf649b906771fe25487671120c485c37a675144b181c6e6bb5ae78c65278725cf9c049b4acfa11d4794 SHA512 76ab28c835043b1c2b64f27062f9253005b52756136395d44799e6af2ce6c5bd74330a0a50a848486e731ca735209ff6e5d11128ad75388aa5934004f545cfe2
 EBUILD tasty-hunit-0.4.1.ebuild 658 BLAKE2B 6cc4d38dbd4190af6c193f22fdf4095c0e08dab3fec4b1aeea09b8f054244769f3a5257baefc5c24caeb90ae2287ac5f9c8cfb01d2afdded54326beda4f3fce1 SHA512 13c81e32b52273896f9d2019ed92c948e101766e17b437d0326cce0afd71c944d5baf6bba858ec883d5b1634be57644f2171297ccf00ae06d0a8e63a21426d22
 EBUILD tasty-hunit-0.8.0.1.ebuild 652 BLAKE2B 82e7765824a4fcf8842d9f5d5ab81bad01493c35e8884e1592beefde7695e6dfdc20be0b9d63ea233ea284540ea5091cd9da464fe034118cc81ccc778bdaf383 SHA512 818648b4a57f8a1e1b001385d6c92f9ba6be54b1c399152b5d93de345c95f37fe02c5b1376ce989c27a1a9bb369bca55b5b3f95d32a35253b504d0dd8a765017
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
new file mode 100644
index 000000000000..0049ea0f53d2
--- /dev/null
+++ b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the Tasty test framework"
+HOMEPAGE="https://github.com/feuerbach/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	>=dev-haskell/tasty-1.2.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
new file mode 100644
index 000000000000..f3d232a0dec9
--- /dev/null
+++ b/dev-haskell/tasty-lua/Manifest
@@ -0,0 +1,3 @@
+DIST tasty-lua-0.2.0.1.tar.gz 6830 BLAKE2B f32d0e593a54071aac5b12e9c8b0461e122864994bc43c5d8c2039dfec5cb67a9e22ab91ec2c74926fe1f45bc5811ea47a98f635c1c22c3e364c0fe781e5c97d SHA512 25981f483b1d890b74f5b0f16b273413de2dc2a2da1a0443014e605e41c93d276bca325717aca58d194c68e580dbfde8c1dee166c1974f4f2e544887e0ed0d12
+EBUILD tasty-lua-0.2.0.1.ebuild 887 BLAKE2B 9ddd91e054b90be6a217fd2bf204e9abc5a2cd11d9c7095fa7b45933191888817ce83a1e04bdeb4091fd36032c736413e7a673e375128c3efc44c10b388d7fcf SHA512 455eefea35b7a776870e5885d7e00cbf1c8980dafb392babe1fed7a2c6d54562c6949e9f99959057e12717dc77f1b6ce920f209ec37681a223cfe8399503d94c
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tasty-lua/metadata.xml b/dev-haskell/tasty-lua/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/tasty-lua/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild b/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
new file mode 100644
index 000000000000..061ac8454e35
--- /dev/null
+++ b/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Write tests in Lua, integrate into tasty"
+HOMEPAGE="https://github.com/hslua/tasty-lua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
+	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-quickcheck/Manifest b/dev-haskell/tasty-quickcheck/Manifest
index 465500ac923a..a4af93bddf1d 100644
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ b/dev-haskell/tasty-quickcheck/Manifest
@@ -1,6 +1,8 @@
+DIST tasty-quickcheck-0.10.1.1.tar.gz 5539 BLAKE2B 688675aa15f2790d147d34dbeca8d42e556b8a2d3fe52c7687e149f271a0ddcbb6fb21ac6be4065fdf1b8dcb82aa10a8f533e77da0111c140bb9ef807e48c222 SHA512 13cfcc99eb9988d4842327d96f0e58f5ba6c653d3027a4adb307d4101bc2f7deee0033197b4358a837ace0d03423bdafe2197b029da6a64d8b650ee2f5bd958d
 DIST tasty-quickcheck-0.3.1.tar.gz 2643 BLAKE2B e98ce801f560fc9513387fd4fdd1ac2540d774cc8395059661e6f15ebcd40a15e01902bfd3f389c6f5c42437530bb98fe21c1d7cad76edc367efc19cb4653516 SHA512 b6f4ffcc01e9a25a54616cb85a95901010e04c05e59743621b86d57dcfdb820285881c4a39a95e255fcdab6a33b7ee866e585a26c9628649c344c3b2ae4500af
 DIST tasty-quickcheck-0.8.3.2.tar.gz 4438 BLAKE2B 6d22a2155597cf9d981ac0ac290bb65f03b50e8d7fa92092955b74630f5c3c60a8c8fa9ae4928588e8633d527f2614295d636a57c547e15ea02e8ee6f07de35a SHA512 6930e602d0b3b60f13df509191b1d6affc430a408f3536bcc4e749ca87324962ae75414a2e33cd4f49b84296740528a840c1f7ca9295220dfae28b6f2946df57
 DIST tasty-quickcheck-0.8.4.tar.gz 4560 BLAKE2B 5f1ab71b75bb2a7f2384dac024d65514f45b9741e59c260116d4e7b4ad483456c6d2a224c96eb642ee9f5c2b6d985e1c81052312fb5fa725209106a210045aba SHA512 5e503604412af686d24957e111ac369dedc568ad7075374acfdef93bad35342af6e1bdfa5a33aa8eec16bdf7cc3e0e2539d5a92e7eaf8a6cb325bac2149a0ce7
+EBUILD tasty-quickcheck-0.10.1.1.ebuild 810 BLAKE2B d3ff4e3986f4fce347bb66ef870e4607f62dcf4dd84c04266c7ea8794822301ebb637f4ad001b048865e5aae5d5b2c5f7467dd07de2c2778b586a2a12dd3a75e SHA512 adabf148d152c6ed520fb6e57694aeb744212038ebe5a6138143697bedbf64c7b0de44097354fd70f765793125d8c00dcbc1b3050e75a2451c824a11e7ae153b
 EBUILD tasty-quickcheck-0.3.1.ebuild 740 BLAKE2B e077085ba688661b5245ed8f764fd58e5fba16419b620ed9be006fa8fd0587cf18ebec778b61ecfb60becbbecb5900833791268aa80b13c8968b1901ae8076f3 SHA512 e1e4cda5450ba5488d1e679a477e99a7a136566365850a0613f6b44f23956f946010ba651caa57755538e311e0a0736f6c2feae4166f040a25fa99c040b2fd92
 EBUILD tasty-quickcheck-0.8.3.2.ebuild 1046 BLAKE2B 211e349dff7348b39817d6f0a4237772630d9e09fca048459989ab8e93b5a89c11336de124e037ac14bd8080be4c63b7d12cb7e17a069c416b62988fb7675327 SHA512 d317e5ce742370e96bf9568edb4ca495b0509dd6e5f77978eeb89cfb7f869b9c1722ebfa628f202a613067365349fa1e44f2b476975c0f9c5f03799db1d14930
 EBUILD tasty-quickcheck-0.8.4.ebuild 774 BLAKE2B f9f7367cba244d4ad288b5ea12dc0f887cfa15018c8d8986b7c774c1280316bd57f320b2f53f76af7fe3dae5873e27d9f062761726f72edee1feec37b0be2532 SHA512 c79e9866a87b7bc1c597acb2e6b104d4e893b8ad6633fbad529110af6c9c1a8a5b7faaa197b4b33c265d97cde43871e5b9b407526c431a845af302344879ea22
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
new file mode 100644
index 000000000000..c5e7fb3b375a
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck support for the Tasty test framework"
+HOMEPAGE="https://github.com/feuerbach/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/quickcheck-2.10:2=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-haskell/tasty-1.0.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/pcre-light
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
index f5106d76686b..12f4bb710514 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -4,9 +4,11 @@ DIST tasty-0.11.0.4.tar.gz 26612 BLAKE2B e6058ec9a3e4442e822b4db17d79b464a98ceb0
 DIST tasty-0.3.1.tar.gz 12145 BLAKE2B 338417c955c2b6e5072253d93c4e591c5f91f00292e845c6b50ca797376ec89ef4e42bc063c7774042d4e45274140c6d693f03a4ddbb783d2d4d215a0a8180c4 SHA512 aa727d8fcab7cbde07f721ad8eafc957f3fb6f01827a8ffc329bd1dba86bb40dbeb9e17c86becdd44aba592d57e29d07a5435ffbc8fabaa3c92fa0d0fa544e39
 DIST tasty-0.5.2.tar.gz 15369 BLAKE2B 857b844f04b1c14011e7b441334cc180b66817a523e0ea0373271e8eb0c0be7028394638cca8344b124a32ef190907be025fe8dc49ae9ad646e66473040b5434 SHA512 94116a4a12b842c4c136dfb5fff75e3843aa27c05fbad64e1752bd29b60691dbf12d093c5480e9c93d97ec1adbb98d579e63dd13921323e32e9127fb75bb3d37
 DIST tasty-0.8.1.2.tar.gz 23234 BLAKE2B 2bce9e12edc57d0ba769a3d10617d33233a378f6e9c686c9ce41b7c4e5153e67943ee9d6908000d8bb334aeda2e522877a209c18f7b5cbd6c9c93dfd5cc3cd20 SHA512 110c605cd8dae769a4ddd75f5940df5681eb1f38e005eaba72a4a9109637e3e8dedda7389dbac5a11fa8874da1f0551b7601cb7740efb8c6c6726e7a6ed10287
+DIST tasty-1.2.3.tar.gz 49148 BLAKE2B 8de7436bca740e55a6592e833326b03f001823c74c8678ae5d38c2c836249a9af08321df6245573e5d060a25e9512c1f601a62978f2b3f22ee846d3cef72a829 SHA512 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472
 EBUILD tasty-0.10.1.2.ebuild 877 BLAKE2B 94656527a95ddb14e61f80f27178592c424e5e8a904ca6732bf84967f55412e74e7e8f924de09692c1a4658afb67722ab3ef326bdbf60858adf615b5700fa628 SHA512 8e9521169e7df2269828c2de45ea739fdcf9f350672d9b648bae4ed029c086246c927e4af4abe93d9f1f32c6fb3ad1d8ced59c9f6fb9498b73b3e3cfa6c77300
 EBUILD tasty-0.11.0.4.ebuild 966 BLAKE2B 256ce4f272ec09a455679b31fe03c75e97046866a45860fa083d525ec7709afe457b7c832cdfb632bea85e32a76baddb6b7ac99d386da42e5774aa2385a994eb SHA512 ffe6f9bbab6b584ca8cca77d42017c36828a9a5d9ae37c62fded406d4831620b82982706299208a6145271e52c7377e57fcdb6a89af63785129c8688a11bde3d
 EBUILD tasty-0.3.1.ebuild 889 BLAKE2B e8237fa48d1d40114fab5272a2bf95f28ddbe45a73598b323547c2520d6c6dd3a9aa64aed161203bef7104d3531f08c5822c2c283b51b2c0f2545b7ce7f6d3f6 SHA512 b8dff0ea0de607e47bc07bad06c3f5d3f875ca07ab18c022d8cb596381c23f702013696c4006ce020deebe4e075f688f876ed97730137dfe33115e1e7346a4f5
 EBUILD tasty-0.5.2.ebuild 888 BLAKE2B 80f9d16f1e9099b842a13fc2cb78c43f7f1c0ec36cf3a59a40f265504c9b527babd7d95553652401f56153a7e88d839517a0c1a156c91f3ea473e92def09576e SHA512 6652ee55bb983bd2ab6347cce8d4efeb6afbe1316fe1b9e65d7c598419e95f108cf68cc20eca1796413fc5b5923fff56ea6dd878da65ef920c6e48b3dadc5d38
 EBUILD tasty-0.8.1.2.ebuild 869 BLAKE2B 4ca6f1f96ba62f369e92fe122e167d63c805956f95a26262d12a255c54e4c5a1fce6c24509efe2c607d5fe5c4ed290362e412ab11f962c5c387e011644c32726 SHA512 90b356d7d3f520606ae8c723b4fe0bebc1c6d7ad9daf50a5e0c3de03202fdfab1a0df98304d3b38ab4ccfa455466650022f607594adecf7c2588211cb3d10ab3
+EBUILD tasty-1.2.3.ebuild 993 BLAKE2B 8bd6d789ac539541abc21532fe275fd1b224ec080b20565979341ecd606797cc1b7c60c51938aa5e8fff6e86a276562a8863545f1db0ff9de36c1003e6d35ac4 SHA512 d64756f454e0ff1b55000a014c6a7b2e5b221617f6a3d8a0a21cbe79b4ad0fa4145717d91e69ac36c3f9137d52c5a3c4dc6aeeef72b3426e3a9847ab66d0594e
 MISC metadata.xml 407 BLAKE2B c644721938d16c62308bb17e446d912004ed49bb50b3f3f55c353698000bd7c69ab10175a5caa3f0374133df6945a6bad3e47507090706d916f61c4872aa4571 SHA512 dc2fbcb934ec6f2cd8483d7a0421ec0c22d5807924089fe79aa978ac3b11ffc23ea443d9e565ad83eabe3dab4a068c08909111c589991c33228a179381cce17f
diff --git a/dev-haskell/tasty/tasty-1.2.3.ebuild b/dev-haskell/tasty/tasty-1.2.3.ebuild
new file mode 100644
index 000000000000..bfe4addf2901
--- /dev/null
+++ b/dev-haskell/tasty/tasty-1.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: clock
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Modern and extensible testing framework"
+HOMEPAGE="https://github.com/feuerbach/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.9:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/mtl-2.1.3.1:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/tagged-0.5:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[profile?]
+	dev-haskell/wcwidth:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/clock-0.4.4.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=clock
+}
diff --git a/dev-haskell/template-haskell-compat-v0208/Manifest b/dev-haskell/template-haskell-compat-v0208/Manifest
new file mode 100644
index 000000000000..4ef128a9fcc3
--- /dev/null
+++ b/dev-haskell/template-haskell-compat-v0208/Manifest
@@ -0,0 +1,3 @@
+DIST template-haskell-compat-v0208-0.1.2.1.tar.gz 2892 BLAKE2B a4d941c715115a1e4bf01ad5bd9b935162407cfb697d2442838682e59183b67fa9e2168c8d0675572911fb2a473862790204e03632c64b5674b766a521db08ea SHA512 864cfb6a9fdd24f9a17d6e9ed2dcf8b00c6dc289165b2f34fb90384a90c03f554705437e15f87d53cd532c78243bf89f141d93a880aaeb7c6af9dc51e85ac96f
+EBUILD template-haskell-compat-v0208-0.1.2.1.ebuild 596 BLAKE2B 2168877e2f8264a4374ce5607f520a680ca3905416ad14c40a85d21b94fb3910f4f84bd4dc3770ae21d068bc3981edeac67f4a15ef304a4ce4ffc837d19da6f6 SHA512 70763acddeb5ed1be6ebff3817b27e8a7fff5cd39a842eeba8f1a489d8157aec4884690f4da103e101970818c78c1d9b4ae3461b872fe8178a20ca473186ae9a
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/template-haskell-compat-v0208/metadata.xml b/dev-haskell/template-haskell-compat-v0208/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/template-haskell-compat-v0208/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
new file mode 100644
index 000000000000..347654e921ce
--- /dev/null
+++ b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A backwards compatibility layer for Template Haskell newer than 2.8"
+HOMEPAGE="https://github.com/nikita-volkov/template-haskell-compat-v0208"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index cbb76cd03abf..2538c75a6e69 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,7 +1,9 @@
 DIST temporary-1.1.2.4.tar.gz 5220 BLAKE2B dc5744b92fb2b20a878becbc4c4a5274e8d6ae9d827abfa30333f5f30ba0ac8141c7cf8805de532e241d7379f3fdbe8900a18c471d0405cbedf85c817d1f026c SHA512 ebd2221ed75deba8c411ef4e4c6c45de41beaa1d26521f488b4ab16ee731839cd6193ce987701a224110451138c4eeb1b40d01a65a20b4508bc9fbd2a87e7313
 DIST temporary-1.2.0.3.tar.gz 5308 BLAKE2B 5c570641d27bbda5f28a1f0eac65a89377310cf10f1188b3bb90f5ec0aba67c466f3518a69dc4f1e446031c3e6f6fa6fce65f705db0185401d0986b385072d60 SHA512 ceada89c2166c315b2a54cae0a636eb0b38e6e89481ef32d3d1e4305d4e601305b4cb88fba3069493e8fe2014e3d237348a37567aba61e617c69707f0a16dd34
 DIST temporary-1.2.0.4.tar.gz 5347 BLAKE2B bf1d5740510248d993159aa4e1fba4c023efe1f64e8160c4a6ed33c2f8529907a406600c096f9ea0954f8f635955d2ba47968346f4c62eb3037f6748c862a9f7 SHA512 cc8ba1c43d3e75f13450cbbbea081b5dd42d4a8c0fd33dd4ca9cec636aa91c2cd5c6edbcd86bf7895d6672a46c3e2c8edc57bb2ce88f61fdc05ec75e62c9373f
+DIST temporary-1.3.tar.gz 5686 BLAKE2B 7769c471a8fe3f2a73291b53633c9d4ec785bff9dfa93874f46bdac50b7e16a5fea918848645132593d2d0c0aeda2479777e04b1adf8fa501306bace89fdfdcd SHA512 e3078caf54da95c4efa9e9c936b35a98b62296ecce2242cd4e103605a9d29e8a9d6c7027dbf50d02b6a893bea558ea5b07dbb1df7c59bf26d86db76ccf112f25
 EBUILD temporary-1.1.2.4.ebuild 644 BLAKE2B 7091fc1d4caf84a6918acd553184b5fb348ffd00e78150cc17acbb1ace2310ce74a974833afa6e9ea0391dc6b82d9f69a715eb1b842ae5d580264874ddf1f7f2 SHA512 9fd646241643a251681cf12cdb3e4b664fdd3d553d0a5f49c326943baacc4e63e1cd373fa5dc468edc966ad6fdaf214900fda022c0e28bd75141c2129350b4bc
 EBUILD temporary-1.2.0.3.ebuild 668 BLAKE2B 7cfbadb7a2f00c45cb9d163d397b5df26ac4d4b9cd3da376f05e2aee739842b1a39e8da83f8ef1385225f06191743fb74c840b3694bc1cb0ba818838684c940b SHA512 6eaf21f93199de8df3254389359cb736478f7ec47189f45a32aad85e389dfb8a95e84681182de936cf9c67f33d34429422500f11980220aa5ffc0bf0310351f0
 EBUILD temporary-1.2.0.4.ebuild 685 BLAKE2B 3b1bfec7cecc0d3348a04504297fae4af2db87c685e73afd20b3b130cf5f1e3652c7b8356249807615677592026e991ad4f41f0bc5269b2a46d2fb0ca5f3dc8b SHA512 04eab66e2f429f7f3f32826c0b57642a3c44bb12dabb767f89a36ae389025b0d3f313db85c1485c99c2f151ba516b89ccef5c43e4356c6a9f7cec46bd7b7a8af
+EBUILD temporary-1.3.ebuild 743 BLAKE2B 2f7c476d29eaa306efdb8081690174c605d74e3aa5342373db323a830b84df0db4964fcdc2f4b712e01c7b7175ad98b4f5280bdd145daff157966685c0153b21 SHA512 a29378ea865e7f418fe9e9eaca715458a5e50646b4141048848093fec3ba387d205f204818ba614b425e8cb3e97b667053330d9939b78d4a3cee8a058d2cdc98
 MISC metadata.xml 760 BLAKE2B 657f8412b7add619d5d8827d13da1aebe29087a9334a6bb48271450138710c89e4227ff19f1348426531b3d189d750501ae343835ea9ec77d6e5a8b1e20b8a43 SHA512 bd5b25179a899cd867b1655df9e46e12d7a4a229edd3b1a13eab4688b6018757894be8c0a857231646e39260af604d762e8f7de5727d2366e20026908b3b3ed0
diff --git a/dev-haskell/temporary/temporary-1.3.ebuild b/dev-haskell/temporary/temporary-1.3.ebuild
new file mode 100644
index 000000000000..1557b635b0ea
--- /dev/null
+++ b/dev-haskell/temporary/temporary-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
+HOMEPAGE="https://github.com/feuerbach/temporary"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/base-compat
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 3320ceb64fcd..981180be08a3 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,7 +1,9 @@
 DIST terminfo-0.4.0.0.tar.gz 45591 BLAKE2B 94986d3301b73458eb83daa99c6a45b631fb83bee2a38724f2ae76b466abe52569529744ffaad014035947358f34761f18c5d1a734f5f2375b80fcfc2b1c4a8b SHA512 ba52ddd60ef899ca0a696813d613d12964b5e73b6450f013f4545cafa1ccd99b6f86916f0d369b4562ece0fa3f9280a7bba8160363cbc6cae93cedc3992fbf70
 DIST terminfo-0.4.0.1.tar.gz 45615 BLAKE2B e763301621d9d55e250ac822b2dbf1a9b652d8f99a205de9e17572f99c3b576424bb555e00d26654ef0acdd06c4ac16ed9c5fb7c207f0eb5aea19325f51eedb5 SHA512 4b21621f4f7ebf656fbfd4278fa970d0211e2b66632b5251cdcd659a71df04294ba334ede97582b5b7f403e15552f3b6c4b5f0cb9ec6453aace502109eaeff46
 DIST terminfo-0.4.0.2.tar.gz 45511 BLAKE2B edf4fae3dc4d6550941f60c2e87bfd2a81757e54e4198cd39751a651b6a09671d5dc8e8199bc25c5a06ae5644d7c30a299cf3aaa1b6256850ea24f64002f038f SHA512 eda799218ee1b1a765d909e9723fbf7e2de33b2946fdaeb92141bbf056a20a66bebc4b72359d1f5bdd5d188a10a3701d73818cee65170e0660daccf8c295897e
+DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
 EBUILD terminfo-0.4.0.0.ebuild 646 BLAKE2B 21f63d677f177cd6a8ad052818b34316fc57404615d91a6137393b3562cbe5f02e8b510f0b39ea0e1ef6fd41717bdf60e5d0d6ebbd22a3dd5141d92ec421fcbd SHA512 9a7bbe47c598678a8ea90a9e98070ad2100d57776785e3e03b03bdda6216eeabb2140fe847646bdb1a3795f61a4c240c7f867c985ef74de19e5f84ac97f52d9e
 EBUILD terminfo-0.4.0.1.ebuild 649 BLAKE2B fdc3bb5d4ddc10526f7373732e104ed911214efe7373563e6cc2104b9cc5f0c223b543275e06e14a4c6dd6f35a639936addf446c69cfd3b0e2aeeddf3bb32c90 SHA512 1768c328b208cec4b8bc17242fd4f72451bf95a2932a7efb2aea405c4fbc8b3d0703f478eb1e76b01f8d5c416959fabf35760f2823c9c18c0082266f29852534
 EBUILD terminfo-0.4.0.2.ebuild 712 BLAKE2B 8a418fe91114cae0fbd7b07b238855be726a42e09492f7a196ad4af94ef7c5177dc51b97690e0b10f48ec9fdf4d762c9d3fce0e3b3c19a2e6cc0be3e586af70a SHA512 4a8ddf479ff596fb83286ce542ca7673fb4d3c1014eb40291df0baf70ebfe41ae87103f6d78746245f862bc32eb75d74401e8999a5159442eac218ab618db7fe
+EBUILD terminfo-0.4.1.4.ebuild 694 BLAKE2B 198803287f7a9f98a8b6ac40a54e4bf25b267326f00313dbdbd54a8e11baccbaf1fb29fec98ff048d4c063021457da1c0fb0012482862d983151e70aed55d04a SHA512 48556bde990cdf0dbab7a6e320e984036e6d0a30bb6e4dd4cce51543ab31726d15e4d2657e648e503abab8783e75769bd2ef245b77aa736b722a885417e78a87
 MISC metadata.xml 306 BLAKE2B d582705c23d944c9c5e719cd7e5bd3ec21d51c972a9a6d1745ce7ffe7be67a02cce445aceffe320deceb2a3bd14e259e0f5d0a106f320abb7c8ab8cb6479a3f1 SHA512 265a8a424b9ec088d8f4f0902c294e336b1265a1cb538bf7aca854055a88a2aa2a33c22843b4a98007ff84b6699be0d0e68d7b9e943462a673580f5afd39047b
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
new file mode 100644
index 000000000000..c179dc6ec011
--- /dev/null
+++ b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to the terminfo library"
+HOMEPAGE="https://github.com/judah/terminfo"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8 and ghc 8.10
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index 89bd7ebb1f97..f7cfc02c81e7 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1,10 +1,12 @@
 AUX texmath-0.8.6.3-build-deps.patch 503 BLAKE2B a4ef69b969250fb2f3b400cd570f9852da5de83751624cd3905fc866af38a25f2f0e5755da6a799c746a6cf1605a0d1c1de3f7e92316aff478a3878938ea71a0 SHA512 0b9081cec67289ce4b64bf222d61e4621747bc256717bd347158d344be75762001e4c1a6a36b9bcf70d553fc80dad36b9cb9ae7b5611532b16bbe5a7c4c6e8c9
+DIST texmath-0.12.0.2.tar.gz 1792597 BLAKE2B 17981e435d870a4640f6a773be02e99dbaee295a420b11f90f357b9b483e9b8f5ff3b0363178b9fc57afbf7ff99328454af9c6ae8606a194a57d72ddbef968e0 SHA512 d5b3418492495f59b493bc418e68f4e66f7d2b4eb1293b540b1eb00312a7cded7eb4dba9b178224d311a1999fefac49b5cbb5caa50a85296292cb35d5806dfc6
 DIST texmath-0.6.4.tar.gz 45075 BLAKE2B 3272642b243d693d0cad77b71c1caa9cb3131ca90ea3e047b8944e931885cb778571c25da25ad5f0bad70ee9cbfb029ae3dff1a25a2722f311e300960b8601a5 SHA512 b6d1ff64cd7c758687efd656a8e0efdc9b6a1eac9f0dde5cd5d7d07fe6b3c8fd1a62145413b950b443cddd2a434151bc490148631b75fc853bdaadab2b5b0640
 DIST texmath-0.6.6.3.tar.gz 46983 BLAKE2B ceb6881b7dacd496d252c6a911407d30194254b157d6e84a640dd447646849cfd8ac24f78ecdc848e1cc280cc2084b73403d12ab809f1abbd6b12f8a826a2f5d SHA512 f6e41b28445751a2d296c9d0effaa95bc4962bb7af037ce277a4b59c0eb8e83caf7389cc420e4839b3737764c2bd7c15277771afdadfbb4310112e9ba5477210
 DIST texmath-0.8.2.2.tar.gz 1599187 BLAKE2B f65be60aee417cea0ec9d8e20e257a39de3f64a0288376914f63980c3f13def3473820f0b696f5eb11f210dec80f6d7ceae7c7eced8a64bbd42af712717271fc SHA512 2c8806ab0386acec6ed963a4574a5a24a07eb49a833a51021fef48e3a975012a083bd43fc4172399265430d9599b79f3ce1e5edfe785e80e92f259efc9dc674e
 DIST texmath-0.8.6.3.tar.gz 1605299 BLAKE2B 89f9272b5a19cec18996e0b39f9e39c3f47e21a6990cf8c4467b5d0315d18e37aef506b06b12d470992117d87299972820c15bb1282d22d993936bdbfe3ab80d SHA512 d4ca9f6b6b94f491b2e6a9c110f7f8130047691b62266e6c0c928e3a7aed6c289484d93a9b69b9c3e7454a6bb404e48c5ac09d37f98f7d538d2a2825b96c7478
 DIST texmath-0.8.6.7.tar.gz 1595061 BLAKE2B 9b41f35efd528e924ac8d6c56a8403599ac7ce35954fc6c7e39f38fb26c0fcb153c19a93a4b4b3969102b87156784c19372049d2a68d8431fed5d023011a012e SHA512 792e81395d092b7606d2f4c4cb59afd03f4226e611ca4e7a9b2a087c507345c709a92853cbc5d780729ea47c849cdf3727528bdafcb2b9217b4032041c937202
 DIST texmath-0.9.1.tar.gz 1596703 BLAKE2B 94fae6b9b3d1dec548d8e1b929c355d1cecd2cef638f7cfe5dc4d1e6a96bfb23a56535ee717fc59b18afd7144778666cc1ba6dfcd3211343f6fe9b5d9117a7a0 SHA512 6aba502dfb9f5163115f229ca9484ef1df72e712494b95e6e050a2e655684addec564bfe0a261db2efb45d0a6a0ef4547a856ff85031a9954c04e0fbe7131269
+EBUILD texmath-0.12.0.2.ebuild 1231 BLAKE2B 51edc7b5441d820cced293ddfdc7f7e54e90fc6094c2b2d247b59b550bb78ab1f8cdaa171ab1eb42be41f63a9eaec5c54152ab3a4344cede0f6c0deb3ed72b36 SHA512 da3ee5a9943e2645f7743f8227b31ccea1773ef24a3ade1fe5be1874546443b2062d7dab533246f32e3bdf0bd7b74084b28cb9624a49776e2f83a31dc16abc42
 EBUILD texmath-0.6.4.ebuild 1103 BLAKE2B 37c9dec4f11dd5f5076d719d9fc615ea2eb1d0a0278073866c4a0fbe418ee91bf2bf2c56130d305097bbb0292c878dbad25cdf344a8cbb1ed9b0e007eb374c11 SHA512 f6bbd73eb5ee9f5338b5d1d1dfc37e498c33bdb1a68a123f7a7b77fe338730d477aeca4610b1bf37495dc99186ed58713835673efba1e4d6ea23ddb35504dd4b
 EBUILD texmath-0.6.6.3.ebuild 929 BLAKE2B 2338d4cf07269a61baab9aa49e455691e269d27c6f328d531b434a2af4d050c2f472d23de78f27ab8e05afba793a8ea2f58a1bc93d3143bbb90b6839d71e3e80 SHA512 87b957e43152c8fde6f34f2c6a352cab8518c4c963b7515c3889e5ec3061c853921422773b077897bf96f4fcb8bcb31fb45f9198ddbab650917cfcc9480c2099
 EBUILD texmath-0.8.2.2.ebuild 1283 BLAKE2B a9f71695d934549894fc4a56463dce74ba7c892b1bc9b7042c7475d926b8e41f94b012dbd1bdf5033ff0e88c6dcdb22a0b2e13b00cc05090277decb9dafbe778 SHA512 5282499489d34dc17cf5a4b9a066b063f7f1b76860678564e5ab15b15d5e7f554cf5df8f955ad6a641d700aad8dacd5663fe48dbec12319a458da11c951ae22c
diff --git a/dev-haskell/texmath/texmath-0.12.0.2.ebuild b/dev-haskell/texmath/texmath-0.12.0.2.ebuild
new file mode 100644
index 000000000000..c116e53f3dc8
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.12.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between formats used to represent mathematics"
+HOMEPAGE="https://github.com/jgm/texmath"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable +network-uri"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?]
+	>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	executable? ( dev-haskell/aeson:=[profile?]
+			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/temporary
+		dev-haskell/utf8-string )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/text-conversions/Manifest b/dev-haskell/text-conversions/Manifest
new file mode 100644
index 000000000000..a1f651c5bde5
--- /dev/null
+++ b/dev-haskell/text-conversions/Manifest
@@ -0,0 +1,3 @@
+DIST text-conversions-0.3.0.tar.gz 5232 BLAKE2B d06232313990941dba2c300703a1b6b9b65c68583b8e8a77d6f8536104e39af2d7fb5529e52fc39b1c554fe50efc5df9fb4397305bf4e763b3fa5425b8b72189 SHA512 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
+EBUILD text-conversions-0.3.0.ebuild 772 BLAKE2B f69a94bd4c116d81ee73f7332d0bfd3ec4ac54787df36caa8d8d3a0ae004699b13f43e0f00f40d271f93fce6b3ea3082c227b937888c73a66a734cda127ecba4 SHA512 4b83d66a8ceedbdffb151ba5f3ec4a6eaac9cc0c968e8a104250e84f9aa806911d37669b6d553dacf003613b2429bec75abc730e95c5c68fb2dffd59e119d375
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/text-conversions/metadata.xml b/dev-haskell/text-conversions/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/text-conversions/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
new file mode 100644
index 000000000000..c44a2a92df24
--- /dev/null
+++ b/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe conversions between textual types"
+HOMEPAGE="https://github.com/cjdev/text-conversions#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/errors:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		dev-haskell/hspec-discover )
+"
diff --git a/dev-haskell/text-metrics/Manifest b/dev-haskell/text-metrics/Manifest
index 593f0642e3a4..aebd1dac59e1 100644
--- a/dev-haskell/text-metrics/Manifest
+++ b/dev-haskell/text-metrics/Manifest
@@ -1,3 +1,5 @@
 DIST text-metrics-0.2.0.tar.gz 8660 BLAKE2B 4b849422bb7b9ebad240037295e6ba5dc5a9f427436ca844dce02ba64d142ea559f2a4a10ed1dc8a0fee0aa3ef6d7d0c05dc33eca87286e2aaedfdc99d7524fd SHA512 6a7a2b78fcb7efd03e32bf093b2820837f5b9997574d724fd6e67b789a8fcb166ed1396e49d925c55c278e0e72615ba99e40f630092e961871a7821e5b513d70
+DIST text-metrics-0.3.0.tar.gz 8248 BLAKE2B c700cb94e3b9934c723e6893d90523c5876c64b663dd77a36be963dff2bc5f65d0db30db39177014b062dde1dca0865b893de8324359ca9bcec3340d5ca7e21c SHA512 fa005ad7aeb5fd96ce121c5eab9e83e5826eec288a269f6ce258b3f6aff408c8ca98b8131b6cd14fa8e56f8568eb5a63beb63935335b7c695a3f6e09a979eccf
 EBUILD text-metrics-0.2.0.ebuild 904 BLAKE2B 30cb9330509af1d39b83783b92347ffeb742f5256327efd59a430d4c6976ca3b41a89bde70d0c1e1649670e93a02bcfc67e04609f0d1a1400a5f1fbb50171873 SHA512 534a0544002cd3dde07124e045ac661e6cb3356135195209f1a87c3c18e06a219c11c98d5c6b9238119c2040f88ce924fcee0c86fb72e8866ec69dac97bfed4a
+EBUILD text-metrics-0.3.0.ebuild 1089 BLAKE2B 3d354ea294756908f2d2664e3ab3b4410004fd045691deffe69d05691174a9067c27e01eea23f03af1a85626f6239c1b98b7d06e69753a18294a0a0028a952c2 SHA512 e140d447593410cc097f54436756f9be5f897f667b3bd081622d037184b6935838240a17ec3fa1b983daac38bff8eeddac2173d76f0d623cd7e8a7b40a2745df
 MISC metadata.xml 336 BLAKE2B 9ba78e993c1f379bb032e24feae087b6d449d3113981aa7a9c98a4117c241289401e07e0c6a9896720abc7bca0fa498168e7b9cc77f53a34a4e8f481a15f488c SHA512 eacd97d1db8c4ec90bf90d2b676e70d6a0d38693f02a589151e30c968027b97b8c67d5fd270659d646e5270c6c25954a44d0f58d709aaa2b6072f364c4513174
diff --git a/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
new file mode 100644
index 000000000000..8fa40c3a6f12
--- /dev/null
+++ b/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Calculate various string metrics efficiently"
+HOMEPAGE="https://github.com/mrkkrp/text-metrics"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # does not pass tests on non-ascii symbols
+
+RDEPEND=">=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'containers       >= 0.5.6.2 && < 0.6' 'containers       >= 0.5.6.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 5b65767c5d0a..b4ef1f495094 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -5,9 +5,11 @@ DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51b
 DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20
 DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4
 DIST text-1.2.3.1.tar.gz 157382 BLAKE2B 551012a6b7bfc1b1ad838f977d67981a35b9d13f1cd1b568ce0beed3583c50887cf1ceb1033fbeab215806c5a0d0c5ca39ce2f1aa20fd06365440c3324e8a6bc SHA512 643eb3306761c3e29e05dcd7d64abc505789cd00c60f7a4562e5747f63bcc0ae6f0cc54bb5ed92cc85dbf6406942bf40289baf30aca91bf92ac5215af5eddc98
+DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
 EBUILD text-0.11.3.1.ebuild 925 BLAKE2B 07f91f44c93459935efff682838fb8b5589a1939683e53f8651c86ba54899ca0dc8271968921da8fd9fed1c07a45d3ff9f5236e1f70de779bbff108a3fc8fa43 SHA512 df6a270b4fdaa4bcf2164b448b2531223d587937e5fe3be03714de011323f0e496b07e3aef3ea8b9d2422f30b6ea1df9996d7ea1359be05607b47fb40fdbe92c
 EBUILD text-1.1.1.3.ebuild 1069 BLAKE2B 14146b23e9294a8a8bf335e998fa6d29e21c9d39da92d0cfddee1ae3aedf8bab9b268668ea8dca012e17e2f6296d22ed5330faaedaf9eecebe0955a60a0a6159 SHA512 b8491127fa107a2bc5abd9e7f7cfaa1928312292bd8a0d70d6d2be9358b3830ef6252c76531ae394d6ddec0e86c0cb79ab56fc4e68c83d958f7d391127d86c2d
 EBUILD text-1.2.2.0.ebuild 1110 BLAKE2B 47979429cd5f2fc9674ecde508a74ff86865be5c5819931dbc10bf5f919c647edc17379dfbd8115f40bab7b6c2a346d5ad6f74e4ced6446d26be1b927596a854 SHA512 5f089d1540e05c93aa7c50306066fdbc31c35901e7cf432586b7c4cae4cd8426c9b58b83e369961cd4a350efd14473ea51cbf7b86da9506a8f3b64a393af53c2
 EBUILD text-1.2.2.1.ebuild 1029 BLAKE2B 2c39f84487f91c01fcc2f69ea6045ce1f26162ac1368ad2f738dfdf7d659a442b9c8f66ed93b54b507ebeed77f8dba637ecf02654760e6d5e16d7dfd013bdeb3 SHA512 0050b6bc9ebca34311fb352f14adfe4e7c117c6d2c26f60daa47e825852bb2cb6a8c7610602393198f8dbc64dc977b3a63beeea5853e042ea5da5da8cdc81e16
 EBUILD text-1.2.3.1.ebuild 1089 BLAKE2B 319ec3faafa5bffa20281d4cd48a1897e8dd09f1f0e272677665a9986daaa5e7130649982bbb50c21f72d7360ffe2957e9f6d53e85990ba90c9e8d3ebdca2a52 SHA512 e98ba12aa0f535c8055ab234975b5a35f55b4482a66e9449b7ea016f8cc5718ce836f33a8b09f8ea34a2cc38197354fffc5786451af124fba9db8d129b9f0cff
+EBUILD text-1.2.4.0.ebuild 1033 BLAKE2B acc7136bdfef8283a754cba3fa4fcbc13be4875fc065fd0a936ac3702ff1001a0c6b4c8e2b1e3bddad7e8eca3a71492b8cbccd1e28b0e0f69e864b894b0c058e SHA512 adbe2cb8469fdc6d6cd8be101b4d4b0c56d077914fbc5933008adbf4f947fed12abb931f63fe4d62c66e9e4308260fc7ffb1bfa601a297cb13fa5226b962f277
 MISC metadata.xml 1581 BLAKE2B 104f716f948006fb03fdfca08393a442a26767588a86e5f98ca12cbe54157b9448720e096888b47e0d4f6fdf30491fd6a77e62176985571a045d86f22d0de31a SHA512 398b1ba4d7eb16bd1517cd446278b42f2f15196faad1a59b0d9b04fefc9a63ccef0e871c614561ac7f0db5a3807ea4bd6a4ee5082a1a6915d525cdaedb6752c0
diff --git a/dev-haskell/text/text-1.2.4.0.ebuild b/dev-haskell/text/text-1.2.4.0.ebuild
new file mode 100644
index 000000000000..ea35335337f4
--- /dev/null
+++ b/dev-haskell/text/text-1.2.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -bytestring-builder,-developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+# break cyclic dependencies, test suite requires porting to >=QC-2.11
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-8.8.1:="
+
+DEPEND="${RDEPEND}
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:9999"
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		--flag=-developer \
+		--flag=-integer-simple
+}
diff --git a/dev-haskell/th-abstraction/Manifest b/dev-haskell/th-abstraction/Manifest
new file mode 100644
index 000000000000..4a3dc699991a
--- /dev/null
+++ b/dev-haskell/th-abstraction/Manifest
@@ -0,0 +1,3 @@
+DIST th-abstraction-0.3.2.0.tar.gz 35111 BLAKE2B 18fc993256f6d49ec1e7911d152896cb7e62c3397030fdfb8179879d8b98a666f3f2bf73c3783276f92911698da94338cf5cc6b71df3631d9588d3022085a414 SHA512 d03087e52c51f6038d41a35fbfd0c6ab8b890c6d0aa91bc1a42c46f746f60d3c19c41766006977e0ebee4517bab5aab0f0439a2ed2434e5d41a7086eeb3ecea3
+EBUILD th-abstraction-0.3.2.0.ebuild 566 BLAKE2B 69d17403183f71303509f8d908abad880a03f4aa7eb9e3c1bc0fa693b6993569e7d8ec37f8b34090d8dc45838d12fcf8e678ea7710297cdf5bee2e2c2a31deac SHA512 2fcbf70f4795d52b335de0f0cdda5fb0532a37afab694915f3b97a8619dda158ae7900ee0edc45535ed7452a231334ebb8f78f2937cbd0c48e2f196c8894197b
+MISC metadata.xml 535 BLAKE2B 2785e512c42eb7eb897f0671bac2874e1e86d39b470296787104a8979e6a1d7150623e8d32676993b08276f1d1a22966d22ecd5fd51079db6b38c45aa28a0a7b SHA512 1bde6ba06ff18acfa1b4303454d2feca14eed05ae863f148338c7f9f383eac25e29bf895c4b2d846eb7b11f4bc97bd28a9da617365b6a6626ec5b12c41165ae9
diff --git a/dev-haskell/th-abstraction/metadata.xml b/dev-haskell/th-abstraction/metadata.xml
new file mode 100644
index 000000000000..c95ee5398149
--- /dev/null
+++ b/dev-haskell/th-abstraction/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package normalizes variations in the interface for
+		inspecting datatype information via Template Haskell
+		so that packages and support a single, easier to use
+		informational datatype while supporting many versions
+		of Template Haskell.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
new file mode 100644
index 000000000000..3e84fd2704a6
--- /dev/null
+++ b/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Nicer interface for reified information about data types"
+HOMEPAGE="https://github.com/glguy/th-abstraction"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
index 5bef8e382d55..248228c42697 100644
--- a/dev-haskell/th-lift-instances/Manifest
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -1,3 +1,5 @@
 DIST th-lift-instances-0.1.11.tar.gz 4477 BLAKE2B 22816020076245c154003ddb5a1523176368ceea47ba8d4e5c1f428227a2268079db59aae204c0a9012c565ae6c87991c6ede112926d12804d9a40efed5d4f35 SHA512 e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a
+DIST th-lift-instances-0.1.14.tar.gz 5712 BLAKE2B 02fd3b2b1073a49c58625237514bd898d0fe7147225b52ba11658d9fea5fc6c6d6f392c92315fe5bbf529c11a263964a2bd3310d7b451452fc548212e44b3bcb SHA512 b0050866a250c7a5f55f47307e6482c49373d1cd09372c38b3c5c58883662f794a0e5210b9ba7e5a60536fd20262aa14cb7e94edf576cc69be5d2b33f21d21be
 EBUILD th-lift-instances-0.1.11.ebuild 719 BLAKE2B 2e1d2a61cc57573a78754a58ef56ce3cf314a8946f44a1514d823434155aa8441212fa7bf03436f5dbc03fdb35922f898c8ffafc0d885df56e7c3f4580bf8908 SHA512 2d03b6b9ba3aa008dfabb0f524388d2cf1197b02c7fd791a2cdbc01c364d5582d0837eaaa315702a89998308b8124c9bb5ca541580894ce4cfcc579f2182a52b
+EBUILD th-lift-instances-0.1.14.ebuild 841 BLAKE2B f95ab4e08645663ef36cd98a56072943af681aec8c7e65b89ce1d8408b2bc4901f13c11a5b2318c70bae7d0b19fc12769d623adb13bb47fdd3be52b64b1232ed SHA512 b5d9d6af14ba556e4f2a3a536e9e2a44788f9d3607058fdfbbb4b5545944944a924ba274c7158f3cb75f76efec68af5c319cc7e1bb871bd2d538ea0e1c0ef7ff
 MISC metadata.xml 440 BLAKE2B 0309320a428a71aff074e04b2e20e62905f909b1d199212162e8aaaab7e5ab1862b02648cc4c1404f64cb0d04129624b491539ad64914788d0bfc1219ed21413 SHA512 1a710e960f2ca951491c37074a9cff05926b77897533a69d45645f5c3d17eec377106dbafe542d9bc3b7e7695f879a2059387dc2e1573d67de662732eb9e8e86
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
new file mode 100644
index 000000000000..6cf4d601a7da
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-haskell/th-lift-0.8:=[profile?]
+	>=dev-haskell/vector-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2
+		>=dev-haskell/quickcheck-2.6
+		>=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 )
+"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index fd0077e49814..41d3be2dda9f 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -2,8 +2,10 @@ DIST th-lift-0.7.2.tar.gz 10980 BLAKE2B b430d5730447332fffe56722a51aac7c8e113d95
 DIST th-lift-0.7.5.tar.gz 12147 BLAKE2B 4751beec45d3f0af90644946682b75a9490ef403d6fbef8ad9d6f5a3c367e8a37b7727f629db5a6d92d6be2f938e9eeecb26a79a0dfd977f34e108d17dab8069 SHA512 79d01b50d424206602c810d2cd2c810b85a098737926f343c47c818bd43b2dd09c32964b52fa6fe4acc2462be16bcb4142b386337207321352f3e6d450158589
 DIST th-lift-0.7.6.tar.gz 12390 BLAKE2B e038e75631f3dac943b3baff060259c8daaeb0d7d7f0d62e081d85d0d2da7f49223b3106438ec8b01edbb4ed0911ab8312c214a5c7bee7ee2ce6ff8f5a97c1a0 SHA512 701d0064ab55414706e664ce8d8fa006329b3db6d04647204e1039ca267a5e5a2f7bbce477c4530070ccc1e2b23ac1653da24b765ea6340cafc696a077cdaf83
 DIST th-lift-0.7.7.tar.gz 12399 BLAKE2B 1dda0ef48694ea9d9f25b6f44ef7c7e3b16f2492d78de04b0d16a0b1cb7d2f36987ce92578df1286e869158cadd778cff92813638ea13be0c6710fa4d92f3cc5 SHA512 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2
+DIST th-lift-0.8.1.tar.gz 13816 BLAKE2B 4e8a8231a77c3b98ab05a9a3ed0c682a09f61558483c832bdcfce42391199a8fd27c092252e130a5bb5d481bd364627254abac87f701ae8dde015ddc545168dd SHA512 21fb31f23aa41ec2c1979b7ad9ce467d9ed555237f7d4236b1400cb00bb7531832b269c1248062fe478876e9f8e4a2968171999a4c8264756ad10aa7e5983fa7
 EBUILD th-lift-0.7.2.ebuild 552 BLAKE2B 7674a16bc10a32ca24ff33e8baa379a9b969869bc65f67a73eff27f5039a60c51d77c7bc5760d467850dcac515dca896787316e3dafd33adc2718f9f8936101b SHA512 947a46945db40ee96121294b67bd219f3504bda7545098c3e1068f31179658324a576f52ac4ecdf3f828d54a426b154e46771c111649dde68fd4aaa5ab4bed82
 EBUILD th-lift-0.7.5.ebuild 557 BLAKE2B 6bac9da26e76ca3de3084d97cd963c462285dc9034dc78e9bebbcada01b02c04af9627fcf3ffc47481ec00b686f7bfa6a175a2e1a6fe51090515a6a5be1355be SHA512 f8999a1152c6baa5c068e35ec0e60f359464234f2e96824598bae9dbaffa74b907d1ca72990ed30f80e7d8dcb899a70b9d2605a40dff67cd64c8daa2b9ab5766
 EBUILD th-lift-0.7.6.ebuild 557 BLAKE2B 6bac9da26e76ca3de3084d97cd963c462285dc9034dc78e9bebbcada01b02c04af9627fcf3ffc47481ec00b686f7bfa6a175a2e1a6fe51090515a6a5be1355be SHA512 f8999a1152c6baa5c068e35ec0e60f359464234f2e96824598bae9dbaffa74b907d1ca72990ed30f80e7d8dcb899a70b9d2605a40dff67cd64c8daa2b9ab5766
 EBUILD th-lift-0.7.7.ebuild 557 BLAKE2B 12916dfcb940cba4556e25d6cd97bac938472910f1fd8e3e25c9dd960aa95a97711da3ef052308b79d7bba0e5330e519ef7c6e76d1c83399e87a5710a831469c SHA512 72bdbafaf0238464dbfd91208b630a49210dae77a598fd8d71f1668a4fb61fa27c4f5ebddd9e770a2d2e49dbe3b3ed40122f4da5b1bf67441f880021086a016b
+EBUILD th-lift-0.8.1.ebuild 651 BLAKE2B e6414d8d7fd750053aa992fe28dc08fd3bd4efef21edb635569d08d4bffa134f42be8489c9cb6d3481bed69df40af5be8d1c43c11774ceaa8d52ee676df3cf0c SHA512 1f5506a3b56fc36ed4f66252778107a34d554279abf55269435cc120ab687aa361c4b0ce003aa03b6b6c0a33cb2485ff415556efb6bff60841983f9deeb9e2d3
 MISC metadata.xml 420 BLAKE2B 7941a77b62dbbe6e315c3bf6458fb0fef97a4cd3861012378aaf784bbd43cac2bbeb9d9195c42c2d4333f440b45a94cf50d5eb4949ae6d1e43e33c944fbf0676 SHA512 8805d1ba9be8842c874e915b742fbff33e5c20a236858e0371e7fc402b8c7bbc0adc16b57c7f86bad097ff98db2ca3295df1b12abd885a134caa421e61bc0175
diff --git a/dev-haskell/th-lift/th-lift-0.8.1.ebuild b/dev-haskell/th-lift/th-lift-0.8.1.ebuild
new file mode 100644
index 000000000000..3277d4a608c6
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.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
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Derive Template Haskell's Lift class for datatypes"
+HOMEPAGE="https://github.com/RyanGlScott/th-lift"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
index f065eab58537..c3aa9e77cabb 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1,3 +1,5 @@
 DIST time-compat-0.1.0.3.tar.gz 2256 BLAKE2B eb94a09bfa0f1feaf41272c2fc7825e88c557cbfc6a9946886e871a75adcacb3aec03eac970baa409dbec1d2a9c6dc637ef121a0ba26416b59263a08c70fe767 SHA512 d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6
+DIST time-compat-1.9.3.tar.gz 50050 BLAKE2B 9c6f457945a975d88fe1784daf7dbf4a0b96c086cdd05af97a3b0d9d2379777c985b8b73dd592f588d4e09aee2fc987ed4b97efd4d4199841318114b379a8c5d SHA512 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a
 EBUILD time-compat-0.1.0.3.ebuild 584 BLAKE2B 01e628f33734e3aa79a66f71a2a8f7779e075a2b9163d697a0437c8ec4c2b8b284b31e50882a0dec9c5be8bce40d1ee8b04faad377ef9474c0169eb9bd5981de SHA512 e07f09ac0895104c4da8ba4042bae4a16ea3a763985b5552f7ed2b92ea0f9c70bc688cd81fae29ab50e16fc43d4a20e5577cbee12e4a6d4713d9a4e69ff44b05
+EBUILD time-compat-1.9.3.ebuild 1481 BLAKE2B 5c1bb85d1b748888124e04a61cac8ace0fc2c212fe1dbaeda469744bff1d3947100ac6a539bd0c04a7ad8418d6015bb65d22c6c436fcd288851b0215176bdb28 SHA512 c9a34e3220e8b343c491059bd7a717f07b37eeeb081701458b8ed7e83eeafba3f0f730728e7dc8d2d29168733efeaee94c66071d1b642a184a74cddc4968e992
 MISC metadata.xml 378 BLAKE2B d1e98a535cbfdcb0f93c390b06035c173db8ac7dc0c65fa79ed3112c5767915b786cb12466df936e2ac548832580fdbb37f471f7c438f5abbd137c682127abae SHA512 1233288c38cbab9385bc4dc903e883229b083fe05a6e2b4e85a48f36681c310d4e718d460aadc6ad32edf37acfa7b01ea0cc5a67e7b2da3e5d2f65bf413a3259
diff --git a/dev-haskell/time-compat/time-compat-1.9.3.ebuild b/dev-haskell/time-compat/time-compat-1.9.3.ebuild
new file mode 100644
index 000000000000..f6868dc7dfc5
--- /dev/null
+++ b/dev-haskell/time-compat/time-compat-1.9.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="This packages tries to compat as much of \\'time\\' features as possible"
+HOMEPAGE="https://github.com/phadej/time-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires quickcheck-2.13
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12"
+# 	test? ( >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.12
+# 		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
+# 		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+# 		>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3
+# 		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# 		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+# 		|| ( ( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
+# 			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 ) ) )
+# "
diff --git a/dev-haskell/time-manager/Manifest b/dev-haskell/time-manager/Manifest
new file mode 100644
index 000000000000..d83d563cd705
--- /dev/null
+++ b/dev-haskell/time-manager/Manifest
@@ -0,0 +1,3 @@
+DIST time-manager-0.0.0.tar.gz 2726 BLAKE2B 911ee2ac8bb028da7bddc472deae76ac4af38c2998e2084bdc5e34567d4a2b367c8ffa9038e20abd41695f0e46a0200c5f95b9693f88cbf6e980d2a0be38cefa SHA512 aa8bd9dc9a66ea097fe2d6a6d9e77eff67debc58a588da7ae1d6fc312b6bb371da58b413b58cdba21623e2da26633595f379ac9e0a7a6dc7281ad42353231054
+EBUILD time-manager-0.0.0.ebuild 552 BLAKE2B 94f127447dcd9cb126d4b1f96b288ca56f8262e2df1a9b2230cc5188e3fa70d18e329f30910b5d26a7c05430e20a498029398214c212efae9845fad244bba917 SHA512 066baa8ccbea65b6c804b924e1a46740a00cf8a642d668a6ee5920b25b17166bc1128fb627e67ecf6b4aaafe3512c16bee61e39c593b87025853817ff535633b
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/time-manager/metadata.xml b/dev-haskell/time-manager/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/time-manager/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/time-manager/time-manager-0.0.0.ebuild b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
new file mode 100644
index 000000000000..2748b6dcb382
--- /dev/null
+++ b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Scalable timer"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/auto-update:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
diff --git a/dev-haskell/tls-session-manager/Manifest b/dev-haskell/tls-session-manager/Manifest
new file mode 100644
index 000000000000..37ffe42f5c60
--- /dev/null
+++ b/dev-haskell/tls-session-manager/Manifest
@@ -0,0 +1,3 @@
+DIST tls-session-manager-0.0.4.tar.gz 3821 BLAKE2B f86aefd6d6ce07383ab7969bb877cabf301530685095cf29a7f5d037ad59a227bddcb0629bc74bd9dfb594727fee1c32619896e3677cfdb8c5ef2578b89721dc SHA512 8516a2a6a12ee33ca3cbfcf33f5108218dcfea54b092a5292cbe0935b1c181d1aa26d171eb1f62d93ac80bebca21221598a07e225be5513743b227ef6908fbec
+EBUILD tls-session-manager-0.0.4.ebuild 752 BLAKE2B b5c84d0acc9dc65b9c6a16f1b32c3cdb5ecc874c0e9c321102b3ecced16a8db6e2c69a7cedd118781880ba12e9e1eb787bf2748b681f40d349f008096d37e22d SHA512 10fa8da0264902dca69c39ac106ed72d33848356598cf6c16277c1369acafe38e19f1d79a834cef4e65c84fe0f8c0219e3b6cafac04dfe46a267660d88c14a32
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/tls-session-manager/metadata.xml b/dev-haskell/tls-session-manager/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/tls-session-manager/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
new file mode 100644
index 000000000000..e997913691cb
--- /dev/null
+++ b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="In-memory TLS session manager"
+HOMEPAGE="http://hackage.haskell.org/package/tls-session-manager"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/auto-update:=[profile?]
+	dev-haskell/basement:=[profile?]
+	dev-haskell/clock:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/psqueues-0.2.3:=[profile?]
+	dev-haskell/tls:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index f5bcab2c597a..c3992e9b160d 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,7 +1,9 @@
 DIST tls-1.2.18.tar.gz 74115 BLAKE2B 5fda3b303d095afc079516e55dfa403cf01de4c77d5c1cb09ba39ad4604b021fae13932bf5d544f9d888aa42214c946fa1597bfb70595f8b5bb76bf9c4afe03b SHA512 34648a2f42c2a0f54b50a10daf3f9b8fb8452aa48e811122f8c69336621c45214a293fa85f8db5a9d568a5cbe7f114c8eef97968c76147d9ef016a8c3d2375ab
 DIST tls-1.3.4.tar.gz 77920 BLAKE2B d82deb31a6fc08b2c9b4ae1ae33b130f05b0de52fbded6af42ce8f503fd504951446d0ba5220281b3b27120e91ada05668177294fc1362515dc3cfb5f94ebb48 SHA512 8b90cd2e9f31ea5dabe0fc8669bea43ac144ee7dfa3fdcb465a31975c35c45fb8b82cdc6175801fce7dbb9f52aaa594b82e16ededdbb7fd697d5fa673ed7c777
 DIST tls-1.3.9.tar.gz 88354 BLAKE2B 1d3d6be5ead5074c5583a2238a2f3352ba4b1f4398a891642e3ff2e5fc4375c669a81de64f9f10f1b13ade6c3a2e57e3b6507ea0d31bae0e6a218107558115c4 SHA512 bb7d573e44707121fef65c66b83086b0bd477d3fe526d0bcc9dfa0a59059d340eea6091bb0d6b36819bd2999d2ffa581d3591dbc4b2000bf5e1ba6dd40923446
+DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
 EBUILD tls-1.2.18.ebuild 1815 BLAKE2B 3722b7327b66e624069f26ce075cc32bf9bd9941e0ce7b6dead9304dabbcbb1547950f9fab2d290a061dae70537646f6870d4321374e18e95cfcc44c9f8a9699 SHA512 f971bd462d17797c0de02ac12fd2a45c33c5bb34e8db0cf91842f5cf68d4617f2d9a9f5583aa85f97a1dc30f5d543f52d8922269355a63ae318bafe2ce47d537
 EBUILD tls-1.3.4.ebuild 1449 BLAKE2B 0a756f86ed283eb8caf8ed75804e4b20d7a3a0ae8840145e386584e265c41577d4be2d46d1056efd215948ed3ce29c3379cc03979fbd52008666a75e6dd8c4da SHA512 dc17c8a66a3ae38a421af64a63945a60419040e86153f82d061acde2ab47b17e4c34f7acad1dd3d1d2e367381674c3fd62c551ca2f0d73c3f1c18d4432c58657
 EBUILD tls-1.3.9.ebuild 1376 BLAKE2B 940c148c7fe02bdaab8a815333a02ac32d937c9114eecc935b19aa41c695cdc6607699b28293a275d777658be0cca63020c3b5ea07d1c2f9bc7b5b5063e97ee9 SHA512 01c175d15ca035868beac1350b1378114a3ba0a98beabec04f5de14fec56326c5444a2f008e693f3a994a2a6bade3dcc2dda6ecba86564c561ccce2f73f10d22
-MISC metadata.xml 1116 BLAKE2B 9d00bcd54e0705289cfaa53b4de66f26abe5aced518e3a2297e006c3831a47211a765fc4b67546e99ece24df406dfa27c2917bbfb886becaa9c322cc981b9fd7 SHA512 d2edc3311ce239a521e6f941e5cd4a98c25b70376b18b8700643e06e580532d7d6d1b760b5229871f3fe938c89e47cde3734a7c87de1427b83950cd22d73c590
+EBUILD tls-1.5.4.ebuild 1399 BLAKE2B 9569e6d3a69164e32bac310dd4a800d02c5b9cc1aff8dc36fb23d64e111a7bbabaed6642d11ad5d1a0e968aaabb1f81265dd8e7e0eed4363df1aba5a51baaa4d SHA512 f1de43bbf5bbd56ddbc313705cf5b835e5af23bc6c4812906ef0edeecdf36949f7ef5060958ead523f250d76bc71a1ecff3c5949b60d215cbd16bc4f25450e50
+MISC metadata.xml 1181 BLAKE2B 7737ea3c8c9ebe16df216aade154dd7b5ced85d45b45e8eb44f303665d358a4384163a544b473be2e43ab25de48b31b1ccf5f7a8e5233441daa34f3381c98011 SHA512 43af0152a0bcc071cd880209b231ef952952d325c28a68937458e85c303706b90183ce8bcf99e63bc17179ded82883a5fb313f075b924b6f91edcf6c68c304bb
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index b95ef7b625de..5e8b0cfbd3f1 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -22,6 +22,7 @@
 	<use>
 		<flag name="compat">Accept SSLv2 compatible handshake.</flag>
 		<flag name="network">Use the base network library.</flag>
+		<flag name="hans">Use the Haskell Network Stack (HaNS).</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-tls</remote-id>
diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
new file mode 100644
index 000000000000..e3524550f229
--- /dev/null
+++ b/dev-haskell/tls/tls-1.5.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
+HOMEPAGE="https://github.com/vincenthz/hs-tls"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compat hans +network"
+
+RDEPEND="dev-haskell/asn1-encoding:=[profile?]
+	>=dev-haskell/asn1-types-0.2.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/cereal-0.5.3:=[profile?]
+	>=dev-haskell/cryptonite-0.25:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	>=dev-haskell/memory-0.14.6:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
+	>=dev-haskell/x509-store-1.6:=[profile?]
+	>=dev-haskell/x509-validation-1.6.5:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	hans? ( dev-haskell/hans:=[profile?] )
+	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag compat compat) \
+		$(cabal_flag hans hans) \
+		$(cabal_flag network network)
+}
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
index 19eca065fbe1..886062724b20 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1,3 +1,5 @@
 DIST transformers-base-0.4.4.tar.gz 2550 BLAKE2B 39bb717561d9cd44737787c6770fd3306726caf6fca50b74015f6b28b47ca330edcefbd3ab2f1131875b3d918d1df6d44890463119ada422fd84f735046c4cb5 SHA512 5dbcbb321c7dc07a70af426cf3426433e9000e94278449ecbea025b79ec14f49cd9c8c35ea56ffa2b18444798c088a9db05badc2c819739b6ddd583c04114ea5
+DIST transformers-base-0.4.5.2.tar.gz 2849 BLAKE2B 9e1f1aeb3ced732c4406e4636ded466bd2f26c253d80caf321441505d6ad24912f108d464b6d27b211a6ffc128ff6d85003162a9c4709574645754e97db94461 SHA512 5953d99fee3a02f825c096cf035a5ee825da17e154ca9847ddb215dee54a96a8b28af2b4adb639ef3548ea9aa8a2cb781563c7ffbb399bed5a35c056d03bcbd4
 EBUILD transformers-base-0.4.4.ebuild 827 BLAKE2B 601f8e8f77f4835db1ad56fe2bee0b0a066af60be79cbfbfa230bd7e8380b9ebccfb73626c47c6788a03bc5d000417141161adf242372be72b4c4b425a147282 SHA512 730b96a7f18449015913467f81dafede72b379083e54b3be66c1e89babfee84a3fdd0224e1efd80a04271599ce5592c892a2156cdbcbb09307e01b368a1215fc
+EBUILD transformers-base-0.4.5.2.ebuild 847 BLAKE2B 22d2222fe6053cd861818162eb0ef6a43cc46b8ae6a8b672eb85f2479c26e6b775ed7296357926eefc0840091a17f12f81ee28297fa0afda15e40e179e15cf54 SHA512 124e0e65cfb653179e3ec60bbabd6e4d4d0d7c1183c64b1d8aa4ad32574e0d04879b2088fd38665c3c540a5eebdd25d72a43d5d8eb4b13673bb06e785eb41ac6
 MISC metadata.xml 565 BLAKE2B 636eb3403e0f9e00e87d4f1136dd524a1be1afddc18fd6a550d67266a2e3a50f03de43d1c398e3cdfcae4b2ce292fb7454b06d192fa49b9d15c68d940c75b7a7 SHA512 b965edfe8de254fd4968dd092f9248521a2089da39469206779ea841f45655d39b496bb20f37f3e529e71b5fb1ce8f32cc569ccdc0577f108cdfd137343705c0
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
new file mode 100644
index 000000000000..439235e06baf
--- /dev/null
+++ b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lift computations from the bottom of a transformer stack"
+HOMEPAGE="https://github.com/mvv/transformers-base"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+orphaninstances"
+
+RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag orphaninstances orphaninstances)
+}
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index d8608f9883da..41fb4b02f90d 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -2,8 +2,10 @@ DIST transformers-compat-0.1.1.1.tar.gz 5221 BLAKE2B b8c050fb67bfe43529619bc14b6
 DIST transformers-compat-0.3.3.4.tar.gz 11143 BLAKE2B 3fd082d92945620acbe1cf043c73b9d22322581df782473a40b507260bd8c5eaaa6b475f9659863a2b922d4edff388d336946ff423cc9a99e934ec0a5a03d2ad SHA512 1f50ddeaec4ea2e17ec348194a6efcfab35c4b9d49f9eba9e70a0c1ebfdfd39387461c133fb99e6cdad234b7facae74fa73c99f604807d7f3ad7c31d0188d462
 DIST transformers-compat-0.4.0.4.tar.gz 12048 BLAKE2B a72513e0a5b482067ee912e467c29166bdebef75bf70cee9661b6f8e3a649cbdca57cd159483f4187e520425b46a8dd600e7f5b409705f67e851d9d11ec91c24 SHA512 5850fa8ed63684b3dc37897c22d1d32d7412374dcd892e42db7ed975d493fdc8e216630735813ed00203f83dcd17722484a6ec182ccffb6fc8794b4b82b6c951
 DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
+DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
 EBUILD transformers-compat-0.1.1.1.ebuild 612 BLAKE2B 54b4bb7b4fecbd87dee0af032b1e7d25938930f472794ad7e048234107cc7ee7f6d3bdc2b0fb461e5f924e62aea6ea774eb0cf4eafa8dbe153610c2bee50b24a SHA512 675884c3ce0c6c13ee747e11642db834ef60d893e5b693c223b976361411b5947976b56ca88b78f7aad836f2cf721c0019fdb41a10e6c18e9b93c0451435c8a9
 EBUILD transformers-compat-0.3.3.4.ebuild 898 BLAKE2B 792c5e693266c921b63546dfa20ac4ea5b7904710b769d45df042760a8c1f00f26cb7961b78c639779820fc674afae1b1e9495ab3a103e5cfcfc3aa3a9d08648 SHA512 774491521ba050b4f96eed630fcbbd795fda1c5d3937265b8cf4d692c00a632d2b3cb371acab2ff11945eb3c1be9938481b3363a959ae1881f06abfd8a89eb90
 EBUILD transformers-compat-0.4.0.4.ebuild 997 BLAKE2B c3a9ee9c79d0b66755ab30f4476c27bde32276bc2e513661850ce298c23feed475d1d54cd48640ac8162d04334bb054c033b9fcc9d359cbe7502d3682fad4dcd SHA512 95cb52fa111e8d9ec04550883386a217008434eab796130557a09e09d75f5cd70065f9023919f8f0923ad3a4a6dcfa6e251ffa9465b0fddaf09078fd8df0ecea
 EBUILD transformers-compat-0.5.1.4.ebuild 941 BLAKE2B 5dacb4377fcedbd5d1cf676b5396bcf73d14bbd2a92a00926113943868e37a631bce1fa1de3c5d3cd6b9a56d05246d2f554f1c3139328a142f01423afe75e2b6 SHA512 945b779b350ec71404a46234fc63fe2419b36cba3a0a8e9a1b2972098c67356b1d83694134b9b0e92cdac11c96d7b47185207279f294ead56976e14ee7be90ee
+EBUILD transformers-compat-0.6.5.ebuild 1501 BLAKE2B 5edcdbbe10fd4e7f7373e91e5b52d0821b43b1e6f7cf30be8cdb8e5666ccb09423dc33a4e4d0aa5481e3cae26a10b87273d146e945abf84bb230c8d06f354ecd SHA512 145064625386656ba68628b032b32f6df0295c20f2c2aca45e8de08036d3f658077bfac69524a7a356ecd383c51fa08473394123c5ba7b309fce9ba85fdc52a0
 MISC metadata.xml 876 BLAKE2B ed51724530e82f2003a7ad612a2f18f22cc89879610b0bdf269461c1c72aab6ddb62e8a4154852e941859ea7658b095af3681e74b11b7f907f0c91cc30c35fe1 SHA512 f83fabfaa75fe7598f14e80ae17846a9f525cf5fae8b407d6ef45ca7e7816b3b04fc0c6ad02f9b2ed0c5cc4ded499d7b9afab922943991fb96d630597a9f4adf
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
new file mode 100644
index 000000000000..5ac53b6cbadc
--- /dev/null
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -two,+mtl,-generic-deriving"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
+HOMEPAGE="https://github.com/ekmett/transformers-compat/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?]
+	>=dev-haskell/transformers-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local tf3_arg=()
+
+	if has_version '=dev-haskell/transformers-0.3*'; then
+		tf3_arg+=(--flag=three)
+	else
+		tf3_arg+=(--flag=-three)
+	fi
+
+	local tf4_arg=()
+
+	if has_version '=dev-haskell/transformers-0.4*'; then
+		tf4_arg+=(--flag=four)
+	else
+		tf4_arg+=(--flag=-four)
+	fi
+
+	local tf5_arg=()
+
+	if has_version '=dev-haskell/transformers-0.5*'; then
+		if has_version '>dev-haskell/transformers-0.5.3'; then
+			tf5_arg+=(--flag=-five)
+		else
+			tf5_arg+=(--flag=five)
+		fi
+	else
+		tf5_arg+=(--flag=-five)
+	fi
+
+	haskell-cabal_src_configure \
+		--flag=mtl \
+		--flag=-two \
+		${tf3_arg[@]} \
+		${tf4_arg[@]} \
+		${tf5_arg[@]}
+}
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index 477e2a5b818e..0ebc1d0c8496 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -3,9 +3,11 @@ DIST transformers-0.4.1.0.tar.gz 27287 BLAKE2B 77ed52e3a8f8b9e2511044da19f3cb59c
 DIST transformers-0.4.2.0.tar.gz 27866 BLAKE2B 3501ef6fd01852e19f1e410f2990b8060f61e2dde4fe6f2bc3850344a08d97644e8f5a554ae2d0d8c4248d87331aecf7d0f66330811deb4ba1546065fb032433 SHA512 8b508731cbcbb3221ad6afa17b8ddb9b47db29bafe0fc4ee654538e20c2a0551394e8c7591f3b0abc01e02eaec271f44056629f0fbf26fb077c4499af1d6debf
 DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
 DIST transformers-0.5.2.0.tar.gz 34696 BLAKE2B 426a597c6a23358af72344b0809d9d6890ca8ec315344643853e2549efb47d80cf5008d99175b9352ac704c24a7fc02c4369901cd880190645e3fcd1a5213861 SHA512 4fcccab5cb3dce3430c64ff19705208a03ee993c872f7b2581b3c84d44a835f344f253d98cb371fbce4839b393eff67d95bf57e079fd75e347f1a37bc85c6c5b
+DIST transformers-0.5.6.2.tar.gz 42370 BLAKE2B 317c8f557e0e37503546323096a9e2c880dd9331708b80b3041d4caa325b1c863b147abb433c0cdc15b1650a7412cb8579d96a8f819a93223b8588bffb440d8d SHA512 f871a910a5c31af77a4b9711f01b5780b1f657bbce0fb37234c97b8245d8504c514950f9e8673a606405484ae175cdb84c0aee7a05df8712cea02299c652cdf8
 EBUILD transformers-0.3.0.0-r1.ebuild 706 BLAKE2B fedf8a32e30306fa66cc4da88f7339d82b869ebd4b6c5fdf76d15169fac5d43dfb570d6362bb54a412517bfa241ebdea32461ae8881fa2e126e404970b034c8d SHA512 7ae2feefb6b0c35bec929a40e40f3cb1405d8ac1479af308986320053136c52033463f2a89298ad4441f6576b98a4a746f4716da94cd3fda44ac5261612efd02
 EBUILD transformers-0.4.1.0.ebuild 627 BLAKE2B 991bf0daf31f6f8fed9d0fcc212d50fd1f296a1b4138b393fe2c27f3938167accac8aad84054d52d45547b06550cd27750fcef2e520cb1e6239152ae30b0feb2 SHA512 f8d08019f4d501794a0b9d32b9b02e0aabaeb30fc2f19d7f5f7cd82c48652c954c7b5494382b452a7bd85e36a4146d14748f6c1f77aa056ca26e02b82083ec0a
 EBUILD transformers-0.4.2.0.ebuild 719 BLAKE2B 5e7ab6431a36f2d7b11fba250126e3a25ead15a1a05d9a328631b931af115d3633e8b7b652b7cce7db68c2aca633dab95f5446bd0046dee963e28bcba34f3352 SHA512 921f473cb0667b2f6aacd19ad57ad9d6d616b3ea3e2979c719d7a2cb0db60f3a30bcf99bd5ee71336ffaece3b7e235b14089ef6065572a32fe1841f2cdcd4352
 EBUILD transformers-0.4.3.0.ebuild 731 BLAKE2B b78cc43856afc37381d1a39ded5f64c59c5c0679c56b86ffd7d3531c3401c5837a461772cd9e5647a35890676cf329681e7e78eb0f9f839fc748802c8decc1e9 SHA512 9ec3c3a7ba344c0c09a5bd03e3c0d01318f4604be1023c8c5c0be2106c171db7e02a5bf88d06763ef3e3f4886ed362e194cf8967d2281684058d99e8df771f89
 EBUILD transformers-0.5.2.0.ebuild 735 BLAKE2B 96e3d4614c2461f2f6ce2fdcc49155b1b5db96950bdf678c7df1be30e29c04b763f3fdb2e49bb43bc3b757af3757932ad4d57be489dae20739511d718ee9d1dc SHA512 c4f8a4ca7f369514a9488dfb76d244dd66bb34bd1451ad60acca2e87db9eaec48dc821ddcf11abebf0c5672b7f004199a0a8cc1947371c9305eba5349f2c06b0
+EBUILD transformers-0.5.6.2.ebuild 801 BLAKE2B e800cdd6aa23882357d288194549deccb3896cfee4d0aa588445c1e1232b0e2aabb2a29cf815f7a676a2653b52a714f0989be0b23bed8bd07ce593e5b256d2e9 SHA512 92c888e9fe495b2424f1765110c907ad9b46a35a6bdd427572dc979e607a60bbbc8a098985e057640cc187e03c06e0f85a935addcebcecd95a8a112be4ea29c6
 MISC metadata.xml 877 BLAKE2B 0586dc1fc804e0bde37650495e3edcdc5a8725e34a0dbe9dec382438718c4fda1ee68f9bfe23e3467c8a86dea0b6483007d92648c51ae8339e0eebfd5a8c5725 SHA512 a010fb14b9affd54a82308f792aff1f28a5ed4bbe4f1ac8be99c4d4cbde84b78ad49c71d12979bd40fae84e19a429b93de50c64bb345ca188a16ee375f45ae84
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
new file mode 100644
index 000000000000..f75a3f7a9ea6
--- /dev/null
+++ b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Concrete functor and monad transformers"
+HOMEPAGE="https://hackage.haskell.org/package/transformers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+"
+CABAL_CORE_LIB_GHC_PV="PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest
new file mode 100644
index 000000000000..4fb4173725df
--- /dev/null
+++ b/dev-haskell/tree-diff/Manifest
@@ -0,0 +1,3 @@
+DIST tree-diff-0.1.tar.gz 21644 BLAKE2B 0cd1633970216a994100f852b0982d43b6f1d0dc1b0550e759009250e016d271c5358460ef3999267da597b4e58dd28c3094e0ba4f618ba5990e91740eb63881 SHA512 a4ee703e4b6a18055c7749020863a9571af4620dbb7ea05903693c752e10e3ffa4fee8da0dacc0e4bbf92173e34c9070251881597ca1cd9f7c8ed365e840563c
+EBUILD tree-diff-0.1.ebuild 2823 BLAKE2B ce0c3e0649f9eaebdfc5d2258e7c2f446d907a6be243ecc2dff98ff9e2a332f1fa73dc5788d899b6f27a0a1fa1b81ba782e4178d3ab0ff157436754f4f2108a8 SHA512 b7f398db5d2c1c18ef2a62ce5c8e11fc1fc3f5f73c010feb178a25a9609deccb8604e74917e3d84ce507e2ad6f21b5946e08eb24133a3bce8bfc8bdeeb0f8997
+MISC metadata.xml 1099 BLAKE2B 24140fae7689e6b927d38a271444695b72e4459e2eebf9e90df4be94736829bc2ed23c6112ef71087a9c85d96df7f1270d508ff09698592eadd8b387cce18c81 SHA512 45ad2e28881f1f58c608134b1f33c2797732716b33bbe20fd1bd8e076a0fa3ea24fb457adc8e48240d0eaa34b8067dedb9bbaf231def7f3270b47be96f866784
diff --git a/dev-haskell/tree-diff/metadata.xml b/dev-haskell/tree-diff/metadata.xml
new file mode 100644
index 000000000000..214ee1271465
--- /dev/null
+++ b/dev-haskell/tree-diff/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Common diff algorithm works on list structures:
+		
+		@
+		diff :: Eq a =&gt; [a] -&gt; [a] -&gt; [Edit a]
+		@
+		
+		This package works on trees.
+		
+		@
+		treeDiff :: Eq a =&gt; Tree a -&gt; Tree a -&gt; Edit (EditTree a)
+		@
+		
+		This package also provides a way to diff arbitrary ADTs,
+		using @Generics@-derivable helpers.
+		
+		This package differs from &lt;http://hackage.haskell.org/package/gdiff gdiff&gt;,
+		in a two ways: @tree-diff@ doesn&#39;t have patch function,
+		and the &quot;edit-script&quot; is a tree itself, which is useful for pretty-printing.
+		
+		@
+		&gt;&gt;&gt; prettyEditExpr $ ediff (Foo 42 [True, False] &quot;old&quot;) (Foo 42 [False, False, True] &quot;new&quot;)
+		Foo
+		{fooBool = [-True, +False, False, +True],
+		fooInt = 42,
+		fooString = -&quot;old&quot; +&quot;new&quot;}
+		@
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/tree-diff/tree-diff-0.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.1.ebuild
new file mode 100644
index 000000000000..36faec98079a
--- /dev/null
+++ b/dev-haskell/tree-diff/tree-diff-0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Diffing of (expression) trees"
+HOMEPAGE="https://github.com/phadej/tree-diff"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/ansi-terminal-0.8.1:=[profile?]
+	>=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
+	>=dev-haskell/base-compat-0.9.3:=[profile?]
+	>=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=dev-haskell/generic-deriving-1.12.4:=[profile?] <dev-haskell/generic-deriving-1.14:=[profile?]
+	>=dev-haskell/generics-sop-0.3.1.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/memotrie-0.6.8:=[profile?] <dev-haskell/memotrie-0.7:=[profile?]
+	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?]
+	>=dev-haskell/quickcheck-2.10.0.1:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
+	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/trifecta-2.0 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'ansi-terminal         ^>=0.8.2 || ^>=0.9.1' 'ansi-terminal         >=0.8.2' \
+		'base        >=4.5      && <4.13' 'base        >=4.5' \
+		'time        ^>=1.4 || ^>=1.5.0.1 || ^>=1.6.0.1 || ^>=1.8.0.2' 'time        >=1.4' \
+		'base-compat           ^>=0.10.5' 'base-compat           >=0.10.5' \
+		'trifecta          ^>=2' 'trifecta          >=2'
+}
diff --git a/dev-haskell/trifecta/Manifest b/dev-haskell/trifecta/Manifest
new file mode 100644
index 000000000000..878990bce547
--- /dev/null
+++ b/dev-haskell/trifecta/Manifest
@@ -0,0 +1,3 @@
+DIST trifecta-2.1.tar.gz 64406 BLAKE2B 31829c010ad48d9c506863138379d4694318235c3cea7f43ee46bdcb22fef4ccd9979990150486813a3b0f6297c34597888cd52e987f0fe8102882a217a85a7d SHA512 0929ee4a3d9a53c211b13a711814b4b6ea488ad40f373befdc7e8a479b2a95c4e97a19381873af54d377ff2af49782677fa2ea892ea69522c242e245debd3a25
+EBUILD trifecta-2.1.ebuild 2346 BLAKE2B 282f9e3e4920c067fd19897415618acdfef7d8b258fb6017c43f029f42bdfe91dccba54670b85a2ee7a9f7fe25051368927121dea7f737bbbd9d6cf916b6567c SHA512 768337ccb4af0807a1c37c9d2703d91518ead5b4b37e428761f02f02dd8a2f897184ad239160702121f5d99f0a83a2d8067a71cd9621b2e2e8d2d26682523379
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/trifecta/metadata.xml b/dev-haskell/trifecta/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/trifecta/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/trifecta/trifecta-2.1.ebuild b/dev-haskell/trifecta/trifecta-2.1.ebuild
new file mode 100644
index 000000000000..f1145445332a
--- /dev/null
+++ b/dev-haskell/trifecta/trifecta-2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern parser combinator library with convenient diagnostics"
+HOMEPAGE="https://github.com/ekmett/trifecta/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # broken on USE=doc
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?]
+	>=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
+	>=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
+	>=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/type-equality/Manifest b/dev-haskell/type-equality/Manifest
new file mode 100644
index 000000000000..6bea3989feeb
--- /dev/null
+++ b/dev-haskell/type-equality/Manifest
@@ -0,0 +1,3 @@
+DIST type-equality-1.tar.gz 4525 BLAKE2B c93061cbf7ad6a02586770dbbbb8c4e47fdee48240b85cb8fc69f78ee8cd05c493585cc14129969814042d3cde2cd4e9468af86e61cfef486b4c3d424b5f413d SHA512 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8
+EBUILD type-equality-1.ebuild 633 BLAKE2B da97d971cf366031439fa430881b474bf06c5be7cd461db8a0da34bc4f96640ef8e342faf5229a86dbe739cdc0d73017ef977fde48996dc524eecb5c5a2d670e SHA512 00ee2c186e08627c73864266863b20a70844df1f69d62ffc7319d725c968770c41014e6fbedc1f4e1567d98e28d56499ccce80e2eabdc733c2c7a6aaca3cf109
+MISC metadata.xml 679 BLAKE2B 7ea10b0520f585241342870797f70177d7dc2544cb497425906f10ded4d944b42f5aa1b8322c70267e4a11cb7919a70051b700499b75db984edbbc3376244af7 SHA512 c81a190ae0b41778ee556ec587637047968e8b42fb61ea50416bd5825a3a9c110e4d8327f21df796f39ff0772bf746078238f1c03bbb57b628fa10414723514a
diff --git a/dev-haskell/type-equality/metadata.xml b/dev-haskell/type-equality/metadata.xml
new file mode 100644
index 000000000000..5cf2771db560
--- /dev/null
+++ b/dev-haskell/type-equality/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		In the presence of GADTs, sometimes a proof is
+		needed that two types are equal. This package
+		contains an equality type for this purpose, plus its
+		properties (reflexive, symmetric, transitive) and
+		some useful operations (substitution, congruence,
+		coercion/cast). It also contains a type class for
+		producing equality proofs, providing some form of
+		decidable equality on types.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/type-equality/type-equality-1.ebuild b/dev-haskell/type-equality/type-equality-1.ebuild
new file mode 100644
index 000000000000..c59698cbe1e1
--- /dev/null
+++ b/dev-haskell/type-equality/type-equality-1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type equality, coercion/cast and other operations"
+HOMEPAGE="https://github.com/hesselink/type-equality"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.3 && <4.14' 'base >=4.3'
+}
diff --git a/dev-haskell/typed-process/Manifest b/dev-haskell/typed-process/Manifest
new file mode 100644
index 000000000000..fc0fedd95b96
--- /dev/null
+++ b/dev-haskell/typed-process/Manifest
@@ -0,0 +1,3 @@
+DIST typed-process-0.2.6.0.tar.gz 17363 BLAKE2B 033c1da191fcf10ca36b1215303793d26b3435e7241ee07e4c3389a9892be496779f70ae62b6bbad7f07704866473e16d4f15bfb6f22efa41243cba6ad72e941 SHA512 a40b8db4ef2179273943a3aab0200891bd3dffe584bcd51037ddf9cebae88d4d95292883a745a0c31900c7bf2eebe2c71175fbb86dc470b60660b443f8b1e3e0
+EBUILD typed-process-0.2.6.0.ebuild 762 BLAKE2B 9cf94abd158d782e33029b2b4b7d44be0bcfd39a96df1c327e6bb8867e053dec3e693994dd5812e9cb3aef2f3945ce6b19dff0c2b6d7b150e3328a31c6a631c3 SHA512 bb90bcaf320d4792f58cd5e54cebe28625aab596f6043e76623d617eedc54dc0bc5366bf4e8120276985100284b0341ace998846bf6e4181025ab5fa00ff9bf6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/typed-process/metadata.xml b/dev-haskell/typed-process/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/typed-process/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
new file mode 100644
index 000000000000..c4120a966f73
--- /dev/null
+++ b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run external processes, with strong typing of streams"
+HOMEPAGE="https://haskell-lang.org/library/typed-process"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/async:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/base64-bytestring
+		dev-haskell/hspec
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index e358a51e0edb..863738c49f15 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1,3 +1,5 @@
 DIST unicode-transforms-0.2.1.tar.gz 714210 BLAKE2B b2ccc7273e9f37c990e48d06aaa83a353546b22722a575d1686de30bd5434ad8a24903fa5c9ddac1d3937c6f7b32b91fcd766666ed1c816ede322935626855c0 SHA512 9bdd7c6bb75ae6b71152371663e2c37a828574a782039f94059b3d68832680958749ab36df9eb4aca45a81d45ae91e791dc243b921dc24b4a8e8ad6337e6e082
+DIST unicode-transforms-0.3.6.tar.gz 722543 BLAKE2B afa61afa23387ce33f3ad56cd5c0123555f8f01d49e23965b8fa677dcd33de3346952091a2a44dc9570097e89bba075ff50d8f2edd7509ece50dc2f6bf607ca8 SHA512 f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b
 EBUILD unicode-transforms-0.2.1.ebuild 1043 BLAKE2B 721f2acfdc860e1bc3893373f1a90c505aa9f7c6acc411d318a07b98aff3e8f5c9314a524369cf04970db196a99acfd702b644ae3327582c3b0ed0590373c6b2 SHA512 811b3acb48eba840674877e25c8efe5734e0f85ace7713476bd4e3ff443e930ec59038fa79210573ff7cdafc3d0de3fd2f35d190d41df78a77c59cdf661624d4
+EBUILD unicode-transforms-0.3.6.ebuild 1041 BLAKE2B d27196feec0e60895d787e0155945b59a0db601fd70d10fbcb73a98e212249794a95fa0c229ffaee7b61eb78e7fcf216fd59d10ccdfe341ba686e980257d90d1 SHA512 dacf6401372b2404e77b3e3b8c4cc2eaacf338164066974ca47a45fc2fe5762490c0c4bf3263e3cb2f277882544176e17b420ed54a9913bfcff861de17053257
 MISC metadata.xml 356 BLAKE2B eeac0a1ca1766fc3c20f6117f2ea003315ad3d9d8f00d17fd12a8dfb7f9d2e0697d10b978ec7b0e1b107b5057367b3d109ba9eb69565c7502c5e6b860e8e212f SHA512 bf0c5ce6664bb77903f34306f75143d89e850cd2365357fd972b54cbb3d05dad4397287fa8512235985b086f1694adda4231c77ff93b30ee0a5cf5edadbf8982
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild
new file mode 100644
index 000000000000..762415f3ac4d
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -dev,-has-icu,-has-llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?]
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
+		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev \
+		--flag=-has-icu \
+		--flag=-has-llvm
+}
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index 7834ee6ff8f1..dda1872658b2 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -3,8 +3,10 @@ DIST unix-compat-0.4.1.3.tar.gz 12823 BLAKE2B 0cf1fa6c1b9f10c39fcbe8e0fa54085d7e
 DIST unix-compat-0.4.1.4.tar.gz 12830 BLAKE2B b3b94ff1733d8df2b7105ea6956db7d37d5af445373dad3dd4583a7c515d742835c781da106a7c7b8ecabc55b877f648892308aae9706e94365b4e8c5e50afca SHA512 bc2aa14231b294ada9006d18e54f353f9c5b4bde387f585fc6e3adc38efd18d81819295255f0e385a9cde0fcc423db556801c9285767781eeedf32123b7639af
 DIST unix-compat-0.4.2.0.tar.gz 12895 BLAKE2B df4f07a36b7371f658f533eabf4faa3880d1935371ae46fd05c3567e5f922b35999c7d71af2103c9b88b81ee4328aee6b002d54658e88422fa037c21a209939b SHA512 c3271dc7bbb35948cc2edb143ffe2ab0d14c53115668c257eeba8ccc148b586ee994f417ccfabb58fcd6533e786dcccac3062ece1923afaf20fcd05055fdad39
 DIST unix-compat-0.4.3.1.tar.gz 13152 BLAKE2B a2fc2d7ab23c0b26349181cfcfa98d864944c5347f7a8177fa467e8b963883c32c042dce3d36dfabd7008dda9efe632f7cf1edb6485178d8b2695ca8d73dc4a0 SHA512 ff6d7f52d1e0e21c3739831ae33b34b13815aadfce7f90efe2cfa10325b55aac982824d4cdaf112af03e8d51824d091d8781ff1caf529f02f8d251ada5c9e63b
+DIST unix-compat-0.5.2.tar.gz 13281 BLAKE2B 617e916badf79b76959ffcd542ad6fa1f1ea04c0bc741faace7614bc9e0fcae0cc34dabb06197fa8686dee26b0d890ee95d3f6e5f6258e543424a9d99498a0cf SHA512 0a0a98e03edb7c6ab4401a022c3e90f7598b24930cb22ba04711c3f57b8f87990c6669d5cda07196b61d36cb6e0fa8b281822fa99b199c3b78cfccd0bc3f70be
 EBUILD unix-compat-0.4.1.3.ebuild 641 BLAKE2B 7376a8312c865f374927efcfe60b26180bbfcf74754193f764bfe8027b7ef0145d28eaff13d34b8e4d971b00241c5f93bb9a3db00048e4c74d29d1b59042ddba SHA512 a1ba24eab3d9ebea2c95ca96706b70d403bb413230fcc0b1e7274322bc2787260061278376c7ce1e85a2182d1a2ced1e9698f519f97706cb98fea8b231a7ebdb
 EBUILD unix-compat-0.4.1.4.ebuild 641 BLAKE2B 6ec2c5f651399c0ade6a550017ba96df0f815a6bfed615593e4ee1e52d3bb9bffabad6697edc7f34739f7fd8e4f3c2a6a834d609225b9f8fd7ad6c0c6faf6172 SHA512 b567e59103c61e79b50d4eb7428077a7d35bf0893405c2a65df0501c8c6d488cb48d76d9f0268b8201c0f32b595d7b0829ac5358d262e4d9f59a39bf053ced1a
 EBUILD unix-compat-0.4.2.0.ebuild 639 BLAKE2B 58b2bf7fc625acdf7126fe087e6ba6c3b789859f7a3aa349ac548fec906d7c2d2bc27a6937f3c198d3e185299548fff390c8585208236b2ee67fbeaf73162cb5 SHA512 2e510aa5374c4651488103c0f7afa0ff9b2f716339c7e0f2d2d14ee4f58563a6d7a23088f423dcdfcf99c82d10867326fe4ba9c6f997090f8191a3583d279204
 EBUILD unix-compat-0.4.3.1.ebuild 717 BLAKE2B 83fb8d972c2dbf7d9a166ae7ac6f20c6c3624564337f7985cdc2962f185d358f51a74598297b8ed90bb13abebd8df0ad5f2a18fc8418890d0410c31f2a62a43c SHA512 89f61d1ae1649177110de8b99a36442738f2fb8d04e8178cfc46dc2e5bcdc58bcacc45f0997d7724d36165e86969dc28937990480988c02d4344026f7564cc93
+EBUILD unix-compat-0.5.2.ebuild 642 BLAKE2B 84353cd0a43852b7a499a1705e1eba39a04eff4ba14b2e48053df612ea97d93bb2836fb69ade87a5e88b12284c05bbaca9f8aac7785a2d4a767ac4f0607cab8a SHA512 24b6a231261dae5b6f3ea0e12951f45c5263448f7f4620f9fa59563678db3865091934345bcb1d860acc2e394a5c465bc24d6e5a19056579898029bd8e1d7aa6
 MISC metadata.xml 650 BLAKE2B 99476ccce782fab6a1f6c8a571e49cbec4ed9f97738669a0654a567868a7d3106dd0d36c562bbb232dd2763ef4e5504fc56bfcb39fa1eb8dbe7d74d8843ff037 SHA512 7ffb0c501a229a3e3bf2d94f72d9c63ffd7b11033392a8fca8b90e180fd299f97902d5d601402754608654930f2611ec05a2e9df0622d3c2ad6dbfc2cc9435c1
diff --git a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
new file mode 100644
index 000000000000..72414ecc519d
--- /dev/null
+++ b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable POSIX-compatibility layer"
+HOMEPAGE="https://github.com/jacobstanley/unix-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="old-time"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag old-time old-time)
+}
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index 43d4f3af389c..7b2b024aa0f4 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1,7 +1,9 @@
 DIST unix-time-0.3.5.tar.gz 40201 BLAKE2B 398b47f43b6b56131f42842ad691b45e7fe987478583d498ad44885d480b14068b1d956d035e371f48518d62bff70f1f7f0ea34e398355d37bde9d76c5442dcb SHA512 8da13cd8e9a32ee8ce4ab9430eab951d84350e4c459948f4e5e833444f1f266fbac6b6fc08876e326313eaf92e31500b325825b1b2c4fb22c551efdf6e5b9db5
 DIST unix-time-0.3.6.tar.gz 40180 BLAKE2B 0233c673459f967e78a4a8985b0951efd224c57b172739413cb41950abbae05d29c575e128020b2ca6b8f96595326073e45d1bf4e040c81db10d1da3304d3def SHA512 a7ca1086d2a2a15bebdaad80e3e31cc3be403548650d6c490dd7aa3af14b017ad2034320f82c3c7729661a046156e41bb50acf6a8fc1aa1db8dc8a62522c03a1
 DIST unix-time-0.3.7.tar.gz 40549 BLAKE2B 86aa4e6b9d4b7adf55f27491dff7d4197c9540b7390fbfb93ccde33f618892be6c21387812cf41481d5863cff24bdbc29d213edf6c9bb13bdc1ca95e12889f95 SHA512 d10335af434e79980fd4221ade86dafa71d2aa9b30d7aaa13da25b8e75114430a143be5b9c6c1fa885d6ba01f6e6677484b04cd9e2cb263c650a945e954c44bd
+DIST unix-time-0.4.7.tar.gz 52235 BLAKE2B ec885f79c7f2be3766528dca640e59709aa984f70523714614414f921a7c7808feed274b44bc33cf23d4acee49dc0d8e4e30e9016a372850dfa1695abf81f7d2 SHA512 a9e5b77cb9c93b9a20687406aaeeaff5277d05b95ee9d874f3e0292eca83574b2e842785e0a88f71be3e91610db228c68b5cec885c4b3ea15fc6ec1bb861c072
 EBUILD unix-time-0.3.5.ebuild 742 BLAKE2B c7b93ccf2533ef7e6841bbfd4defddd6896f038233f45fe5793d1a31e180c896ab611d48efbba03447f9cde63372f8480b0ae51bc4a124b6fedfeb1412312323 SHA512 efe3056a2054f0cadff87f77260839d6eef086d9722ae43878f0d0b1e20f6d303a7540c1d0d8c8c1f4704ed6e4573cf2558ec034a62890ae865bdccfe5fbbcb5
 EBUILD unix-time-0.3.6.ebuild 742 BLAKE2B a27992974fd5b93fc652eec866a9b1f7d6988c85e4cd72105df4ac331d9665bb83030c8537d291f2f9cbd96dbc1529f9686a1736291b9942669ccdb5cb006f49 SHA512 bb15a6a4b21604fec54fbcd56f84021b3ce99b989e9fb9a0f7f7a8b2aaa17fd6ae91533552761b27bbb2e9acb43d93d9d4871896254766872e267f248eee989b
 EBUILD unix-time-0.3.7.ebuild 708 BLAKE2B 2eedcf6a64ca8900bf508541bb1a5a027781eba40280f06041eef4bda4cf6967fe0eaf429577931667f298dc82d12637a4f7f413a37a861cafe7bf095dd7ec6e SHA512 2dd0ee4ccd811dc69408942c0974c485e845843e3cfbcdac1ebc5a2b938391755907b36b7cde23ae31f81a2bf8fbed7c57c7290cd1a4f14bbc3ac645b04e605a
+EBUILD unix-time-0.4.7.ebuild 967 BLAKE2B 2bc74494a9c6d1eec6a3d704a876e93d00d9bfb42654bf5a576adcb706ee42d837d9020c18c1ee3a7cb5e10895c6a9e02e06b593a955bb52efc5c2067285ed23 SHA512 02b5252c7431c604a40a2ee41cbe0ea820352e0291e55daef53735e510ebe0bba6c955c327da56f7cf99ba9a6466a43ee8aafbdecd602636af79442ba99aee81
 MISC metadata.xml 338 BLAKE2B 81aeb9ddd2ebe58011cece155d563ef83d59cb0ef762b85da7d43c053361f9f9994631a63fd4815c67e3ec81edb0eff2592a0a6804c90c195a7e1b4c2f8f3532 SHA512 3f3da8a70deabaeefdb28541bc5b398a03c0106098261811e3e1f7dba6ffaccc64bbe9905a7184d8cf84cddee7498f06bd9ed1b65909450262fa35da3f4f80d5
diff --git a/dev-haskell/unix-time/unix-time-0.4.7.ebuild b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
new file mode 100644
index 000000000000..468a24708bd8
--- /dev/null
+++ b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unix time parser/formatter and utilities"
+HOMEPAGE="http://hackage.haskell.org/package/unix-time"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # QuickCheck finds counterxamples:
+#  test/UnixTimeSpec.hs:53:9: 
+#  1) UnixTime, parseUnixTimeGMT & formatUnixTimeGMT, inverses the result (2)
+#       Falsifiable (after 1 test):
+#         UnixTime {utSeconds = 747130527, utMicroSeconds = 819438}
+
+RDEPEND="dev-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	test? ( >=dev-haskell/doctest-0.9.3
+		>=dev-haskell/hspec-2.6
+		dev-haskell/old-locale
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/unliftio-core/Manifest b/dev-haskell/unliftio-core/Manifest
new file mode 100644
index 000000000000..791557fd0980
--- /dev/null
+++ b/dev-haskell/unliftio-core/Manifest
@@ -0,0 +1,3 @@
+DIST unliftio-core-0.1.2.0.tar.gz 3631 BLAKE2B 26829fb8d218fd1b73f1bc86b1d673cedef8894345a37c428d73875c0e1c4a47a7107c0a7d9818ee03e6abd75c7da5cd7afdf4c2be02845ff78527c80eb86351 SHA512 5bd46d40be031b398b3238a5170f45641861a30c8cf20ca5a202b47367f00bb52e7391a53301edd47f8d688c713c06ebfdc51b1528518e28f8e8d6ad619e10eb
+EBUILD unliftio-core-0.1.2.0.ebuild 670 BLAKE2B 2f05c743b1a9a4d742cfa81ffd0c80b2777af34b2c5ae19ddea454bfe4434471812f526b7ee3a8d5e5eea4699a11f03a24d5f6f954afe423e143de67fda86455 SHA512 48af262de118764bbbcdd98246938d8d7725997a3cbe5f2fe900bd1335d27a54fb269ef4a217b6f3dae552dabe71f800916fff5838c830d7ad4d8d753e0328cf
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unliftio-core/metadata.xml b/dev-haskell/unliftio-core/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/unliftio-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
new file mode 100644
index 000000000000..ad322254c243
--- /dev/null
+++ b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base >=4.5 && <4.12' 'base >=4.5'
+}
diff --git a/dev-haskell/unliftio/Manifest b/dev-haskell/unliftio/Manifest
new file mode 100644
index 000000000000..501a681e7e26
--- /dev/null
+++ b/dev-haskell/unliftio/Manifest
@@ -0,0 +1,3 @@
+DIST unliftio-0.2.12.1.tar.gz 53520 BLAKE2B a8f1e044400a5cc49af3db66fe3e79f8441b2a742e11493eddb59bedba94a196591ef914c5ab1cf998f337751fcc931c92e20efc62ef7989d460072cb44abb96 SHA512 fb2814860cd2b59ae1a17dfb5892198666b59b737264e46e303909a9f5ce2377f92e70ab7d666fc7f927b9cad6593659dd2bb2168478021927b184e54ae4b44d
+EBUILD unliftio-0.2.12.1.ebuild 789 BLAKE2B 5ab87bb7847db3f467402d993e463241260439f7b7c22cc20bdfbf75c20b90828c731b4b17ae429f6cb01993b4d6db00f067374261d0882769fbb2a5dfa95ec5 SHA512 453ce139a173ca79c4363c350456f85eff0d0bd26b4de832dc5099c5b0a885cdf56147005e756485f5eecba9f83637bff558fd71e71d5f5e6526b11d2a4fdee9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unliftio/metadata.xml b/dev-haskell/unliftio/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/unliftio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild b/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
new file mode 100644
index 000000000000..73a601914874
--- /dev/null
+++ b/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
+	>=dev-haskell/stm-2.4.3:=[profile?]
+	>=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index 73728871b181..c9f4e2c8fbe5 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1,3 +1,4 @@
 DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
+EBUILD uuid-types-1.0.3-r1.ebuild 1356 BLAKE2B 6e00752dab44a91749d68c8dcfcd3ff3c47dfada7afadc10edfdab83c3ee8c6e0cf665275badfd60b318fce7852c802033b8f1d3d9ba1c6a3a55c1fe1f45cf4d SHA512 c9f6229d0ad7baa870796f4ad47ceaa5f864a381c0b759cde7aeff2671b6bad29bf3cbc383a2ca98da489a0f06949cfaa7d8788942600913754cbf6a778ae431
 EBUILD uuid-types-1.0.3.ebuild 1225 BLAKE2B bb92139070e8e3f2fd9425757a0cb8465e1ac5eb3ba5b84945ae65ebe279c0548e6d2d1ad044eb1728733e7673bea47a0231eb96be76b1a3e6537055e7a6769e SHA512 c50fc1b408e15dc78e9bdb927ce3974addeb55b69f3fd0cdb7e617e74ab70ee37b165ac934697c36e55d94f800b99f14238e5e2e3caa5dda1154e251397c57be
 MISC metadata.xml 547 BLAKE2B d688b78a2d939de354f5691e59416d43eca488e1737cf2ea4dd577a9aa985e38bbfc464f5b3e1d5b586df990204b384897d34b0816c8b23877e43a70acfb81b7 SHA512 00ed619a88824b0a64195d255528cb6e4e2e6578feafdc2b6b2f38d1ff630f0469b2f16a922477cde922c9f7474ce6f16f6bb68e0350c7563e3671ddaaf64917
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..4cae53fd3942
--- /dev/null
+++ b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type definitions for Universally Unique Identifiers"
+HOMEPAGE="https://github.com/aslatter/uuid"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
+	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4' \
+		'HUnit >=1.2 && < 1.4' 'HUnit >=1.2' \
+		'tasty >= 0.10 && < 0.12' 'tasty >= 0.10' \
+		'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' \
+		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
+		'random >= 1.0.1 && < 1.2' 'random >= 1.0.1'
+}
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
index ab93352ee41d..ca95eae9deec 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -1,5 +1,7 @@
 DIST uuid-1.3.11.tar.gz 8578 BLAKE2B ab865736dda4ca4188b9b21b06649fde81d8de1ef4939bf0a5945353d17da691fcd267faded8f64edec7371727a99239f961b25b3402f8fb68b5f0ad89052bae SHA512 3b94c13ff8b6a631f9411a313a99251ee961234d0322e446e22b04110728a4acb687f4bb4b83f9b09268fed9238b1265dc53c5214ae4bb8e18c12455c41c41e5
 DIST uuid-1.3.12.tar.gz 8738 BLAKE2B a6e8fe96d6c20b9294c1535d367ad3ce0a91dfec4c9cd408d5b7e2ec0988326721db3d7a6ea3addded81c12f86692ed898e14612c20fcaf16f0ea6be6f2ef21c SHA512 53d1a9e69dbc3ce2cb2e35aeca9b116e5fbf176fe048d4afaaff1bfaae80445da8e3d53c4652ada41791fb3e237e2cd24d3ac15e6a786242844fdf076588dae9
+DIST uuid-1.3.13.tar.gz 8926 BLAKE2B d7b4850eb921467677534d33475dccb90b2e74a4f73137eb8e9a45573a337d4152b19f052dea584bb0b6ab862dcdf764106c4e35efa1e8ae3ecec41becc75a4e SHA512 e888e6350a32c6496b0b57384797925c78ab1c4dc674d296972981fa81338b4705d21a96960a63771aa5b9a785efd507ecaad195767dba7847fcab5ca7f3f923
 EBUILD uuid-1.3.11-r2.ebuild 1418 BLAKE2B c5c8a33ec1f02bff9ddaa3220e00ef79cc37a0d9f25e2dd00388e2a9e099793236bde5057bd10c95409ca95f5edf103a1fcf49668887535a6e31abb56921cd9c SHA512 6188a4bc15bd6b15a3d9de61a13e77aa73a826eea1a74ba8c34aff60d05ac07747593d8b98742721b2d987613b95ec23e1e1e98a77a93f834941bf8dd22930f8
 EBUILD uuid-1.3.12.ebuild 1394 BLAKE2B 789be937f4eaeeefc94836bb2c839f58946319d1a723228ab45f0dfcf6e4d8e97176f88a43f081d4b29db0996c35d5770c059c2ba6e8cda8ea83cc86f082e0de SHA512 c223856d95080a0f685b27debedfc27bbec7028ecc889dd7f0cef777e357a69d3f630b21002ac931723de74c24707438c290fa1ff21c642a370e5f6168070f11
+EBUILD uuid-1.3.13-r1.ebuild 1791 BLAKE2B cc55c50840fa38c796a2483e641ed82b8ba9ca86dff41a0bef17ae12b8aa416c845d08fc90c416d89d34ae3f501c5162705c7b6d0daab8ccee8fae43cd7d9554 SHA512 e08a2c1f666685837dbcc4c28438e3e71458d4fdfd5fe32e7468bd3e902ef489e42c8d4ba5d3034070ca3662ff1dbc447a78981a2cd013af48058e10f4a0aba1
 MISC metadata.xml 542 BLAKE2B 043a99892b12c9c72f1f89226f5e82edf49ae91fa5f9c4fad7c15d06893266f9ce1bff7acaa06f83e62c3639116e23dbf9c67daba5791673b4c349e79393a370 SHA512 8088a28c040b916c0aa47ca6a1e05dae3b834da258a747c2d4836d8d1b44cb6ac85ebf3c6c88b948e08ff6baff09002c5dda486b1553e5f416f17949e0b571e3
diff --git a/dev-haskell/uuid/uuid-1.3.13-r1.ebuild b/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
new file mode 100644
index 000000000000..31f07bace4ef
--- /dev/null
+++ b/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
+HOMEPAGE="https://github.com/hvr/uuid"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?]
+	>=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?]
+	>=dev-haskell/entropy-0.3.7:=[profile?]
+	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
+	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'QuickCheck       >= 2.4   && < 2.10' 'QuickCheck       >= 2.4' \
+		'time            >= 1.1      && < 1.8' 'time            >= 1.1' \
+		'tasty            >= 0.10  && < 0.12' 'tasty            >= 0.10' \
+		'tasty-hunit      == 0.9.*' 'tasty-hunit      >= 0.9' \
+		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
+		'HUnit            >= 1.2   && < 1.4' 'HUnit            >= 1.2' \
+		'entropy         >= 0.3.7    && < 0.4' 'entropy         >= 0.3.7'
+}
diff --git a/dev-haskell/validity/Manifest b/dev-haskell/validity/Manifest
new file mode 100644
index 000000000000..9c38c13e1d24
--- /dev/null
+++ b/dev-haskell/validity/Manifest
@@ -0,0 +1,3 @@
+DIST validity-0.9.0.3.tar.gz 8015 BLAKE2B a14f2dfb2a716251bf7e65548fad61d3525685c2b5065e4b4f74c9fcabe39f4b588a0e5d422abf9b3c734a0be528a59fd660833dcd65e1e0dd06283a0db95552 SHA512 f60faa65677f4a306a289d2985cd1827c3b2fbac18f25802f37af89bb8e0e9dfa23bebff6c2da4eda7824b94e9d26e5bcde55a3756b4e25b86f14ac0aee8446e
+EBUILD validity-0.9.0.3.ebuild 568 BLAKE2B 659e23ae3e00c1e65bde98ed7d7a8ef92cbec95bac8a2ed7b3e7406396d4a4447649994fad54e8a551a2f7d251ce7cfeae2d501c0e3aa55cd2a5cccf299ffae0 SHA512 aecf4c6e30136ee4b1c86d97905cb4067927ccc38de4fdba16ba542fba3e2f9a39d9f3fa55c6b096fd16751da74ec556d35c79ece6f89723b97b4fe22ac02aad
+MISC metadata.xml 522 BLAKE2B 43294793dcf0e8eee23b00d0aa62e35c6a2e03cce78caf5b0c80b2cc51497b165863c156919423a51cf142e87974313bafdd06b19d472dff4bff766c376fb4a8 SHA512 02cc5a2a8d9d03f0fbc25fced59506eb4da915c2765db7d5fce339e8c5f63c4d6e46aaf4fc46b8f1c100f424e7b29f1f605fcfd5dd2132e5ab8464a7abdc0386
diff --git a/dev-haskell/validity/metadata.xml b/dev-haskell/validity/metadata.xml
new file mode 100644
index 000000000000..06ff9ff9cc14
--- /dev/null
+++ b/dev-haskell/validity/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Note: There are companion instance packages for this library:
+		
+		* &lt;https://hackage.haskell.org/package/validity-text validity-text&gt;
+		
+		* &lt;https://hackage.haskell.org/package/validity-containers validity-containers&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/validity/validity-0.9.0.3.ebuild b/dev-haskell/validity/validity-0.9.0.3.ebuild
new file mode 100644
index 000000000000..7d670251814d
--- /dev/null
+++ b/dev-haskell/validity/validity-0.9.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Validity typeclass"
+HOMEPAGE="https://github.com/NorfairKing/validity#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index cc6805393797..c492792e49fb 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,6 +1,8 @@
 AUX vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch 2344 BLAKE2B 8902fb6e1946589e79577408d6a4c34b7512f3dea6bad7ab73a95498ca41e758d8115d7c005ad83ef14a845df792009bb9190f8b584086c9dc63898f481a5940 SHA512 f92d82039f56c9ae5cba5c93e0df041877dba1a3f5be7a8be1efd9f5a652ff2c1a06c7091faab76247876b9018614688d404aa6542b59ccedc3b199bad3dcf2c
 DIST vector-algorithms-0.6.0.4.tar.gz 20455 BLAKE2B 0d0c4ef7ed8996d1ebe65971a451d4cb49118faedbf9cb4a987afb281adf563808778a689df608d2fb3c8fe9398af995d1c5e31cc89fd4f2075c2ebdd7ca4277 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf
 DIST vector-algorithms-0.7.0.1.tar.gz 25435 BLAKE2B f9cb3bf592316c92bff4313d264370cc35d62c64e7dec6f14ee9954c0fc12f573e799172793501e1b4f9c556fa1ea8e3db1ac3381ff71bb143e33520c69c18b8 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a
+DIST vector-algorithms-0.8.0.3.tar.gz 26559 BLAKE2B 7541d141967faf4bc1b33dcd23f283e1a6868f0b51e784918c1516a46c38ba3e9205045c87679738d89c48fee3ee2e61286eab59cc66ec8cfc18f1a4b977c634 SHA512 45311e19a1e5c9994e7d666b73445d11946f60915df3d2f385a435538d1b6b0929b56a960f83c5df1b2df883566e7f8e6fdd5be4e075364d7daecd6dbec780e5
 EBUILD vector-algorithms-0.6.0.4.ebuild 1162 BLAKE2B dc926a19c51788f5bf13d149417e074092e26b58cbdccc05d04ddc22379099e3532534ddeb7e5f6670b289c4ca9fc5e83ae1a426f561d92872694fc259ecd8b8 SHA512 7019840b03582ea50bda03c1192896421b5d0092173ff73f4a0b82345a9c10e5738738a7a6d82c451504e7be4f9a6b428c49080deeffeddff5c7a2f471c428e2
 EBUILD vector-algorithms-0.7.0.1.ebuild 1189 BLAKE2B 3c44f272cb5aa4f44ea6537a81e6f8b86b4d74a948da6c026f15b810d6f2a0fa2854d1a37fb69e826ac5b6a345fede5da00d5085e65603fdcb00c7bfef057778 SHA512 ab2d86134c329e442fe9031184255cad08ebab4f3b447a01b0a41a5048926bc211b87cb91dcf19c3d0142b4b5d115ceabcc75cf6e2a899766174aa50a98ba47a
+EBUILD vector-algorithms-0.8.0.3.ebuild 1223 BLAKE2B 6f6bab44d2b649c727336a0a3e67cfa9e858621b6764bd04ddc5ba2177e3153370e39a33bd4f8dc2d2d9dedcae6aa8d63158f47f70d5320b36da3844c6f9d6c0 SHA512 97b6b98e7713b7a3bc55849347b6277e17f8a620f721418cb8f95676a39acfa4acd1fa96a2027486f28c5b14689492c1bd5813c95327ffa2fcf37f9354d1b3ca
 MISC metadata.xml 770 BLAKE2B 1d7320d9f761a8668d4cdb7868edc4eb543841ca23849fc16ee451a7c1ada0b531ca7f05129a144c67319b67b2948caf31b10d45f04775e0abf13de70ee5d334 SHA512 081492732eda3a8884417445a79cec19f7f84cdfe3c3e84743f86d00a5051c7e936d3c286ba414c13a6813d7cf1d740408c44a597aa82e3489d012c75c9eeef8
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
new file mode 100644
index 000000000000..a1fcf35bd7ab
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: -llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="https://github.com/erikd/vector-algorithms/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
+
+RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bench bench) \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		--flag=-llvm \
+		$(cabal_flag properties properties) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-builder/Manifest b/dev-haskell/vector-builder/Manifest
new file mode 100644
index 000000000000..38567d6cd15a
--- /dev/null
+++ b/dev-haskell/vector-builder/Manifest
@@ -0,0 +1,3 @@
+DIST vector-builder-0.3.8.tar.gz 5045 BLAKE2B 1e599a0e50102c50cd6057cf892d97f9dad7468b0e49500743bf422b8a9e085d062b9b4e13ae9bb68d3c59e6bb549e77a962fdaed91d5a3e3e5d74b8ec45a6b7 SHA512 e7ca1b6ba35aa76e16ad485cfd5e326c2b257339d2aadc57b7ce2a5ec3d5790fec99e5546ea18351cd9cbf31e7ec99c737461950acd355f62be27b53edb2be17
+EBUILD vector-builder-0.3.8.ebuild 1160 BLAKE2B 6c9895e4a9d543b71917f1b01f8e15e39b191fa09a0c3336eff8c057954846060227474751747e4e03788db080bdc71474e04852d5e4f85c8a6692d8581a756d SHA512 8315c6ef2ef1a64b845d5fe358f9bae36984ad4d7d927495636a4f40356ece45086c154d56e1df93020b24f8a914d98cf925ad5ec3d7efea4fceb53e0a7fdadd
+MISC metadata.xml 1200 BLAKE2B 7253df1093cc3659c7bae79d8af691c95b7e66df88441bf79c680e3de46a28d83bdb970879d58b05b3a52d2ef3cd678fe8409b76e6d20a6ea5dd293744fac259 SHA512 ff4a266b7c908661b4028741d9418dd7403414c7ddf3d31b5c7c51d308a5bc30c1565cd2a3ccf34d753a819b408a1b1bcf842ea62a815b2cf718b7139be70618
diff --git a/dev-haskell/vector-builder/metadata.xml b/dev-haskell/vector-builder/metadata.xml
new file mode 100644
index 000000000000..95e22703be14
--- /dev/null
+++ b/dev-haskell/vector-builder/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		An API for efficient and convenient construction of vectors.
+		It provides the composable `Builder` abstraction, which has instances of the `Monoid` and `Semigroup` classes.
+		
+		[Usage]
+		
+		First you use the `Builder` abstraction to specify the structure of the vector.
+		Then you execute the builder to actually produce the vector.
+		
+		[Example]
+		
+		The following code shows how you can efficiently concatenate different datastructures into a single immutable vector:
+		
+		&gt;
+		&gt;import qualified Data.Vector as A
+		&gt;import qualified VectorBuilder.Builder as B
+		&gt;import qualified VectorBuilder.Vector as C
+		&gt;
+		&gt;
+		&gt;myVector :: A.Vector a -&gt; [a] -&gt; a -&gt; A.Vector a
+		&gt;myVector vector list element =
+		&gt;  C.build builder
+		&gt;  where
+		&gt;    builder =
+		&gt;      B.vector vector &lt;&gt;
+		&gt;      foldMap B.singleton list &lt;&gt;
+		&gt;      B.singleton element
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild b/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
new file mode 100644
index 000000000000..5c2ac8cc49f5
--- /dev/null
+++ b/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Vector builder"
+HOMEPAGE="https://github.com/nikita-volkov/vector-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/base-prelude-2:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14
+		>=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3
+		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4
+		<dev-haskell/rerebase-2
+		>=dev-haskell/tasty-0.12 <dev-haskell/tasty-2
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index bf313506e729..7a044b5272aa 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,6 +1,8 @@
 AUX vector-0.11.0.0-primitive-0.6.2.0.patch 753 BLAKE2B 1117ef087b476dc7a35bdf4286d980a9be438c71ab6d08f0219b03a714859ea30c444b983ec04b03e297a8100cca37c6f64f75167c55a002c8767899b0b47e72 SHA512 09cf5972b6d7ae61fe87246df675229c73c37c8d510b1e56e6ffce4d445fa75578efdbaba26c7cda23d588f68c75ea9f27a854f2d5e0cba00e6c8bdd515eeada
 DIST vector-0.10.12.3.tar.gz 103617 BLAKE2B cd4a4fda8a3da5b431c316d04b23eb82947f08cc930059beb3182c9c68d646c6a767168ae2fd82d06a782991b055421a0558dbf41a1e92f06d265c043cdb2048 SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b
 DIST vector-0.11.0.0.tar.gz 115558 BLAKE2B e2475a37593b92f896c48ff85f6e506fb5011d89173bb0fe12492ed8c6f9620f426c9db88cbc274b37aade52bf6ca3cbdc7cf03b013371b37f2d1b42c348a117 SHA512 4f31e45d08a08c09e5ce73cca4da70e954bf3921d05130b9458c7f2ba267602e0aafc96496595000fd7b82f80aa9147c880917dc64086dab7bf5b2cd426539e0
+DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
 EBUILD vector-0.10.12.3.ebuild 1561 BLAKE2B b640c790f5974e1de069a364c8cfb6e5f20eb3daf39fcabea251c9e194d81da7f5cf424239502bbcf5ab6d20bbca375b2d75c0fe613e9b9e98be4c7fb95ed208 SHA512 a74bcec1dc743963b8ab59c1ae4f30bf22ab848aa2e6f2ce0f1fb70295f86e22533219d803d2974b6e7e562393ef49699d0add5559440114021cbce91555481d
 EBUILD vector-0.11.0.0.ebuild 1215 BLAKE2B 455ef6c8ec0c7472b14a8f8562e40b3726e3c951b1c08c1431652fc5559e737dd8ffe0aff2af0a72d21a738af0c66bd9e48be208d9c9023ca82e510fc8b7d5bf SHA512 5f72028c8c419d8a746c4930c9afe0c9bdd9323b5eb1858a91ab26c4ddf7ae529983ddf06af80fd61472b2c2873fd30f19df58e8c0cfe8a0292e8ef7af0fe504
+EBUILD vector-0.12.1.2.ebuild 1365 BLAKE2B c7ce3ddcc514f6711f58afc2673782478be650b9844b1c68a591f90ed97fe7aada80371fa0e3888c3714bebad0c25839ec49f894b41b55d76235bcd70ff01350 SHA512 7944081c43ce39110055fe15f359b60187535404860ef6fe7e112e5aa0a77ecf53a6010ce4f6f1b5bb234df24b81197ae4ae157346d4454831176e7110db9c8c
 MISC metadata.xml 2431 BLAKE2B ab4b371c0626e51fa792aa18b7a7622921ea12a7b76d8855441865f46372a3dfa11fd0d0acdafb11983b614b6733325a28711d149660d3e0d874fe24754cf7c4 SHA512 58c6d75396f364fa29acf4287a1411448c2a77f5589be30fc83bdde998773f15c5d5a4fd7e6e95b5454c33ad49aa367a6b557c445612f85f99924520825002ba
diff --git a/dev-haskell/vector/vector-0.12.1.2.ebuild b/dev-haskell/vector/vector-0.12.1.2.ebuild
new file mode 100644
index 000000000000..d03f43378f3f
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -wall
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+RESTRICT="test" # test-suite is too memory intensive
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10"
+# 	test? ( >=dev-haskell/base-orphans-0.6
+# 		dev-haskell/hunit
+# 		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
+# 		dev-haskell/random
+# 		dev-haskell/tasty
+# 		dev-haskell/tasty-hunit
+# 		dev-haskell/tasty-quickcheck
+# 		>=dev-haskell/transformers-0.2.0.0 )
+# "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag unsafechecks unsafechecks) \
+		--flag=-wall
+}
diff --git a/dev-haskell/wai-app-static/Manifest b/dev-haskell/wai-app-static/Manifest
index 8631eaaa0ce1..e1c733b09104 100644
--- a/dev-haskell/wai-app-static/Manifest
+++ b/dev-haskell/wai-app-static/Manifest
@@ -3,9 +3,11 @@ DIST wai-app-static-2.0.0.3.tar.gz 19337 BLAKE2B 0f6e079ba8ed171b046cdfa7cc07a56
 DIST wai-app-static-3.0.1.tar.gz 21502 BLAKE2B c19eba52bee7f6a2e6412c359438fcde28a7c4f50870631e788ef68a00702eddf525d709218e093448243f9f49e644acaac984ce93c6799ba2b5f02129ca4f04 SHA512 851c6c3d13d01dda0566c6c98364ddcc54b8aedb4775e9e491452ea672f3f8dfb05ee75d9c44e78a5c89944ab10f8b6646f3dc9d6bfe44e9f2abd910bb33f687
 DIST wai-app-static-3.1.4.1.tar.gz 22321 BLAKE2B afcea96f91e88c2abd3a186b9f9c5686719d2dfd0fb0e63fde728117547b9d0c15cd391f7c38711ab3bb4c46d02bf49cb3ff262d44e5a6c0b324c0d1fafc1cb7 SHA512 2a4925a48a09ca1d7e366a1b01961b0069c941f0987721e92cb0c257df8feefe78f0dc5f8c69680d155a3d1b1bdee95f4417fe734c14e02b0596475bead72b8f
 DIST wai-app-static-3.1.6.1.tar.gz 22686 BLAKE2B f6c41a0df5daf01d8a6cb9b440098b3e45c4ccaeb36624fd9bef2f9a0d99ab7cd0343c61a99d0cb8d22736272f5661b0c6daa5bbc64cf5eb6b1c554b65d7bc94 SHA512 a2a19a57f289ecec8b2cbae2d412783ebcc789c8518a357eed8bbeee01a6283f7e636c38065c815cba3af782e56363b644baa21b32f70dd851cb6fd0bff692c6
+DIST wai-app-static-3.1.7.1.tar.gz 22782 BLAKE2B 3112ae5b202b6f6c531cacfaebfaf4304404fb5e4846a950eb4cdfc50297d20ffef024649c575e257f1db6500a7d190b9b26472fff68d9d9b46398ee0a18d632 SHA512 eae193f79a15b9e995d3db3a8c8a4a80ac8faeacb775b307c9a20f9ef5d77583143009c0ae71d77ecf9224a752460d3ecd9109db873f8517ed359025a4efb1d3
 EBUILD wai-app-static-1.3.2.1.ebuild 1678 BLAKE2B fcd42aa20ab48c90e546ba652ff9142198cf294f18ec30911d71d3dc9645c664800a073f710be10a73ca5921b169753c3ff9d89a313212158d192afa4f25a591 SHA512 f7debb6823c32d3dd9a1df9d39958fba3a9ceae534ab4a5960aa866d255af928c382b04dc55337c661812267eb71591041ce772dcdb5e35e6519709630865b09
 EBUILD wai-app-static-2.0.0.3.ebuild 1678 BLAKE2B 9183d58a66fc018869c46312753b0df7fa0b3154c45cc95aaac5b0c46fffdc163fb5cea108cddc0b3312f989aad517d4979de8828bc58886ad49ef99d3136193 SHA512 39ce874569771446b1108bca561983b58bbabaa33a93d58a9ee482f62641548bee95ad93dc787abb3d576debda2937f5d703bd9c952b73659423e55b9fef2297
 EBUILD wai-app-static-3.0.1.ebuild 1846 BLAKE2B c147bb88911bbc46ffc2fee2f02bc85be450b053d1561d5ac6f71fb8fe05a47cae182a5eded6b0b9bd851dab5b83a764537e8637fd25c139a3ac26a7f30d87bb SHA512 dbfbd57e4a44dee178af1af40c3de15fb9dfde7e4601b5d7409ff4e04c7799181fa3b505b963520698eba0c52eb71a6fc5888ef1a09f383455566a6224c94737
 EBUILD wai-app-static-3.1.4.1.ebuild 1778 BLAKE2B e50120c6a5bf67a9d0df10f80369c0217f20c6cac4d7ca99594ad30acdda374b8a2e10f7f1b7dcce0077a9e84b964631a55b6cf1d17cdcb986250ac173bc2041 SHA512 750aef78ec39b160f2ff923479b83246e1cd5f6e5c8333f7b716a8b16d43fa223c4213fdcfcc8974fc15099e32f3daf346bfb31452bc1ef539f645ac29ce83dc
 EBUILD wai-app-static-3.1.6.1.ebuild 1708 BLAKE2B 70c6d7ca1d08b04777639ca25bc787c695066e873cdf99924f0328cf5daf867a9472e452dcbc5cc0c491a42ecb33e6218ddad8b9f778bc0f1ad6803041812aaf SHA512 5db3292a7910bd1d0b4be3fd316bbd62f3f9242191fa60ff21806396bc47adbf48d37a313dde2c6c2c98ff79ef0adad06f2f888ab853f21b84b515ee35c84311
+EBUILD wai-app-static-3.1.7.1.ebuild 1610 BLAKE2B f851316b7e169ab239c437f1a04bec678aa2de1d89d2dffde8d66218b78222e3cb39d3cc92d9fb215aac7f8370f1321dee78a07545384630aa7a46c234b97bd4 SHA512 ba04a5bbf481f786fc757381986ee85c86a4c981e88eff2b4ef8bd267dce7ab66c5356380c50ed5f195c276809dd6c9b643dabfeb4e3d786d7058bdb0a922670
 MISC metadata.xml 425 BLAKE2B 1bbe316c73ef0e2954111cf9d401aab07f5e763f74ac542436128df25cbf28424c8e525e37016f46804f234098735668b713756a9a925922fcf307ada4ada014 SHA512 af56d5ef903a704a54270e5ead759bc4abfd1ab713ebb387184323baa1ee90e5f14007e03eea73b2469875dde733974d95dda48999ed26d66fad7b4f75b8292e
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild
new file mode 100644
index 000000000000..6c81719d9693
--- /dev/null
+++ b/dev-haskell/wai-app-static/wai-app-static-3.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
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="WAI application for static serving"
+HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="print"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	>=dev-haskell/cryptonite-0.6:=[profile?]
+	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
+	dev-haskell/http-date:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/memory-0.7:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
+	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/mockery
+		dev-haskell/network
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag print print)
+}
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 31de54d34ea5..561e6d235a53 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -2,8 +2,10 @@ DIST wai-extra-3.0.10.tar.gz 49846 BLAKE2B 34c77322bf4c4f2db666f868ee8dc562a2d7a
 DIST wai-extra-3.0.14.tar.gz 52041 BLAKE2B 4ab0336b0f2ae87e1dc1fcb737b4d94a04d354079988b37d6a661514e7300e4a1317903429c4fd880e55c31b01a6e9106bc1b0830dc25f8e10315e793d8a15c5 SHA512 92c8456cc2959ddfd23bfae50936f237bfe903143d68ef211e2af8dbe1327a8ede63cadd74d3555349411a5046df9a2c87c7e983e06728759eafde80092a8aea
 DIST wai-extra-3.0.15.1.tar.gz 53546 BLAKE2B d6ece1ded9b2eb53a449ec8c3def2d4393ec4eb4d903e92c560628ff0baa4089da2893d9c0ab98b75c2b11d2615a15ad6fe3284f3db5e6796e6c659c21d47a52 SHA512 0a212b1f40fee357dbe452b71da9a5d793d1fc826e82b9b0df84c65e4fc06773fdf41ba637fe29bdc0627e01b4863076813d2cef4dd36e5e248400083a1248e8
 DIST wai-extra-3.0.18.tar.gz 59477 BLAKE2B b3f565c0f154b6341b618b23916c80c79edd972afb6f3d9b167f86787c6d1adf980c0a0f8ec726b0d1a5529881f5e93c80cb4a0f479f0a802c3919e9bdd0b6de SHA512 d17f7f31ca35b2d8ce9bb5b63579d720a5cc4b72907dcde8668038953ac99fd5798d84ec8ab533a5a2b7f5a411e945fd91c8e389190b9cf5ca47fcc2f666715b
+DIST wai-extra-3.0.29.1.tar.gz 63831 BLAKE2B 61f3948add59e37a23f13ad9fd35456528835cac4190abc98f6d68897d32227b094ff04ddf6520ac009ac53186089f85e07d95268a4d554e51b1bbe9e0f0e0a5 SHA512 f8c5f2d534a0ef4b16b4375cabfb49d11a643fd8f8d2b30f0f88b29b39f91e84db7170508a5ddb64540f4a33c30bde703a52345ac9195560141cd75626ef5ca4
 EBUILD wai-extra-3.0.10.ebuild 1807 BLAKE2B e9fc06e39cc7f0e2ac19d935ae8fcbb614ca97bf6587ef247e6a56b2432157259c076a7a956241df36cdce79b5f206d1974902170999e53147fa55efa2ad4ce2 SHA512 86d8ccef7ec4e10d60c5bb8d608378ee7c8df9776b5689802c06460320efe7d714ea3b45cf70cf1561135375771e3df949acb5b42c605d8e4340f535cf7eb2f1
 EBUILD wai-extra-3.0.14.ebuild 1882 BLAKE2B af179ea1ec7fcce6ccba53235044db32197ed913f9c46c000ea839ef3579caf93d2e0c57020d8ab23cea2d42b81fbd1c6bdebadbe64014178e8f26812a0599fc SHA512 c5e5f03d9c63d0825d6657510894871b46d9e807d5c22bf55e76dc61e12be06a17bb21fbc79f9a58baeaec01dab9761c866cca299dce58c08dd4450385015a0a
 EBUILD wai-extra-3.0.15.1.ebuild 1887 BLAKE2B 1a5a854dd20b0406ba4feec6b79d8ff05db93ee9cb0859e01c4eea362a10eafbc2640bb7a7a9c59b17bfd332443fe74a89ca5ee5d699ca5c9726a39a6a1bc929 SHA512 781cc9d445363daafa750ce7ce3a7497f3cdb862dc4a96dda31f6ad2c5e244c31b81f99092376109bf2708fd4a65f1e4e9082cfb84c17ee970a6350bcd4a115b
 EBUILD wai-extra-3.0.18.ebuild 1843 BLAKE2B 50b66669be69c50738d489a0ca9d83fe2ba646e51dba232a31402b6051c1a538a08ca3bb5b573217885ee592c83b760a766b0fcd293a2012a367432c3eb647d3 SHA512 e42ec17c3c6ea7d72b847264c2a66e399f564dcd7de718b2782d3decebef2fc05de1b094776c0ddfe14fa6de55b33ee4690b8ab2d1addde20576f1b9bb204fa6
+EBUILD wai-extra-3.0.29.1.ebuild 1763 BLAKE2B fc4fffc2117d2170063dc7f7f98faa355f1801f27ca9df4db219c556521734a53de3ead297a48bb4cc1360463724375c5d97f7264bfcc08fb75b4824ae263f6d SHA512 f6b96f88defe46f7b03b41f9bf24ce12c1fd3dfc25243faf058bfeb7fe7b1114ff97f886d1b4f46e5eb0d3d28bf622c1f92f9f153cf3070a68d3b502e3d2a281
 MISC metadata.xml 438 BLAKE2B 980987d3555b2921cb937bcc2c7e95f0ffeeb84d72b1c644483a30bfae1c574f9597a60c729c83535ddd743b06287c6f6e59001b1e450cef66ec42041e013c98 SHA512 44ef094f17e204930d66991292286aea16b740f62494a325b0dd405e94b9937114b573baef293f1c9e0ebb0918441f3fdf74b4efe1ae8ec24ba1979a13ca9360
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild
new file mode 100644
index 000000000000..ac7aab582e45
--- /dev/null
+++ b/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: build-example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Provides some basic WAI handlers and middleware"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/ansi-terminal:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/fast-logger-2.4.5:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/http2:=[profile?]
+	dev-haskell/iproute:=[profile?]
+	>=dev-haskell/network-2.6.1.0:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.2:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/vault:=[profile?]
+	>=dev-haskell/void-0.5:=[profile?]
+	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-logger-2.3.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	examples? ( dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples build-example)
+}
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
index 56fa69ff3a06..de79ed67a341 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -1,5 +1,7 @@
 DIST wai-logger-2.2.4.1.tar.gz 6585 BLAKE2B 76915a9816b5f9f57914854014570e19dd8c6f31b8667d54f046ddf2efe549750211afe07d2804320cdb5d418e479bc3763039ec1c98e44e04569daa5f901416 SHA512 0900ecbcebed9433541ae4665c98037f1da832d6e6659be81328433f3ba9a5f258059736205e36517fdc22aefbd2d85e79bb5b50296c257b964c9256b2e828c5
 DIST wai-logger-2.2.7.tar.gz 5162 BLAKE2B a7cad6302151ed916c9dea4c42096e186269cdefab99d4edaf6d60e5b26bee7115686ae56b72296b7a6850d5ab9d097a882c75256df43cd6cdb22ed27149805b SHA512 09335971d30ef615c579df29214c7f9a1e7295c457d3d0aa6107d80a6ffce1399c13a101e7a4b64f0d869f66206fe28f8d0e0b01787421dd59f46046ebee382d
+DIST wai-logger-2.3.6.tar.gz 5823 BLAKE2B a08fde37085151e267b8abb21653021e4de773f5e85606b98900ea5fa33eca680f37dffebe7b416d95abc8ee925110274809de6dabc1be169226835256dcb091 SHA512 0c16120c342321cd686ab7cf9fa7df503a426b0c3d145c16e566013e0df44ef565d9890726d780c1fb73a49507f49bbf5fb886ff4bdccbd19a19b4c00626532e
 EBUILD wai-logger-2.2.4.1.ebuild 1003 BLAKE2B cf68db6da4f23119b104aea63a490b20ce2ba6a20321917013e2e74c0e3d20632bceb1ba337bd7d8fd53cabf9391af3c3e1649378957f148d9f5f544c700461f SHA512 08a0fd7e5a807cc741640f276e3089d159ec208ac5db63dd42939abdf6f19eaa3c987288b30c953a73739c8e15fe8b0b1f1fadcd78ff25fe6cf6d524e4d6e574
 EBUILD wai-logger-2.2.7.ebuild 927 BLAKE2B 4bc8609856f708d224fdd0ea9df58344e099ff6365c0a6110baebbbbccd60ed21f11cb63dbaafa293a509660d886deccc6914e6f089e6d92f2ae0dea00a86ee9 SHA512 2599a355f513d7546d35e8c1316dfaf502094f32e54bcc767487f8dd9e31a4391f3121b714d7ca14b3a80dfd7cb5ba20fdbe6eff94953849ce1bcf1ead051100
+EBUILD wai-logger-2.3.6.ebuild 880 BLAKE2B 1969c7b7334e19294fbbf3746cc104bf9a8551d000f98983a22ae213d19467b68dcda9425210f7870fd7f325859633d543e7c6e96a6a65996f15bc65824605a6 SHA512 7b5ddf8a4c925da44b506e5df353ab368d6e4e21ff8c6e9095515015fa73af83ee8e4a319ea91958fedb5f5308158708eee84880749a5a6b4284c6302350535e
 MISC metadata.xml 315 BLAKE2B bb422720bbd618b0a9bca9d12aae63dfca71a7d3e06c337f7c665bac602e0800b9060af438574b6bf1c549c89043137ef7a2594c194e04e9dd796cbbb325cbe8 SHA512 4610c5b45b593dc780353c090d11c78c696fb39ef752f24684c3851b770285f6e5164cbef3d2770168d57b34f0bb22393d65e60b7aa38681da44db2edf8e1f8c
diff --git a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
new file mode 100644
index 000000000000..3ec510446dc0
--- /dev/null
+++ b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A logging system for WAI"
+HOMEPAGE="http://hackage.haskell.org/package/wai-logger"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # does not specify full dependencies
+
+RDEPEND="dev-haskell/byteorder:=[profile?]
+	>=dev-haskell/fast-logger-3:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/wai-2.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-doctest-1.0.6 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.10.1 )
+"
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
index a20d24439b20..ddbd3f506850 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -4,10 +4,12 @@ DIST wai-2.1.0.tar.gz 6249 BLAKE2B f65fa57e518f26bfeb10bd6a36faf1100322d82312a8f
 DIST wai-3.0.3.0.tar.gz 9532 BLAKE2B 0e65afe6127b96ba35c6a2e59d370ac0781039a0d92764308bb9e7d280f65ebc9aa057628d8b57c7372c1ce04d0c285f1cef98be37465f2dc93d76d5583aa879 SHA512 e1a3672db5ad367abdafe88b8366f29c8cc4dc5ef309b09193a2167d90466cdfed19fcb5ba4e179b31622c3df8ddb74a11c5338967fdae8696fb739cf62a7002
 DIST wai-3.0.5.0.tar.gz 14498 BLAKE2B 48e7ed33110cb5e6c21624392e65fa29832809f068f48ccc260998962ca442bf532154d1fa0c21f883a40773e668e1fbf3cc71be37852077a12fa46d1a429288 SHA512 076ebc3a651b5e93e608d42a9a64a591bfc742139dc6112ce574ef04b4e701d709bc3fed2ed7ce74ca46f9e99df45990a0b8bfe7da0b054c06f0bc7864b29fc7
 DIST wai-3.2.1.1.tar.gz 10039 BLAKE2B 017d5fd4555541263ce6c47a2d666215c155585cf08ce111a5d1c7e818b6bff11f785bf7bbb374c4fc18c98f806e118cd272e0b1f243a5b8c03d7ac00c77533c SHA512 5fadbc5e665002f9e1a5d962731309bac6cb91a0533ba8ce0ae8d69014322e2a2960bcd0e6c56e65e3a2a03be6832ba5e72dcca6ae33620f1cd1791ea725f6a3
+DIST wai-3.2.2.1.tar.gz 10221 BLAKE2B 5822bae6d3f0326206da9b14646654af135690ca134d48b5f8b7eb6acd39652d829c8d4daa5afc80926b2409cf9fe1d498ef2b727cd8baae7c1f266178a39861 SHA512 72c92389d3faff234003f835206ff6eae3f8e3d885d7519706f8b78df3cb1c92121c5de7e8272436aed22ade8440baaefb14d50a10f2f233badadf16d1b5e431
 EBUILD wai-1.4.0.2.ebuild 932 BLAKE2B 0d1ec16c382bf256af9b13183211ddb2c38081298cb0a7b21d5598b5738fccbf33b7a95d62486edd1064803cbeb18ead235759ab9248bb6f54bc96def6f79554 SHA512 bbfd23ecad5ac7bdcd532b28f41ce5a5b7a100d9b82e6ccdfbe76856758930301901989c19dbcdd1b383017863512548cc1f1593246a21e224a5740bb123d3a6
 EBUILD wai-2.0.0.ebuild 934 BLAKE2B ad03e1471798c95e6c97168de5aac66878aa5814e8d3e234780a01c4548eff2b8ba6449ce74cb7fae84d54ba27c948a4bad190ea2eb1df89a7de4acdab2afef2 SHA512 bbc0481147aea54e6bea905ee3e4f2eb8074380d424ff32f832edbaeef16589357a810d3f581e74a07e4090af3373e59ba38154588437ec09157ae3486863e4a
 EBUILD wai-2.1.0.ebuild 934 BLAKE2B fca7f6a4d2d521b7f58f7480e92164e4a7278ee3dccfc8908855a95f1fa99ea917f1960e3446fb7428fdfa99a92746598939457cc933c846fa36bf064da2bd45 SHA512 990a114bc889bceb142ec1166eb93d2290bb490a6d98930e076a719909292c36c3628a2cffaab11aa4ecd49a0d56375a1081150b1bfd3cbc4711d06c9c956201
 EBUILD wai-3.0.3.0.ebuild 845 BLAKE2B 5c0532209181bd420d3d6d9bc4f4067993c6a26a78690c48f6e80c0eda83d1333dcf5c1766727d7bc6d4ceafeccdacfdd616679be99ca14ce798a376d40d7fc9 SHA512 39aed94accc2799ae88a45d5824cb25b6530bc5a4914b522391c06d0280fa9a3b48ef24eb98e58315bdbf72edb8796a1a1e6a5803748ee17e7d19f431accde98
 EBUILD wai-3.0.5.0.ebuild 1041 BLAKE2B 169b0977807d50935ac9113ca319e0016810398b0b7c1382143ab980667c4533dcdc5db19b93c793fdb408973580b7e900af16b504eca64d4dc646629531e081 SHA512 b1ce7af023ae929f8d24f6917015cdfa377c489f5354448e62c424f41974e704820a8fb956ef1d17aa8aebd9e0d79d309710004811eb1d8d3292d306379ebc14
 EBUILD wai-3.2.1.1.ebuild 994 BLAKE2B 0a7e719f907bbbe7b8c6bb6fb76e087138ee120c908546c69d2dc94e8444df4cf766581388206de0e6aabcff7793fb5b09e607cd2a11a3e4cb48182a879bf42e SHA512 81078325197f334d2dc2f46083d98168b9f2db7a2ec533aeee8265d3dbb48b64078ad2a86e223884b2e6823d1740a865a958b4bd71c2666f9a390f504a6bfaf6
+EBUILD wai-3.2.2.1.ebuild 754 BLAKE2B ed06ab4d55bcaf079b083c1ddf59da60b8982330ced2703663f0dc462fcdb84a896d864c97f9d28f4a3fe31952bf819056d92c9ed0e44a93faf5f5b4251dc4a1 SHA512 46dbf594fc085cc3dee4930d3a8695d4998fc5e3a725f15a08e7f3a534cb8c9536f4c44fc5b9d36786ecd8ce66b3ceb6a7d05114332fa89c7ee92380b35eec94
 MISC metadata.xml 454 BLAKE2B 3ef1cbb158cda0dac602716c12e1bf50f55ad1ca0df83b6a7d8915882df9e93e0bc945bbf59d4fa5d0381c39af8fe7a48a7857063b90f9bcae963bb2ccd77eb8 SHA512 dc3917c971c63bdab8e9c1bdc8e00959de5372d42ac139acf86a9ee3b3b2abe2f437fddd0a421676c4411d58a076fd6cf125230d105be6848ac28c6006d005a5
diff --git a/dev-haskell/wai/wai-3.2.2.1.ebuild b/dev-haskell/wai/wai-3.2.2.1.ebuild
new file mode 100644
index 000000000000..7639458078ae
--- /dev/null
+++ b/dev-haskell/wai/wai-3.2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web Application Interface"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/network-2.2.1.5:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/warp-tls/Manifest b/dev-haskell/warp-tls/Manifest
index 586b255692d5..d8d2006caeab 100644
--- a/dev-haskell/warp-tls/Manifest
+++ b/dev-haskell/warp-tls/Manifest
@@ -1,7 +1,9 @@
 DIST warp-tls-3.0.4.2.tar.gz 5870 BLAKE2B ea55807c1ed297befd351db83bfac773d22bb5de509d56870fc7695716a0144b55d99ea27a7e9b30a0042fbe075ab0ccd47c47d463a345ef4b30efa27b2a52e7 SHA512 3334d8923b720ed4b79f9489364824170df276bcf3ac530719d26999d0899e4ae46c2758856819b440ee937d8c411bbfff2a446984a3b7d5c61177582517e467
 DIST warp-tls-3.1.5.tar.gz 6967 BLAKE2B ca5a4bc7abc7a1ebf1348c85ce4ff2ccb329e55ff3a669b4714cdea225b8b5d25692bc1fa79b1952017f9c421fe4fb2f200014b1a3de0b2a66b8890b18eb68a2 SHA512 f34f706ed1a1a37a3d78b3b5f296bd8416b5524fcded5b1291ffc2b7e20069ab252fe5c1620bc6c79b8c2346a70b872654b88d0957a55a843a92ce6384fe3483
+DIST warp-tls-3.2.12.tar.gz 8200 BLAKE2B 71380d62ef1ec401140d308499dc7aad8e6fae1d3e51cc64285f5e740c1ed9fc30f9f096f1a40977e5f5252da49646632c9dfb21090f8d7924b6ab29e619082e SHA512 c1fa08c710bbbb88e914bcb7e978fa0fedcff9900351cf8f2b59bbba8b35e56b605ba3bd36d6162459397f38a0cdcedd5e48472f3d7d1b1357d0b0c3c2fa75ba
 DIST warp-tls-3.2.3.tar.gz 7159 BLAKE2B c54d4ffd52a2968e279fd8cef2acbbc22bdf1830fac4fad71319c85d8e7906c799b5a0385cd01ea59aa30a8304b0219be280a2ec774b60a9f5c43b628dd1ebd6 SHA512 d20baaf2d89007cef8f7beed1eb5dc9e3698376c0abfdfca65d06c3c55dc083fa1f68b0fdfb2f67e686e1d5bcc69e5d3f128d2807f72b95c49ef2400791f8b03
 EBUILD warp-tls-3.0.4.2.ebuild 1006 BLAKE2B ed342bb9d78652c513ac61271b213a47ba386f929ade0dc94056582d367695d99198dda62b481469831cec5aec4c56917ab55162ddc8b343c2251675f80afe6b SHA512 6dbd1f901f9c866c8f511c950e0e29f48e65c6a68313c60e2686101b9e77f65885013ad19e6d667fb8960aad05106b1007205e477a68dd3c4de3fbd00d2225bb
 EBUILD warp-tls-3.1.5.ebuild 1003 BLAKE2B 9e0a4acbe63aef59850a2c8bde0e48862510a5849d46b6d3a33518b17e66df734f622f7e2b48568c88401425206c84680ce9ac72c5090eb33e5016321b6ca3d5 SHA512 4427d1acdf598b660647f90dec7f371ca8699e528d397f5e9eb21e82f02f085260d41be9b782c8efaa6ae9af3b9869cfd4b394a959927789b2e3c191c53e2d8e
+EBUILD warp-tls-3.2.12.ebuild 1058 BLAKE2B a9c46efe3847801bff4f204b64e99dea9816151f99a4c351cfe7e6037677d381db0688c1794c56b4933bd13cc520ad314660bfff988f0b0213742a1f10b771eb SHA512 6a11de123e8adc62ecbbe843a8307ab20335ac4d52afe6bfb0e207c98111ffc6ba64ede1317fdbdd8ccc3a9e1867d5da44bfd2cbf572a1db975f6326f4bd7381
 EBUILD warp-tls-3.2.3.ebuild 1002 BLAKE2B 79c16aa8d82b447dcec2360d90f5a37564a72ec4dcb2d497a10026cc2456019500258b8450def7052f03ad3e6b4588a201c7569219fcfa8491172642503bb49e SHA512 1e23e82ceb7bf39fa47ae9ded5b4e7946668c0838d7e1b8a8c5538112972883ea4477f295500ff7deb166aeee2a72b8d3b8ea7cdc42dd202272899ec0ff81ca6
 MISC metadata.xml 423 BLAKE2B 5463c75d3b032343e0afea3366a8aaedc25a3f551740decca76238f7909231d56c7855b55e21ce279ed8b79f06bfbd84bfa946863318916bcbe68da0cef4388f SHA512 8e779cfe4315e42ff396408778ea3d421fa6607b4385ee0b6227d4c8c780996ffbe8a1f20d82f0c2442d04ae4ed2b0a04c890e19ab583c85aea8ed2e238c769c
diff --git a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
new file mode 100644
index 000000000000..1bd16536432e
--- /dev/null
+++ b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +tls_1_1_3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?]
+	>=dev-haskell/network-2.2.1:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	>=dev-haskell/tls-1.5.3:=[profile?]
+	>=dev-haskell/tls-session-manager-0.0.4:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/warp-3.3.6:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=tls_1_1_3
+}
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index c28cc8e17d2f..527a7d0d4bcf 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,7 +1,9 @@
 DIST warp-3.0.13.1.tar.gz 44894 BLAKE2B 1eafa5629ea5c4562d904da62c988b87f42d8f53a58214323414f94ff56fa0c363449ec703a57ca67f63e11c385018d07aac7b5b1db6cf6456a0b01e339842a9 SHA512 5da05c58e0a4223469ffa78877a7099c5ab9bdae1f4cc43db1f88fa109f0a5f44a9eb7a98f36f068ecd2b67a1c4b218e565fa8d4cb8cd39a944995569fe6feda
 DIST warp-3.1.10.tar.gz 72128 BLAKE2B fcb3c3a01a5d1d8943559aca2f66c62a19ae85db5f17a7978f99c414c1d60c845d46870add61296b3c4bf43b13bfb403fa62152145011f6c2d4498d253e8648c SHA512 ee5ea6a1bbf4b9773ce0e69d51989268ed610564bcbe06fd8b214ec1edf2a71c22b47c2970cd0a45573fa9bec734ff2b585747dfc86e1e788b16f12429aea645
 DIST warp-3.2.11.tar.gz 78007 BLAKE2B 5dc7b0e3a14d8dca141a7f537021d9cc721f8eb441f62e6ab10abaa2f41ba69049c352a6e311bf3de637ee83d452a618c221ff34fb657de59c0df4ca32fdb8b9 SHA512 971662d84c327b314822bf4f4a9c4f9c1950ef444d1965fab5139fe245dc5c0bb88302f1ff40cf32afa7085a80494dd377a5528586ad3395dc633f3ae782b04c
+DIST warp-3.3.13.tar.gz 64719 BLAKE2B f9430b22fed524cfa8b90ec3ead31f8c86c74a5b5b967503dcc682a31da8880814856f37c4612d16a873ecdb6faf21dbca1af28c1e1f22942fa258c3b828c326 SHA512 ac37e1f274d26b2c846429960074d27010c0864efd87da6d79f03e3f833aca3269176bb99301ab8cb59c4476ff12bae35b26e0fe602e7b0e2cad2837592e07b1
 EBUILD warp-3.0.13.1.ebuild 1976 BLAKE2B 46205ba1f5b3547cbbecc656297b683e7a60a69999ea8e52d57f150244cca89510638e99c3773881aa7773dea8ec10bab89b5b20709488f9e37926d9efe2c044 SHA512 b9c50c61e9ff75a2889de4aa866af9abd657e14c779b24602023529a65fff095f1ad8943b44744b8b5cb6829e29f1442d0afb614a8fceba15762a5558398ebd3
 EBUILD warp-3.1.10.ebuild 1938 BLAKE2B d74cd6188af821bbc19de1e9f29b874371f6f0e98fccdffae0aaf38e420591d9c92758edb7b14d70d6e27a1f2046b323c0624440c3c4723b8686152e11833923 SHA512 2ecead4dab6dddf3ac0313e21350f1901ddc2773b4082caee7dc2ad23d8c492adc4ee5304017c665775a0e60e8fe341e4913f88f5c453fef4c0630344bc6dabc
 EBUILD warp-3.2.11.ebuild 1926 BLAKE2B c8459d9628ff696ea6320f7b21aca9eda7379228ee106198d19337ea73a909b28e6ef631bcbc177f5f441872ed7971238388a317c27cba780fae994eb22e169a SHA512 f2f61955cb8f14d65fdc5cae05a641be2bd9a545eb541233257e3a951b48dfb2f5a97c0fa57c00ae41d56dfeb690bbb5a7ebab5c966f53ca10d921eeb3d8429d
+EBUILD warp-3.3.13.ebuild 1945 BLAKE2B 63d1b9042bd59b623179b1565323f459199fc82ef8f956ded7c9c9635891bcf4622024d55c8a6447b258d39014c307be50902120b2484c398cffa3c2c4d927ce SHA512 979e0ee76888f0b37ce184f76cc6c8a1ea73ae20895ba610b97e1c6df44a34fe702c28bdca0a1c7a0f66133682fcbced275d4d57d20a81f079c4a6d2c327a205
 MISC metadata.xml 675 BLAKE2B 74f9fc8f509c9ac875d37f7a99bd1fdc626a215a60f7c82e411f66b718b7979cb67807fa10da408e423beead085541a69978d22725bd0255baa29ef8c060ecde SHA512 641fc01699c9f39c032b4735ac30e218e32cfd1403d9eae03ac4a5d6ab55e7c91af1ef7ddee088c87df902cda43ed74f16f6cc7d83eba1f859b43121c0112d42
diff --git a/dev-haskell/warp/warp-3.3.13.ebuild b/dev-haskell/warp/warp-3.3.13.ebuild
new file mode 100644
index 000000000000..f9433e28e4b5
--- /dev/null
+++ b/dev-haskell/warp/warp-3.3.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -network-bytestring
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+allow-sendfilefd warp-debug"
+
+RESTRICT=test # requires network
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
+	<dev-haskell/bsb-http-chunked-0.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/http-date:=[profile?]
+	>=dev-haskell/http-types-0.12:=[profile?]
+	>=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?]
+	>=dev-haskell/iproute-1.3.1:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/time-manager:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/vault-0.3:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	dev-haskell/word8:=[profile?]
+	dev-haskell/x509:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/http-client
+		dev-haskell/hunit
+		>=dev-haskell/lifted-base-0.1
+		dev-haskell/quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
+		--flag=-network-bytestring \
+		$(cabal_flag warp-debug warp-debug)
+}
diff --git a/dev-haskell/wcwidth/Manifest b/dev-haskell/wcwidth/Manifest
new file mode 100644
index 000000000000..a32734792802
--- /dev/null
+++ b/dev-haskell/wcwidth/Manifest
@@ -0,0 +1,4 @@
+AUX wcwidth-0.0.2-fix-build-failure.patch 756 BLAKE2B c18ebd2a4c38875a2ab7120645d88dd62e69ab268bd147090cb0cedece3e4b621bf70c206d79e5e2b6d3991f72188fc2087b09b2345474328b25cbbe67c906f5 SHA512 8c0951b2251002eb3f0e5f56cd06d6571ead53e2a854cc79d1e496d7b0a82792a216a48e85deeef0d1c0b4f330da624729150b77bd444d911f6149c9c4109cb5
+DIST wcwidth-0.0.2.tar.gz 4168 BLAKE2B 4c6f3b490934aacef35b4fcbf8d9cc8f2c93b2d34a705e78dae4750f2adaf37d4d16d89e6595a50bf545d7a7dd486f589b1000f7d2f5b2893b45680ed31f1c4d SHA512 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649
+EBUILD wcwidth-0.0.2.ebuild 839 BLAKE2B fbfa7391071d2ac3f877f3b55244e4614f07d20ae3c59d0c24bae3aa81c6c79b0ec7a784e59530b46f0ae35a31770906e07f12270301fe2aa5c0e964347f17cf SHA512 10081b0b13d93c4502a0d33db17a210a38c46c8d1b2432d22d7c5050514140e1f194f5900064106b8146562bd146deaa4f3fbf90dcc43fc9b990ef4e9cda0c32
+MISC metadata.xml 573 BLAKE2B 96dd1da6043be2b9cbc0b1846aa4d803560046c031baa9129af1d54cdaffb18fe73696b2c314c42d29f5e106f66154f45558366c8b76441fadb20ad551577d61 SHA512 83838b6164d9ba2126d3fd18eab3b63f7236b0ac98ec490e70557b112dae3fcad6d7c4869e02e383f25df022ca8bb5999b0e24c45caf18ff8d42c1ee863f5418
diff --git a/dev-haskell/wcwidth/files/wcwidth-0.0.2-fix-build-failure.patch b/dev-haskell/wcwidth/files/wcwidth-0.0.2-fix-build-failure.patch
new file mode 100644
index 000000000000..7332f9edf0e3
--- /dev/null
+++ b/dev-haskell/wcwidth/files/wcwidth-0.0.2-fix-build-failure.patch
@@ -0,0 +1,32 @@
+From 4fc1333ecfa19129debbac1dcdc1f444d69cbcd4 Mon Sep 17 00:00:00 2001
+From: Jack Todaro <jackmtodaro@gmail.com>
+Date: Sat, 22 Sep 2018 15:49:21 +1000
+Subject: [PATCH] Fix build for newer versions of base
+
+---
+ WCWidthTableaux.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/WCWidthTableaux.hs b/WCWidthTableaux.hs
+index 576fbb6..4a4d8f4 100755
+--- a/WCWidthTableaux.hs
++++ b/WCWidthTableaux.hs
+@@ -5,13 +5,13 @@
+ 
+ import Data.Char
+ import Data.List
+-import System.Environment.UTF8
++import System.Environment
+ import System.IO
+ import System.Exit
+ import Text.Printf
+ 
+ import System.Locale.SetLocale
+-import qualified System.IO.UTF8 as UTF8
++-- import qualified System.IO.UTF8 as UTF8
+ 
+ import Data.Char.WCWidth
+ 
+-- 
+2.19.0
+
diff --git a/dev-haskell/wcwidth/metadata.xml b/dev-haskell/wcwidth/metadata.xml
new file mode 100644
index 000000000000..9e3d25033a24
--- /dev/null
+++ b/dev-haskell/wcwidth/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="cli">
+			Enable command line tool
+		</flag>
+	</use>
+	<longdescription>
+		Bindings for your system's native wcwidth and a command line tool to examine
+		the widths assigned by it. The command line tool can compile a width table
+		to Haskell code that assigns widths to the Char type.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
new file mode 100644
index 000000000000..32bc1fc8e9e2
--- /dev/null
+++ b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+# hackport: flags: +split-base
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Native wcwidth"
+HOMEPAGE="https://github.com/solidsnack/wcwidth/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?]
+		>=dev-haskell/setlocale-0.0.3:=[profile?]
+		>=dev-haskell/utf8-string-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6.0
+"
+
+PATCHES=( ${FILESDIR}/${P}-fix-build-failure.patch )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag cli cli) \
+		--flag=split-base
+}
diff --git a/dev-haskell/weigh/Manifest b/dev-haskell/weigh/Manifest
index 9dffb14fb143..ac7189bc33e6 100644
--- a/dev-haskell/weigh/Manifest
+++ b/dev-haskell/weigh/Manifest
@@ -1,3 +1,5 @@
+DIST weigh-0.0.16.tar.gz 9070 BLAKE2B 9d21313445541701460267fc605056bebe17cd409a733a05c306602129f8850ded4b9688c52084f35cbfb9105e397779d9127c04a74556796a0091b413d1d16b SHA512 a7889b891f8099e23922f37c9a770c94c8bfd6e7e7740786ba1595c0c153dcd60a320d79647952a1a1275a1cf06e2a2aed9ee0ce60e34583a91d186e246f9470
 DIST weigh-0.0.3.tar.gz 7028 BLAKE2B bee320438a986d8a3fd21c8680f7263a4394e9eb713d8b503dc57bb823841ada5d6395e813685fd4e4c7f19f0b5153e70dae1fb2a7f9e4a81e9c674dba0be0d2 SHA512 26c33c4079b6461be3cd93c9ba07deec9f5e1945bf9a2baddd3608d19fb5a3c5e103415dd37f931a7f63e3d62c42cac5d7e156d59e9a1a2789d46c27c24b550e
+EBUILD weigh-0.0.16.ebuild 792 BLAKE2B 4990fe6ba643459cf9b739244afb009d7c13d616d733c4ecef64d7df33aeed0d1bd9ebfc75862fd63e709acc0a45921b14695bc9318e465bf3f49f4ef7939a21 SHA512 d73e41c268acb27a808e6d1170872ba500c1d06c494a94472997249ee4131710b4013a945020afc2ffcaaed2448e0615ccfc2bc823bc0e41dcf41125ab50f007
 EBUILD weigh-0.0.3.ebuild 625 BLAKE2B 8eeb0245de5d28497862da42cdb56b25d363593cbb6c68f529850627da2ccb1ee59adf0a609ed6c9999cbd419db6298339ab292eca8058705bc13b8516f90911 SHA512 06d34facac5c268647d0e6c5af850f44ebd416f3dc56f0ac079d00940b8370a57929863fe7bcaf74b0524fd2c34d6eb56557be16f9b7efc75eade1ac69c549eb
 MISC metadata.xml 386 BLAKE2B e741d460c3040ed20bafc01159700aab1316a28ab2f1c96bf6103ae5d9a54108af3dff06553f2967a503f4a231e21ce0264183cb7c4f4a2a13677df366e25726 SHA512 f52750aab10226100de1d49e58567436c094054e0e08580af809da1c93dca14ed15fe536aebc8dde573ef754d0e371a760dc6906d5bbc8b67be6cef4a22a54d5
diff --git a/dev-haskell/weigh/weigh-0.0.16.ebuild b/dev-haskell/weigh/weigh-0.0.16.ebuild
new file mode 100644
index 000000000000..138620c790cc
--- /dev/null
+++ b/dev-haskell/weigh/weigh-0.0.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+#hackport: flags: -weigh-maps
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Measure allocations of a Haskell functions/values"
+HOMEPAGE="https://github.com/fpco/weigh#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/temporary:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-weigh-maps
+}
diff --git a/dev-haskell/wl-pprint-annotated/Manifest b/dev-haskell/wl-pprint-annotated/Manifest
new file mode 100644
index 000000000000..16a3ae1c4180
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/Manifest
@@ -0,0 +1,3 @@
+DIST wl-pprint-annotated-0.1.0.1.tar.gz 15458 BLAKE2B 8699ca505a0c72790d70890ec290bbb602d259015554a6260d52445574d8e0f86c9d4e4a05bba155f59730595073d0613cda00fcecbf142c97afc0375eaedcf2 SHA512 45f1881254f8b20d9992a477a36a7408d2df8d94f99c71d72d75cd04aee3831966886c94b6e6a68791acda24aec8c4a339d052b9a188af8c2ca24e74da1e9596
+EBUILD wl-pprint-annotated-0.1.0.1.ebuild 811 BLAKE2B 18b2a765cd5d47b17da5fc5a8811c4dd22e7883104edd2fa8e8ddf55a9065f1268bca5371151c500b606a02474366c2797794af3967d7ffe2408634f8d2ff709 SHA512 e4908c3aa4d9284463ff55f6b6b16146467ab29018fc13d08ef0d4ca1b24f6cd7c3cc30d491fe0a4914a816119cdc99097c834cffb92c8f020565559988c5294
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/wl-pprint-annotated/metadata.xml b/dev-haskell/wl-pprint-annotated/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
new file mode 100644
index 000000000000..2548bc51581a
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Wadler/Leijen pretty printer with annotations and slightly modernized API"
+HOMEPAGE="https://github.com/minad/wl-pprint-annotated#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/wl-pprint-text/Manifest b/dev-haskell/wl-pprint-text/Manifest
index 11ccb6e7452b..eb298894a4ce 100644
--- a/dev-haskell/wl-pprint-text/Manifest
+++ b/dev-haskell/wl-pprint-text/Manifest
@@ -1,5 +1,7 @@
 DIST wl-pprint-text-1.1.0.4.tar.gz 15140 BLAKE2B c2c7739638098180394c6ef98e435ea52d2a414da4d629db2ebc0ae9f01414c4a33eeaacfe0c8b733e89914ce308885bc434a71797a3228d94ae5fed1a32bdc3 SHA512 17116393deea2b0ff9b34d6df411e1edc219803bc3986ef105e4bb6bf03f193c622e54be998712a777605bb931a322e828ffee7d150a8787d41480672ea178f5
 DIST wl-pprint-text-1.1.1.0.tar.gz 16575 BLAKE2B 9e90e0d58fa9bf099cdd03446e35ee933890428f2e523978e8addb55af6a8d31642da5989a8a1703b67e82d29fb93baf84a2471e493a4433dc2024a100799d7a SHA512 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd
+DIST wl-pprint-text-1.2.0.1.tar.gz 16766 BLAKE2B af6666833956c37e62f36c0d6ea3174c830146855fa3a29265716bfe3c356269666c257e0b9e0ecf71752a2bc76d47284a0e4b2a0f8443e19de073f335a06804 SHA512 944ad7ead8eb062a3fdf71a90872a14d7c4e021d5237cd6aac19f1e882dc62e14cfdca114a8011b7b76faed10cf5fd76b120336adb4c10f6506fa06672e922f0
 EBUILD wl-pprint-text-1.1.0.4.ebuild 639 BLAKE2B 3ee2ba85512ba5878257aec9f316c10d18e0eb896b61ca00c454772cbba30ae1512f3fbf6f6715d47033718e631b2fee0cf78b921ae39b8169848b186b459252 SHA512 a5e9e12f3111e1777e666aa8cee497d43305a8c28871537135ac8771aa74189ce3f8c504a1ba9f28570a2cdf7cb70c1f0b77352aea078e5e04ecf67421efba63
 EBUILD wl-pprint-text-1.1.1.0.ebuild 748 BLAKE2B 788b2edd88d032522e1ef00aff01af9722d4fc49eec0588bafa17e62ebdf106db8d0942ecb554bdf806735b8b8c26f6a08d5a66b118ee1e88245a9d8eeff7b11 SHA512 dd227e4e655129481a266516da9f527b196226e0737189c2d7d105a808ddde314346397df8be89e60c8c236b6ceedf246871c978f4535f2cbd077a663ba3896f
+EBUILD wl-pprint-text-1.2.0.1.ebuild 719 BLAKE2B b1f26b85cfa703015b07f82f1928d4010bebbaacae91e54e6593992dec131490ce74457c9bf1abc336f572a38612e72813f7ddb469f30eb77850ed5a252034b0 SHA512 98302a514435899a8199c79f5024e372982470e27a9e3a530f7e344fad63f56380831825e962bb8bfb3112c2dd714825dc5eb4ceefce9561959e1b73e437f808
 MISC metadata.xml 342 BLAKE2B 7d8903aa4189e9e42195c98c30e92cb25bc5e59bbcae5598441ee58fdd0893c9c367981c4f6cdca3a3735f39d6f955472484bf42cddae4ba0a78d998e7b111cd SHA512 be2a9a24047f85b40a42ed9db8784a5726949fb1c4049ed32d2403bb3a00b3cbcee8e0602842e681b75208374d1be142ae36cb2510d7d77450942549ba4eca2c
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
new file mode 100644
index 000000000000..2a11a3b66db6
--- /dev/null
+++ b/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
+HOMEPAGE="http://hackage.haskell.org/package/wl-pprint-text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
+	>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/wreq/Manifest b/dev-haskell/wreq/Manifest
new file mode 100644
index 000000000000..232cfa03924e
--- /dev/null
+++ b/dev-haskell/wreq/Manifest
@@ -0,0 +1,3 @@
+DIST wreq-0.5.3.2.tar.gz 57521 BLAKE2B 2265e7f8abe371371d079f735d61917c0efa5b78e2d3e8965e3b720a94e89b3a7ae05824f54d6fe765c643ed81f506b12694355b0bf1d7b4c2e9198d08c2317c SHA512 5a2c62b973758cb8ce2bf20504e328090896fa25e7ee1f77b472d7cf5156e08b6d85bf4341ff45e44db1724070fcf3c0f21037fa0a79211a1767024328f7c779
+EBUILD wreq-0.5.3.2.ebuild 2311 BLAKE2B f11b7b72d2c5c50321c2c5aa5d379030116d151961d2c28c4c5650ccf7631c07534347ee7935b32929ef268011d072339474da68e789b08cfad6d32345efed80 SHA512 38de7dc4401078749c6bea0e0bbf1653b4b40d43d94a104e5d80338e1ff5bf88a1708bebc942a3c716427a0c21835c4d1063215b5ad667c5b4c1022a8cdf81a0
+MISC metadata.xml 1054 BLAKE2B cddcf6bf00139c602bcca861bd8dc3a6d7b625e3e9809d4155206c84fecdfb2e782919a97fdffe1fa96db8643f034b5f7861777a4a39477adfdd25223ffb5459 SHA512 46661292b5a750539ef4a08a30fc32b72782de57b70e59f1f9294400cf6d872b625fb58151f23ee5ca1638b1ed0ac1bf6e1d0ea8053817d5a204b7107ea4ac88
diff --git a/dev-haskell/wreq/metadata.xml b/dev-haskell/wreq/metadata.xml
new file mode 100644
index 000000000000..887b9ecf25d1
--- /dev/null
+++ b/dev-haskell/wreq/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		A web client library that is designed for ease of use.
+		
+		Tutorial: &lt;http://www.serpentine.com/wreq/tutorial.html&gt;
+		
+		Features include:
+		
+		* Simple but powerful `lens`-based API
+		
+		* A solid test suite, and built on reliable libraries like
+		http-client and lens
+		
+		* Session handling includes connection keep-alive and pooling, and
+		cookie persistence
+		
+		* Automatic response body decompression
+		
+		* Powerful multipart form and file upload handling
+		
+		* Support for JSON requests and responses, including navigation of
+		schema-less responses
+		
+		* Basic and OAuth2 bearer authentication
+		
+		* Early TLS support via the tls package
+	</longdescription>
+	<use>
+		<flag name="aws">Enable AWS tests</flag>
+		<flag name="httpbin">Install client</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/wreq/wreq-0.5.3.2.ebuild b/dev-haskell/wreq/wreq-0.5.3.2.ebuild
new file mode 100644
index 000000000000..1c01466b1a0e
--- /dev/null
+++ b/dev-haskell/wreq/wreq-0.5.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+#hackport: flags: -developer,+doctest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An easy-to-use HTTP client library"
+HOMEPAGE="http://www.serpentine.com/wreq"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="aws httpbin"
+
+RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
+	>=dev-haskell/attoparsec-0.11.1.0:=[profile?]
+	>=dev-haskell/authenticate-oauth-1.5:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	>=dev-haskell/exceptions-0.5:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	>=dev-haskell/http-client-0.6:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.3:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	>=dev-haskell/lens-4.5:=[profile?]
+	dev-haskell/lens-aeson:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	>=dev-haskell/psqueues-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/time-locale-compat:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?]
+			dev-haskell/base64-bytestring:=[profile?]
+			>=dev-haskell/snap-core-1.0.0.0:=[profile?]
+			>=dev-haskell/snap-server-0.9.4.4:=[profile?]
+			dev-haskell/unix-compat:=[profile?]
+			dev-haskell/uuid:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1
+	test? ( dev-haskell/doctest
+		dev-haskell/hunit
+		dev-haskell/network-info
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/temporary
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2
+		dev-haskell/vector
+		!httpbin? ( >=dev-haskell/aeson-pretty-0.8.0
+				dev-haskell/base64-bytestring
+				>=dev-haskell/snap-core-1.0.0.0
+				>=dev-haskell/snap-server-0.9.4.4
+				dev-haskell/unix-compat
+				dev-haskell/uuid ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag aws aws) \
+		--flag=-developer \
+		--flag=doctest \
+		$(cabal_flag httpbin httpbin)
+}
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 022238c25117..e86eb00298d4 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,8 +1,12 @@
 AUX x11-1.8-no-LDFLAGS.patch 375 BLAKE2B ffaed9994a08f5e69354235cdc08d3c7a4156a22c4528e82a2c12e92bcc8d3451d5f30a619066f553cd4a96ebfe22f75fca1284ceb37bf33b8726e72d92dad1e SHA512 10637a22e5a49cbc570d60861ad6912c886355e99033d3a31ff874681e5bd00907d929b8bbac24372766f2bab36b9ac75aee3bc1e1c72a49366be73e566273b9
+AUX x11-1.9-cabal-3.patch 209 BLAKE2B 61ad9df12074c6dcee729544a6ef21a6e35252aa1c3b0548b0feb4d33c2ae56d96ef5f0ac3d9d92a05bd45aeabe14da5ee5412045702eb86141bce3c90f05831 SHA512 6a44eee5e11eef4a75072e50ecd715a96f682a540c41fb94340977db1b19d899414c4bece7dc6db36dc9ad517b08ebcad1abce4949eebd7984420b2b2b7dfe3a
+AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1
 DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
 DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
 DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
+DIST X11-1.9.1.tar.gz 190698 BLAKE2B ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4 SHA512 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
 EBUILD x11-1.6.1.1.ebuild 998 BLAKE2B ba36f8013845e92e852368fa52bce4eb290d6a8214a884a514f91e73a4d07d2c2df8b76b7a79cff254b198a3fe0d2ce48c41d32f91ddd8289bf073f8c165e3d1 SHA512 ea3686bb5693bd9981ff7a6515452621414571dfccde39d6a6677baf7545ebdbd3f29ec7557a5a976ad7abd54fe186a277641e0f1cc38a25a5f4656091c54409
 EBUILD x11-1.6.1.2.ebuild 997 BLAKE2B c3dfbae2b5a28d5164f1f458d8a72a4c56cccc24b7f5485d9146ce8ea216197044fc4efb03fd8a02c34ff7a0c15a6c1d7056b36c61c9e6eab584741bd0b34c69 SHA512 9a4c22b0beff7ef91d2562f0fc6a540caa4f5dd5c838a5baa7b3168391cb2b3c7e6e8e6b9a0834132ed0d03a77892dba75b5d16cf12451352a50463cb3098409
 EBUILD x11-1.8-r1.ebuild 1030 BLAKE2B dcefd54b0281a8f9d4121dd39e65a7d77440ca24ae0cef827af7bb3a95a72863414d0439f8dcc984ca5a4ab5ce3162f0e2079393e297a5d3303b99e3db3f7f9e SHA512 6d0f3af44db5487c3ec1890453a94a56cf15e8896e4180180e17cf4795144c7f17fac0d79c1118d4d76b9bc653a77f7f9da7b8dbe83e94a97a7e33b50eb2cd20
+EBUILD x11-1.9.1.ebuild 946 BLAKE2B 5f7e6d08ca044b795d487c84bed50a9f807d24ec51785e646a9ac8bad36298fbfbf507dcae6de6f5b6df3f31ce99c5468aea57063952314f2f116af49da2ad95 SHA512 e70c990e59dfb5d726b6240de67f1a27185a776bb34e0bf24304d6a08ce1811a511d370837d98080baafb4a5227043f83f28fa49adb551c066cc6a1ab8b0ca6b
 MISC metadata.xml 700 BLAKE2B 080b3aca0b33588e2b2f5b2f8d984564a6de2db86c97cf03b807a875089f30a33f246f4eac92cc91d7adea48cf63c7e07146682288a6df9d277738e999cbfe0d SHA512 73e5b575860e2f3540b0bda58b551a8688d4003451913326f4e55ec0adc35dbb42bef7da015ad00d12683be286b1b7ee611884479f618ffdfabccf3a9c0fb074
diff --git a/dev-haskell/x11/files/x11-1.9-cabal-3.patch b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
new file mode 100644
index 000000000000..fc4ea175de04
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
@@ -0,0 +1,8 @@
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -3,4 +3,4 @@ module Main (main) where
+ import Distribution.Simple
+ 
+ main :: IO ()
+-main = defaultMainWithHooks defaultUserHooks
++main = defaultMainWithHooks autoconfUserHooks
diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
new file mode 100644
index 000000000000..69bc33c0d21e
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
@@ -0,0 +1,10 @@
+Don't persist LDFLAGS into package database.
+
+https://bugs.gentoo.org/609624
+--- a/X11.buildinfo.in
++++ b/X11.buildinfo.in
+@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
+ cc-options: @X_CFLAGS@ @CPPFLAGS@
+-ld-options: @X_LIBS@ @LDFLAGS@
++ld-options: @X_LIBS@
+ extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild
new file mode 100644
index 000000000000..cb805ed19d65
--- /dev/null
+++ b/dev-haskell/x11/x11-1.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="X11"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+xinerama"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--configure-option=$(use_with xinerama)
+}
diff --git a/dev-haskell/x509-store/Manifest b/dev-haskell/x509-store/Manifest
index f13d9e05ed0e..76a47e48d422 100644
--- a/dev-haskell/x509-store/Manifest
+++ b/dev-haskell/x509-store/Manifest
@@ -2,8 +2,10 @@ DIST x509-store-1.4.4.tar.gz 2992 BLAKE2B 9727c4a16f63003222c8794158ad96304f2557
 DIST x509-store-1.5.0.tar.gz 2981 BLAKE2B 579eca067e0a2c8e65df57e2e1ebf8772959a4fd0d63bac752a3ffb7d1dd60ba57f73d0d638bc63e3194fa6343496eb8a343ca569abf4e632a822513c2bfbea4 SHA512 fdad44693615f832aafc0fc2b804bc7255d411241f669dc7396a5df958f128d6e94c1637a4b38860c4967a482915549aa94912821110477134d83095d27623d8
 DIST x509-store-1.6.1.tar.gz 3562 BLAKE2B cbbb3bd9cd280334f2dead12f156fa2b3b8ab5dbe2d72a5eb4cbb42023ee15df8823d89dd076c62638bb52a37537f6c1ada7906c3d1f374da3bcf54aecd0c0e5 SHA512 1417bfbb1f4863fe2e3e31f37253b2d96f145a790edb1f5f2439ddcadad67497d082222410f08ae9c2c2d1e87a1c994f09551f796b17ab757373a85fbb53e5da
 DIST x509-store-1.6.2.tar.gz 4326 BLAKE2B 1d79775d622cb6ba70069fdc61c5338447cb6e496b3ac621695ae4a172ff35c008cda4d036dd04d27c6f787d480ac5779d90c01c387eb83c080a5a01fc95c6b1 SHA512 41e511ea32095e96c71da17a1dfd34fa4e4d5e9a0d87d99586a5976602844f196aa0cca9ee97f66a092284a2c6120c0174a7f2d707a3e80c1d7020ee6168f847
+DIST x509-store-1.6.7.tar.gz 12689 BLAKE2B 13e879b6a46e662de0660c5a2257881e50487d2667180030dca0dcf33a60718c75aa6413daa5b874622eaf9612e6cad7009ecd84d2d517bb5769beb4eafe4ec7 SHA512 7b0b792a988aed50995523c3f6a3bb0da08cb8963ad834afbeef8bc53e4bb3d7d11af757a999f7b5c81ef073bac10a4003fba7486abd9343a48770bfc954167e
 EBUILD x509-store-1.4.4.ebuild 1157 BLAKE2B a4a839c40bd40407543188e90d53acdbaddd7adcf1773d6ea1b3deff88848a3f17096c5a798f5be25242a9694fc0090dfd036f68255139f8cbaa988a1335c284 SHA512 c1913cd0a753633840f7b819c1b5e135bd961b8db428a519c4f5f1ea1f21a961149ee55ee000a77015ba87908c5232e9422d810513b844b59621878970e84216
 EBUILD x509-store-1.5.0.ebuild 1148 BLAKE2B 6c6152c6cf17bd81859b122b6d24b255b739cbb214be27b5e9e2236f11806f1d45e3b25e1438c722a878c8d98171bdbef88387d32136700c4032de2cecb468fd SHA512 b3c04a63b02fd17f119ed688633059487894deab7831afa1d5a06aaa4e57ad1470fb32879a8ed69b06f5ad905bc7ce1264f3f5dea72bdabcfabaf9b0324e06f7
 EBUILD x509-store-1.6.1.ebuild 927 BLAKE2B a46849395e8f46d9c5afd6554a5ffe9a266e4601238ea5844c3356d3b48e2114a60e55d337af13cbb362f03def59982066d50a94ca955abcacfb831be55aadf9 SHA512 4c1d74607891d08b117f782ad40adc903f96496f8b1c2eadcad5503589f81b3db39c5d3159218cf336e86d01617cd308de62cc54f484425d5a54b06ccc15f697
 EBUILD x509-store-1.6.2.ebuild 925 BLAKE2B 635fda8934e662ce566cb5d6853ced09df30b775bfb11badf5cdfa4e0809618dbe4b8d1ab488e9393b728c405fc15e7f857ca2c6512937b260f404ba07644b69 SHA512 ae722c9f8021b54a996e09ab0fcbd4c99028e488df8ed09b88ec69a1730d8045713b82ab0e1ab354acbf12ea4bd2fb56c568766bfd5d2082cdbeb473e5ce317d
+EBUILD x509-store-1.6.7.ebuild 962 BLAKE2B e20176c520cf29503de04935b11ee8440dd1ccc58f89de07b361a805861e5ced76b29002174598671f715421d27f4ba8b3e9fb70a0001f5805c319ed3c2a2bce SHA512 fde6b71d2a313932fc920f0ebd982014b4f465c8a9f667d47098599e1eb29646d18473e27d8e6b5b43808d14f731bd34804ffe1c15124f43d027b5b83a502f44
 MISC metadata.xml 532 BLAKE2B 0ae737c7d16f08e631f3d791580eb72ac16094e81f2fc8e2b9e2a84067c0deb4fb2bcae28e7df8fc65acb5abd27095fec9ebf6c733bdb2e55a84ddc4cd55c8cf SHA512 e40040999883c0b8506bf95e554d84f2edfa0bb36bb61c3edc44b8756c1b584c20470fd40c04599a9506d9775846b62744c40814163bfb44542fbb8a26c50bbc
diff --git a/dev-haskell/x509-store/x509-store-1.6.7.ebuild b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
new file mode 100644
index 000000000000..6bd29f8a9c29
--- /dev/null
+++ b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 collection accessing and storing methods"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509-system/Manifest b/dev-haskell/x509-system/Manifest
index a0471f5c92cf..fcef2fe08bdc 100644
--- a/dev-haskell/x509-system/Manifest
+++ b/dev-haskell/x509-system/Manifest
@@ -2,8 +2,10 @@ DIST x509-system-1.4.5.tar.gz 3596 BLAKE2B 09c07e7391ebabd7ea2d52b784b54c6b6f39e
 DIST x509-system-1.5.0.tar.gz 3832 BLAKE2B 8912c9cd13add9113b204bc0626fa36ce91ec797743e655c978f56352f3d7ea77158168d887e85b4cf13e71cef73586fd82b987a8ba994f08587a891a6e59a71 SHA512 275423717680d62978fbe0703861c05ca2ebe2f0185bd479b5590c725380508d3aefcb229f62111647592f28bddef5285d1224cedab71349b28ee23d8a7d1ee4
 DIST x509-system-1.6.3.tar.gz 4035 BLAKE2B 639deab930f04f1faaa362cd475eb9ced191c7cc93eb83a35e8230b80723e2c607e0c1b9ac34e807afc22c628ad96773e3d83fbecb42aa819ef5a19de4356ae2 SHA512 4368254a6a1d96876372797bdb360c89fde4266a1fd73d028e7807ea342cc58090181c5fe81c0f19ec8620424be04ceefc48dbe4a682cb792dc6bd6726bc2e6e
 DIST x509-system-1.6.4.tar.gz 3443 BLAKE2B 95357c8cd5f5b6e18af9a380d13adfd4bd7eaa69dd67451ab74313046ccc20b16b96d8980818e0700be019d49f419f6fd447943b12c7ffe82690cf2f796b2265 SHA512 5b12e9d3509d0f131532f4a5857442cdb64c157b16fb71b181336b7ff1840222f6bbcccbd69609b74d5f387963eb4ece37bb9fd37bb5d1e6d9d2aa5162739bf7
+DIST x509-system-1.6.6.tar.gz 3419 BLAKE2B 12de162cfc29ddc0f0e5649e0531609bda73f0b0cb305e03015e037f7cb5cef7e4c9a2fa202396673f81e28084e6c4c52cd588cc1050e7bbd4cbe1116b916722 SHA512 110f8e9566ab1cd9491f1bc9cb11ee950c34308af026e71b9f8e60beac09b0e062e1e3a0177d67b04aab824c54476b800b965bf616fe84ba0181991371c9c220
 EBUILD x509-system-1.4.5.ebuild 809 BLAKE2B c235391f2a8ed5786384cc533dab6b06f95d626b68ad9f9138cbb7af4d0b51974e02c193145d4f898c36c2b1c251e99f83ce78d6878a1e34e42f25667902f729 SHA512 96ca5a2f11c9644d68ac3fda5c3cd8035ef7aa6723f6e223b6e6196661a55391e7277b852bad8ed7040c723f923aae187c3cef266913d27af35eda41ae6024b5
 EBUILD x509-system-1.5.0.ebuild 806 BLAKE2B 91520d8c22bd3a915504dd0bca47d80aa4ab6654a4c0d3ea5ecf2751688bfaf7ff632b9200fdb0ede02ec43ad6f97b58c4d88aa238b9d3308b72438d2a7f3de3 SHA512 9eb602812d492330ddc80e8fa15e0dc97c3e8257464db7fdb3ff2e5e26e12465f60d50e06b17fd91c088508fdce183d016c84ae150c38a52b959f48c1b1c30d2
 EBUILD x509-system-1.6.3.ebuild 811 BLAKE2B 6a6f3c8706c6bae76ab45682958f4ea11b08f8b50291fc133b3ae1bc636cd622636390a865527540a5928acdc373456c657da98d96af58cefe56073f89fe1ea8 SHA512 1c167e3c71f7544f59b7f87d21d176244ce5f6aafd8b8612a11628696e4dc0126a31fe3529670bdb71aadc164a7886997197572821f54fc54dca42902d20f321
 EBUILD x509-system-1.6.4.ebuild 811 BLAKE2B f570bafa0dc48153a832b290c0fde71d82ba841f2169e9fb1d83bad393bbc20657544aed1d4dc3fb7365dcad44803276c4f1e63f06c6b3e696305d21a6bab80f SHA512 6f004e16b666e47bc5e2f2844e04f468485f75e7f54370b1d9f6c1baddab844bb4bbf278fdda34b49089a7f04f75a6676add0e8bada2b073b299780f63fe056a
+EBUILD x509-system-1.6.6.ebuild 740 BLAKE2B 68f4c051facd2b2ad671b5b6690879e12cf9b8577b28c3fa99ef82eea4156aa9bcaccfa52fcba168faa4a65538fcee71fa4c493e264bdb7d04a5d6682ce8f8e7 SHA512 aec53ab492bb44b84fefdcc9823a64d56121358c2a5d5147deaa09ab99ec904342d337a680844095d4cee01371dcad133da749e17d4da2cee04c3a4fb3e24a76
 MISC metadata.xml 401 BLAKE2B 328d96d11638b96887e11e8073a487ccd0a8590b5f520f9ec410a29cfd9e76f06d70a3b71eb5a3c7aa7f9afa61d5e6869dd80215dc774545c206eb72bcf3a2bb SHA512 5456194344e0624b6ab6860790a428f5cd29e5023780aa7e165405248e9cfc66b5b6ae8e8cef7ef46ac3241f89f330cf633e8374d77fde4b739a11513d91fe15
diff --git a/dev-haskell/x509-system/x509-system-1.6.6.ebuild b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
new file mode 100644
index 000000000000..b7c957b16e63
--- /dev/null
+++ b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	>=dev-haskell/x509-1.6:=[profile?]
+	>=dev-haskell/x509-store-1.6.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/x509-validation/Manifest b/dev-haskell/x509-validation/Manifest
index 8c549d479a9c..87a3bc64e681 100644
--- a/dev-haskell/x509-validation/Manifest
+++ b/dev-haskell/x509-validation/Manifest
@@ -1,7 +1,9 @@
 DIST x509-validation-1.5.2.tar.gz 9658 BLAKE2B b0df27e594214e18130cad45d64b6bd14f21074d4fa3ce1090af80a432399ed77c99763fdbc089bdabafbe16d26b501e3fd221f5c55169efadbc09009cbb4463 SHA512 113cb7ebf6575e1902500a9b91dcf246d7a2d01fdccd25454660b4be667c92b60c8f18d797d69814a90ab941909370c96a24d1ed1a63b55bab5d75491f1cf603
+DIST x509-validation-1.6.11.tar.gz 19752 BLAKE2B bc9a113db4c7cc5bdcf161e39efc0858b3d08f08e8304c4f3eda5ae051d5670e1c681bf6cc9edc7244838a1fbda2f9217ffccc0cb2c00ab6732a0214932a3a74 SHA512 5c156b7018afabedac0c2ee6192c536cf09eacdaf9265490a7f4a7d336077dc198a07f16bf58f3fec04a1350f0a8b3c050380673612cf5695c9e7b5a73a4ebf4
 DIST x509-validation-1.6.3.tar.gz 10259 BLAKE2B f7ebb98c668a57399325fe9561d1d9fcea1f28e6079cdd29b3298a1a818a1fd0d318a81040bad4cd610aed0470d679ab7495b31ccf0a0f952d647e6b1381f887 SHA512 83aa4a403ee726cae8a901c64e997ce0ff9d94027c90f794ebd1eb0267cbf9f8846df7e3fd03cba5bd414e8dd7c89a46fc74d88bed8f42850e0c0e191aadabcf
 DIST x509-validation-1.6.5.tar.gz 10370 BLAKE2B 9fa399e63457c9d3d0e9bc52bfe739e38f1fa89a77a56384b7107b78b56f68f8a341ebd04a98db8b9a2dc096594893eeacc1b064e1cdfaabcc2899366685ae9f SHA512 170a01b748ebd082ed4b7c084ce2e4ee9614c8ff45ca28d4cfe32b0cae498c43bbb4ec0d9e0a6a25b480f57660fcab67222442c3df970a4242d0191e5c2015e6
 EBUILD x509-validation-1.5.2.ebuild 1384 BLAKE2B 5ec3600189c033fc29b82ed58e8a7be85ac9ee562ed49fd1cf0d3bf6964beebc0879df32dad75fe5cd19132b4850c7dbc8299a019e6580094d0f45d738787807 SHA512 dc6446278a79a75d1414ca1a53b12349602dc876c5fe8c496e6139d3c779b5a9c409c6534120865b4ede216e6486efc1fb649f28cbdb71798b6e26aebc559ff4
+EBUILD x509-validation-1.6.11.ebuild 1079 BLAKE2B 9a7df5fc17395ee1487be820ca2324d6348f3f2e47e9a97871b006a436d11dbbd3fd942c451c769b469a03451e6b32518f9262ad25152f8bd87c303c758771a0 SHA512 4647c9e829cc1576ed4a662716059a7e03d8d7500094f44bd559272d0afa6bdb318d9edb2764e726b8e2e773174372cede51689a53e384ce11a38ed98318d6f1
 EBUILD x509-validation-1.6.3.ebuild 1150 BLAKE2B 988e3025779444f0f6f17e749cf11a8c0e01a413b0ff229f4d17d1b1ddff3ccdf62b64d08c87c4d5ea9542fec8d3747e94112023ff6115f14ca4eb26587991b1 SHA512 a0d472d296e699ee2384a186d4c928a6c3bf453c79c8a30fca53f0a749bb33c77dbbd1a9bb2a81a0ce9fac2e873a572339a83e64203a5ec6b2ef13bd00f78b8a
 EBUILD x509-validation-1.6.5.ebuild 1150 BLAKE2B d3847d4aed81383a30a8a5ade56d1dcdfdf65cbda13f786fcded3e733641f1540a1adb4aa47e1d8d7e0b5b499ed5d90e15c036c513693cc11c24da85ff6d07dd SHA512 22013eb0f5ed46cea877f9304a4e81b6dcacc0ba2396c800b3bf70b0a98a633c545880d0bac41929a3a16cd8e2a784023ea906e05b0d0c2a43ed5c069ab9015b
 MISC metadata.xml 416 BLAKE2B 71d99efd7f245b1ddca40bf75fbc79e586a15c7b7eeb12d53a3492cfa91139e268ec19c0d56a2d3a9f0b1b1881848fc763e36e5e89e7e19a100da56a37716185 SHA512 9572eec905c615a7d79bcc16c6d455fdee488d302c08fe5f18450806ef2b31893e1a86d900178418454e77fd3a0d6c69a85f09d67c4ccb7e3c95f6b0f521a7cf
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
new file mode 100644
index 000000000000..6ac65f9ab9ac
--- /dev/null
+++ b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 Certificate and CRL validation"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
+	>=dev-haskell/x509-store-1.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509/Manifest b/dev-haskell/x509/Manifest
index d11be68cb9f7..4a0dcc8c1b11 100644
--- a/dev-haskell/x509/Manifest
+++ b/dev-haskell/x509/Manifest
@@ -2,8 +2,10 @@ DIST x509-1.4.11.tar.gz 13976 BLAKE2B ef161b6ac7bc28eed8736609487fc7f53eb9765d0a
 DIST x509-1.5.1.tar.gz 14528 BLAKE2B d58463da78e3ba9204e7b93e69917bfa2c04ab8debf68c1fc27cc4e0c11fc5d15f304008ced232efae93a985843feab688b18a0a188882bbed1a23a11b9adcc2 SHA512 8255cd78c2602f2bda0eb6dc8b539c5f9c656e2b24b015031e1cc0439013b17e56e339ba497717c2aa38dc33b3e61632db2965e3a7859146a69ca6cb4e69e92d
 DIST x509-1.6.3.tar.gz 16134 BLAKE2B a1f8aec494f3a1614474c949da284909a848c637f3a358a71ded546d930973805352f4b7699eb372aac1d90941a1df5e815f059fb0b03053a72093aad83d9cd0 SHA512 6ee4198954bd66febdae4b2d223490085c5e49ca6cb416667061f879488f32cb51dbe9ba8c6c9dd6a79ee3a57706c0eba3cbf49603b80d613f692192bdb32221
 DIST x509-1.6.5.tar.gz 16711 BLAKE2B 0bc0997880dd74f97806a4a287e3dbdd8b1be0a28c52666b4a1057c2607c34d8b480d3af9d02d956ccb885ff6b8dac50ff74959dda2dd650899276b7f1240543 SHA512 bd63bcb1723777e379c50db55f32a2a7d10b051a7d5a586f1caa3ed298932626669adf8dc7e4becc54090741921b23a7e39879ac743ed90c2281634f8d18240c
+DIST x509-1.7.5.tar.gz 21457 BLAKE2B 4bc51e63826de27050e254d3f51b8f346a175bfe825c4555095fecb03c1f586827a0d64865ea78b9a579aec38f671f8adf56a2d432b16ff6be8f988544bd8cfc SHA512 e1caa84944294ca412b18269eef19f1b511f0e317b25431102b8b757ce266ab4ec48f805d4d251ff46a85f3b20ef368b176d8b93a92456fc9b8885a85695c537
 EBUILD x509-1.4.11.ebuild 1246 BLAKE2B 7572b042e74e5ccbb0c33a088fb535f41d5653e109b6c2657c13ee5ed4347f6d348bcfd3cd055a59c5ee13996831b45bcdfaa3d5d1630aa64eab9581b0271873 SHA512 52b8e0a58382c2760cb2f92cee04112287325b4c487f2e3c9974de6a32fdc65bc7adcba218ff015d65a233750d18d88f1d91c1e9b364257437ae1eb1c9c33564
 EBUILD x509-1.5.1.ebuild 1175 BLAKE2B e18822b6d275041a2dca59b4abc2f2e28d0a5ad74934e37c04e189897de08375174845694d984d165a7f1def48eba54e985399ca7c4f158f6302d7d4ea437699 SHA512 97e3c977d96f7649d7116abdc65f2c632603d28ff61fc2fb940bd033006f3af6e70b1def0b31c44363973ff23ea49171427bc6b33008d7da8fb64b362bceb8ab
 EBUILD x509-1.6.3.ebuild 1058 BLAKE2B 5a2c385f8b73c7beb8a44bf192e6db5fcfe37ea4e532fd25715e34a16cfc5f6f1510529537ab56fde45bf8cf327219d49e4b4e04a88513204a608d24a9326448 SHA512 08d219535de523221a53b60de9e6606e554fdd804d69181bda84148b8c25c454fa61bd503d62239039fa239c66d17d85f0876579a6bfcea3567db1a362800938
 EBUILD x509-1.6.5.ebuild 1058 BLAKE2B fdc508cea489e9e1087d4a06826ca4a55525e5d56cc3541181ab0630b23adc7ab7ee1ce595192fa301b73f9c1345be80623824209d6a867aa854a92b3e6dd713 SHA512 464b17e7857559a1ceda3a01bbd3e7634db1bfc578828cb48cce113defe7a14d2053845e8855de852c9ab5c6d84e2f6d2d33874a47978a3655425c8344e4c664
+EBUILD x509-1.7.5.ebuild 1037 BLAKE2B eac23025684bef86f7483e228db71afae6bb450c5b77834d791e2c7b0709b0859b606e2cad0eea0987e93d409e8a7fabed8aba062769058749951ed9c2dd075c SHA512 8ae1a53906083210e764363f26b94ec9b29ee85b200750f1c87792e5116bba8f89a46a02ad4eed593a8455c95ffb734900cc11fb19fb30eaba13e303cfdc6b47
 MISC metadata.xml 402 BLAKE2B 59bd72d1c5b6058ff84fdcaf16425640d696c2a684149e603238fa6edbfd3ea5159516208e71f120133332e2770cef79aeb3b2902cd29314d84e71869d252570 SHA512 f580c339830d91e8f5ffc91afedc049f10fa454477d81679668d16e2b8c7d1d0217476c487c39cd023c86cbbc43f72bfaecc5d0a6f7fd4cbd781184c2bad48e1
diff --git a/dev-haskell/x509/x509-1.7.5.ebuild b/dev-haskell/x509/x509-1.7.5.ebuild
new file mode 100644
index 000000000000..de60ccc68a27
--- /dev/null
+++ b/dev-haskell/x509/x509-1.7.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X509 reader and writer"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index d9e90c5e4a19..6734eb9b912c 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,3 +1,5 @@
 DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
+DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
 EBUILD xhtml-3000.2.1-r1.ebuild 799 BLAKE2B 74f91742232e918c8c6a45b9c51f4ebdff50cb3919df78f24e00711812f6672f8a057803c3b6e9ce57dbb530062843c43702e00235083741bf1770c6b1ec7354 SHA512 006aa423a1168a2a27e4e8887434cb153522f23da325e9e5a8c48cda498fdd8093771ba3fcce41878ac9ff705b475379de2b9cd528112c397c10ef8421837119
+EBUILD xhtml-3000.2.2.1.ebuild 685 BLAKE2B 645b0304cbc366154934b3dd10f24ccb698d90d7a1d3f50cc88aad02d9646db5d5329ce2cdb4e94f6dc947de82e5250f1daddca2ec9b91ef8f7b1e5fcd793df8 SHA512 8ab24fe2332b0a4ffd594a2968258ebd0337f102024983f29e25d8ae76658fb6f7af455a99155cd996fd6c56077a795424bd0376bfdf7897231c7ffa32e7e0dc
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
new file mode 100644
index 000000000000..9046501c4955
--- /dev/null
+++ b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="An XHTML combinator library"
+HOMEPAGE="https://github.com/haskell/xhtml"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.4.2:="
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.4.2_rc1 PM:8.4.2 PM:8.4.3 PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.8.1 PM:8.8.2 PM:8.8.3 PM:8.8.4 PM:8.10.1 PM:9999"
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index b4b71dfa90a3..6becbd73a7c8 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -3,9 +3,11 @@ DIST xml-conduit-1.2.3.3.tar.gz 31240 BLAKE2B a5ae1399be53d483a38ffe7570bd422a3e
 DIST xml-conduit-1.3.1.tar.gz 33304 BLAKE2B 3ee7e88de9ffc583dfb801e318304f17dbf79b0eb3c06d38fad748c8c8508aa05187f007b2aac1885fcab9211fdc1eed03518d50c1f5024beb453f4bb7478be4 SHA512 939a891304647a8643bbf186269edb3a59930bf825dfa9e5f96382259ecc1c0787fbeb826ba0e5ec2105b263c8a639fc6079e8e3918b271f0e6ab9640133d1a5
 DIST xml-conduit-1.3.3.tar.gz 33965 BLAKE2B e6bea7a2b7cec94758ffe6d624eae81eef1bcff7de6732f30a3c367367614a474768ac792f7aee5347358af0c86da6d9651257c0ce4696f49f39fd7bf6d2449d SHA512 1be43bafbdd3e0b0ca778741a42d81e95ee4f02f38dd61b06fd371f1314ff809223d0a6a269124191df8887ab82a85ff280d3a95d82c37038b04e86da12ee2b2
 DIST xml-conduit-1.3.4.2.tar.gz 34828 BLAKE2B 24514ea18adb396e66792631fb58949fa94a90980e0ab712e17175ee33152a2f68ac7b462cf92d1eeb5eac8b80ce4e7963d0dfe996fbcac4d1f64a0e908b3f90 SHA512 c4b505189edc39f80c1ae842516c2a2ca15f486465fab94864259b094f9f23dc1dfcab73f1754096fd323f0ab0bcd9a87f801d775295c99e208e9c7fa688b65a
+DIST xml-conduit-1.9.0.0.tar.gz 40139 BLAKE2B b82fc11cc1ff1e63dc8638eb5da3506cf2ca755d94aa98fa0c5db16d17c676396e1d3e747037ba846e959b9883465d090bdb036809cb542453980c52ecb4ada9 SHA512 a6348233d99db2987289448c7320820abb9ed897b389d0a275e92c4a1e8055e9fa60a422b306f2bb1289b85f83545effe00d07c9ca1ecc7f2893d74b812cca23
 EBUILD xml-conduit-1.1.0.9.ebuild 1603 BLAKE2B ec0ff9e2b5cc7b514be64cdb7ce650cfe35cf247187b8b111f711d9f36ca429a4c43542c9592942d9e7a5b0908bdc3524f80ced2452c206a4bb3d02b8f8d6cd8 SHA512 b33b06b659a593f684d941cf7eb5cd4707dbd647a8666ddbfdea4c3a218bf89ae70d21e2a752af98d26879e4c1c37cbc3a7c966e21dd41c0655a197c783a01b8
 EBUILD xml-conduit-1.2.3.3.ebuild 1469 BLAKE2B f182868c3fa67536404dbb540e05cb4c85e0222b549ecaa61c7185d66178fa525326036d2ea8edd48882c1b346e4ed521b1ea5899274b3dbc269dbe9825f7f62 SHA512 2bdc2f5efe5c1ea0c01f42f0c4bf19117903d8cb09f94463d62291a0d4f9718c07b6499ab585882c5af98cca0f8708bb4a09473844768d6bfc05a48132f5e50a
 EBUILD xml-conduit-1.3.1.ebuild 1377 BLAKE2B a8081b4122aebbd31c7ad7e07db09779d8aafce86f94860945c6a4306ad948b87a35550d9b143c55e8d02f24413514c482c56a9fa9b125ef1af1c1c17d051803 SHA512 a4ff0b9d9c8050d0c3762c12c6116806d30fc311f5913041d01afd35db36934ab7891b67be5c09997e759e4ff5bc73b13b40eaabe4939a2fcac0430c83eb133f
 EBUILD xml-conduit-1.3.3.ebuild 1377 BLAKE2B cf39322c65b7b0f217b77ce1f42a0e8299d4abd4efadf04314656814c2fea29d71a01f0c5b8c6a7fc09e8a8b1663b39e3f2428bb447e8971d71c93301f9da8e9 SHA512 ea91f698a92a86ce305df510ce8c21810b2654c4a08bd0a8d14a9809d5b0f1bdf98e5bc5353edd615b3745eeba2f13220804028b26a205998e75088015f68fda
 EBUILD xml-conduit-1.3.4.2.ebuild 1377 BLAKE2B 654f4ecf5abfef3be47f39d4d16492ba51c4c24be1f7da894da390efd24fb4263367f5bdcc72bb999d621e40a881ba1da0f672ff912647f703292893d80b9c86 SHA512 13eaea12637458f6bb9bf9557296c0350d222444decfaa53da78e264abaac8f2571f68662e25bb2d6e875886037c564729a3dedbeec48630562b1b538bc73e77
+EBUILD xml-conduit-1.9.0.0.ebuild 1192 BLAKE2B d38b4a569f615b83765f27b8fe660467fd63b6d3909ceaa643e49686db0145ad1a0dae714d2783f864f37193c27dd8bae0c30e0d7a4b42b862bb34dae765c824 SHA512 94d968e5a04e88c9d75ee10a3745d06a9558704d6e43f89c2fa3c3fa2eeaae7468612b86094de8af138bcff8bdfa429b4c95f17642e49f3cab92df768412ee17
 MISC metadata.xml 1536 BLAKE2B 45a099c2f789592d1b52f7d765de3e1e474dd2135f26795fe9f4c31319d2e58d1329f137eed0646570c7c819878fe96eb44c680e1d30e68f40108b8271aca537 SHA512 b165bc569011782102739b645d1d8c5e36ba248967732dd8faac80aeebf56122ffa5ebef474d9a43cd37cb725ef94fa6f57bf104224a5905eb6672e05cd891db
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
new file mode 100644
index 000000000000..043022e12e7a
--- /dev/null
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
+HOMEPAGE="https://github.com/snoyberg/xml"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
index bccb4c29cf9a..c37d063ffc7d 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1,5 +1,7 @@
 DIST xml-hamlet-0.4.0.11.tar.gz 6080 BLAKE2B 282ec0afa37f65f45b6581f6323f3d3cc009cb47a4af8dbb846613699a620ec1be5918b340c4e898d65c32323919aad56df808ae84baba2a97f5e9fd7f2ec71e SHA512 a0deb9996948a2a87f63f58f18365cac4d9db2538b24f10f5e0a171fb597d10c567c926c89c1cdfb098f471acdbecc8ea58164c94a10f18eebb3f7779e9f999b
 DIST xml-hamlet-0.4.0.12.tar.gz 6078 BLAKE2B a476145a649181ef9116bcc0f1bfeb076a7967d16250bdfadf455f97615cf6c384801f1addc570e9b53fc0a834bf0e58059cd77fe1347b626cbb4ab28f39b11f SHA512 f503ffdefc0c8b3f8cce140bdf474086855a78d8be1ad729674f439e6a13e3f3b5313bdc5a4c88ac06756e85946b2b1e7f51e2a336ede6d4815bed4873dbe182
+DIST xml-hamlet-0.5.0.1.tar.gz 9270 BLAKE2B 49b713f45d16451d40d7afa46d045eafc208a56b3299f778950c89daa68c2678a2fb01c9e18d9645e00f3e2173bd1bc62bdd03a9b91b15d2f2d627977cb501fa SHA512 273dbb637c6e37fcc3b180448ccee0dce8996319d653cc3833fef302a297e8fdc805958b4ebc6e015cbfb2ae8b60a8325108b9d6dcaab052b460ff27a404de39
 EBUILD xml-hamlet-0.4.0.11.ebuild 874 BLAKE2B 5a895ec5efa8d42ff7bdb213f04b8d6018e2c706592daadbf5ef308256fa97ec9743f7f30fa3caf2e4dbb6ec071a3244f78f5e7a32e15b51d3c80df24aa26b03 SHA512 b19b5196980dcb8e8e358f457b52e1963609d1ac5133d197ec55705905e6199c148178f9be71a21871a5d1680e4c1b2f406cbbaeb9a4c3e449aaf4725001b471
 EBUILD xml-hamlet-0.4.0.12.ebuild 872 BLAKE2B 04939faa580375169ec9e40dfe28ac15f1e09592e296acaf4eac09c9ed46be7f04c21f5fed833ec395955163f5116aa2c686dae7b5e5e5f3db548f6e5cc8ef3d SHA512 4ffa05b5a9b1267cdc6a3599e08899da9e5c0c82ff0c6a7340f949dc90d8432532e6bbfa9b6a0e2a3b8a834a26a1ed42d419d363a7e3df18269354b7c3f8ac28
+EBUILD xml-hamlet-0.5.0.1.ebuild 832 BLAKE2B df2b9d25302f564906f6dc06987cec87db42ca76274d275bf9229b4ec3514735a2ca4fd9d6a4b11cad442e2a06ae1d1e327aff94f495250d879f8c9ca8ac61e4 SHA512 1889174b459dc08a4da49cff059f66d6cb26fe738418045f0a0aeb8dfeb66ca07cd5fe8dfb83a67aa1c0baac094131dd76e370916566290b65b2ff7f36e9c3f2
 MISC metadata.xml 331 BLAKE2B 349adb7d16fdd4f8334c768f22c79fe2df189c05c5b058bc3429cead0fb17379bc865288648a631490ac975d3f22bde4ede06cea8c71a0d7e36b03a8f3269358 SHA512 bc41ef3118b9cfe18949270aa7f12a4568edc7f22580548557ddef1f879399a2a6bc61efbcb6188e15d4fadb8d925f8d8ecbc0846c1bb73a2899a20d37524403
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
new file mode 100644
index 000000000000..2313e63c9738
--- /dev/null
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hamlet-style quasiquoter for XML content"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 649c3ef6a52e..af261f6272b3 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,8 +1,10 @@
+DIST yaml-0.11.2.0.tar.gz 29254 BLAKE2B ba9e0086fb4d93a9fd74ddf20dab71e3760af741476b13a1fe8d89944f5e5fc1aadce9a61a29a4a4607863378da98a5b5ead8bd7b4c7ffc3bae1e6b5695f977b SHA512 b90580ca37066401558c1a19148f70f6153a7f44f65ade99827adf20a4ba04edb8a9d6101b507014b92970d4bbe89c0fd89792a62206a2fbdc7ae5ff08915885
 DIST yaml-0.8.10.1.tar.gz 73448 BLAKE2B 1b4e8b50d8e4913dd772253a8a7481802afe3dbc91538da9ce06437a09d155d2711540a87d4592a9953f6f316915da20caaf85a49f3f1369b2d98a5d8d9004ca SHA512 59b26eaca99379ff84cda6b8972ec2ff1e777536a754b9bda248d350a0797ef6c24d9cb86590062f4e6c12a5453224619a656c306a0292fdd1fe46e459a286e7
 DIST yaml-0.8.15.2.tar.gz 75540 BLAKE2B fc7b03cdb582221c0d8611bee0f38189a4e55cc78a10c12906e09e1b4820de00298096d43289cd7d01ad23cd5fb9a221d9d976f90b0ec966f15975a97779312e SHA512 214a8203ca13350268b285d7049110ce91c03d6c8b0bc59187048b9efed15374c97a4b91e464e86f719d3190c0bc534f9ca4b7436fc33a4748d0fa84bb747bb4
 DIST yaml-0.8.17.1.tar.gz 78775 BLAKE2B 66ddd1bf1ccb1f7b1314cd5b56987cc6e29da23ccadbde0d62baa6a9f143167e619f83bdb2734b8d561be030ebffed62ae610c417c52a40375b395ba38fd9ee7 SHA512 7119651e209942d41a9f5a542d365b5fea77c56d9dab012e3bf77234e6c6d23e2cff65c9b6c16ca185ff33338fd75c6b3f7dacaf1ff56f96c5773fcea70687f3
 DIST yaml-0.8.20.tar.gz 80264 BLAKE2B dc1252c331e707b96f04a15026eb50862b457a0d1137c5a72f1e9269db3a1f2aac0425784c442417b04e1d08b21d52e10ba115f1170595229177f96c3545b779 SHA512 bed0bcc6758606663aa1ba315590b7f4e26043bd5fbf462219e4164c7d41144d093763f85015db2ad83fdeb51b464715d49c0ec882e43cba6b141d40d7a2226e
 DIST yaml-0.8.21.2.tar.gz 81350 BLAKE2B e2c1474625d1283eae811805127babf37e89f00a38fa889cf855a53defec7837b5c80a3e4f6cadb48855056430487cb21d380c8c4af5d54ba5e61b57820c0463 SHA512 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa
+EBUILD yaml-0.11.2.0.ebuild 1440 BLAKE2B 628ec9a9af4de566f204daae9e704ff68dde64a959a473c769cc5518dbe983e0035b4d28e2494a87ba210138fbbe9144474b088b8e31f98356ffb0a954a69d63 SHA512 10f595eba12977d15c9f87570d49b8b82e2388eeabb897218b7825f3b3563556ab49251d1cc4b89de6508250fbf064759d6a9e431cf6f41a392b352c76cfc46a
 EBUILD yaml-0.8.10.1.ebuild 1434 BLAKE2B e4225c530b1b3f8730554aabca72101df8ea404bce871bcc6d581bd099410fb78070e98914ec0065446670e8d7d923e8d0a37fcef18a74da49bda58d27587e41 SHA512 3cec3184e5298fcdefd1751a0628ba87b8b67e4d4dc02174bae4c0a3d695c18bd95e6b383f5085110c0c9f9ade2c923cfe879781346b19a1e4db9d4b40b1fcea
 EBUILD yaml-0.8.15.2.ebuild 1440 BLAKE2B 11e62810552ebf35cc2e30b1f485a3f34d258b35f8a431cc0c4736f29d9212bc4a8c56ed89961191e94779e98dab2c7db73768f9bb69b6803c9858051b697258 SHA512 0f830bed38bdc44ca3a221dfc74a41798d766d92ed6ccbeb98c91d7d9d022ab5515097ef95fc39c88999f61c57bbe391ab07e27653ecd37f08dd2ae82547212a
 EBUILD yaml-0.8.17.1.ebuild 1589 BLAKE2B 322689b92b52133e7b5ffd4fe9c38504fce9970c77b4f4cdd5b0ddd7327e33fb0faadb326b05ef6727730f175feff249fb68e1e81189120712b99b2b2e46dc61 SHA512 3e53071e952195092d781f10e03975284deb95f997cc4b5410d38e19880adb7f02ec131e64bb1c3eecc53b28bbe7a63fcb31eb4ddbd46163b7edbcf0026420ca
diff --git a/dev-haskell/yaml/yaml-0.11.2.0.ebuild b/dev-haskell/yaml/yaml-0.11.2.0.ebuild
new file mode 100644
index 000000000000..77c1d3c93b58
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+no-examples +no-exe"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/mockery
+		dev-haskell/temporary
+		no-examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag no-examples no-examples) \
+		$(cabal_flag no-exe no-exe)
+}
diff --git a/dev-haskell/yesod-auth-hashdb/Manifest b/dev-haskell/yesod-auth-hashdb/Manifest
index 150f6f49c324..bdba5a7b136d 100644
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ b/dev-haskell/yesod-auth-hashdb/Manifest
@@ -1,5 +1,7 @@
 DIST yesod-auth-hashdb-1.5.1.3.tar.gz 13367 BLAKE2B ee67116905ba799cb67e813e2096c63361ab9c4d7fdb3d64df44744e7df39b2a5754acf4f79a9b87f167a827449c6bfadc1a0bdb4df6f39f3b9110d8b7c3b0ae SHA512 2fd7de432307c2e4465b8eb9ca6af6e1ede0fb8a3e09f9a6d04cff63d03c2db57eba2282f3441b45c82774bb063fa1d5546b832ca521074304e03343010a1952
 DIST yesod-auth-hashdb-1.5.1.tar.gz 12987 BLAKE2B c0a715d26950de505e76900b309572b78ca28d8bcbd6c3c5935c91a6e614e46bb05089c442d154703ba230ab2e591bb16b1bb2fdaabac68bb51b1496030db956 SHA512 9fbbd5b3b8bdd56e0e35a7609408fff034ba320e8271655ae29d75b1a75dd7c4ef9cebc4f94ed991137940d8161ec8560af6bf3c397d86de78e447adaf741ccf
+DIST yesod-auth-hashdb-1.7.1.2.tar.gz 15751 BLAKE2B cff24e8957a68539c168466f77433fee064aa76b8426e9c1023ff704c990d0b774341c113bae066b30bbcb01e1c1199f8c6dcd9431e574838c67863a63f791a5 SHA512 417c5113530b6960f30e5209f0188c5367361acfbea2eb60a6d30a9facb5a3be6d8547dfa504da4f7a7585d8c848adbaafa0a28ffea6930f9954071e6e2647e2
 EBUILD yesod-auth-hashdb-1.5.1.3.ebuild 1354 BLAKE2B 4f7dc01c5c8940137af8bc2341501d6edd0d6a810f44918e7f0a127c495be08e93b164740a9ec8e57f8e822bdb0b2d687dcdbdafd3f608543bd65c9a63c0a4c8 SHA512 0113f5bf5f11f91fa14ae83b60416bdbc7f2f4fc6b62bf5f463a9883b10503e6447bf67e529eef2fd25683f203002c098e42e53279fdd9b0972a9039a05d0209
 EBUILD yesod-auth-hashdb-1.5.1.ebuild 1355 BLAKE2B 1c85c280e288d08a16fd0b3ae5fd21e01c0aad806afebc483f40b0d0ebb4c17069d3e66d6240e4c6ef514ddde47868228700743731bd970d7aa564a221521e0d SHA512 b2fbdb104b102e0198d89160b1f68a9a1fd75ff7142498e42ca4aa09c4433c56419a38b29b2dd90fa22bac7c0cb57b4edb8b21bc79f370d8f4535e35cacbdf4c
+EBUILD yesod-auth-hashdb-1.7.1.2.ebuild 1483 BLAKE2B bea18ad52c740335dc9cf025c3d742fca26d451e5f71f03f1679e8ccba6a5b14ad584dc10b76ffffe929e8481447388a005ae3e41ad86b952a585643ee32a238 SHA512 1454a66b652006a6e0c23e160857b68b5996bfb28227e7bbaf6752bd1f30e76f7699443ebfdfcabfd51a89efb07462998284586b46c9d3afd971c8821b653b07
 MISC metadata.xml 533 BLAKE2B 1998dc0e033193c2d851920adb947655cc7f22b1cf78b0a734375e7d690df376a6deaba55f1a5ddc04fb398eea8bbec09c83fa333765beb9e0fddbb3d5802b8a SHA512 3989f0ef1df278ff8029a07467fb909c775af723078a5053f89fd86b0cb0cccde6d5ef29d8808c3290bfaedbd8b90e07f7f7b39045f1833b39886343649d3183
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
new file mode 100644
index 000000000000..67438bbc6ba1
--- /dev/null
+++ b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Authentication plugin for Yesod"
+HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/yesod-auth-1.4.18:=[profile?] <dev-haskell/yesod-auth-1.7:=[profile?]
+	>=dev-haskell/yesod-core-1.4.19:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.2:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/basic-prelude
+		>=dev-haskell/hspec-2.0.0
+		dev-haskell/http-conduit
+		dev-haskell/http-types
+		dev-haskell/monad-logger
+		dev-haskell/network-uri
+		dev-haskell/persistent-sqlite
+		dev-haskell/resourcet
+		dev-haskell/unordered-containers
+		dev-haskell/wai-extra
+		dev-haskell/yesod
+		>=dev-haskell/yesod-test-1.5.0.1
+		|| ( ( >=dev-haskell/yesod-auth-1.4.18 <dev-haskell/yesod-auth-1.5 )
+			( >=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 ) ) )
+"
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
index 4accd406c8b4..77f1775f7b3c 100644
--- a/dev-haskell/yesod-auth/Manifest
+++ b/dev-haskell/yesod-auth/Manifest
@@ -1,7 +1,9 @@
 DIST yesod-auth-1.4.13.2.tar.gz 48670 BLAKE2B 1cae99e4ae777286de827fc86ad7fc0b81810bfe80f67e15b3de4358675151bcb66c58727b1a8e0c767f6dc2f29fecd0f0bac967ca69c30c5da684d127ff74bc SHA512 b22207d0ccf86345a50b87a66b4050727003edda7a54d86f81861471a694b2ccfb21d247bea972f21a2e8693cb79988028777f25791059ea3d2a47ddd8a47731
 DIST yesod-auth-1.4.13.5.tar.gz 49064 BLAKE2B c8120dd146266e8f5d31fa6149d6a5c30ca1d62cd9fdc9646afc125ad72a9253073f8d62a62b040f86bb8cc4afc58a5fa373af37552ed4d6b20710ec3c836cba SHA512 e401fc7b2d74c924108e59784f286704cbe44af05a8dabaacac027a3da45425592e0d85d0289c2601d5aec876fd19d2707b9a31a424f3997c8577a41dc49ed73
 DIST yesod-auth-1.4.16.tar.gz 50119 BLAKE2B 54f8a6b756e13c06597c989aa75bf6f16af2b16ac71f83d6c323853341fc9bfdc6c82be648aeef0ede89327ea9af0a41fa872d03819c0a03f59bd9e2cbf8a310 SHA512 cfa30040ce0c583a96af75ff1ff0c049a24239759814138d9891c05ceb8d47acbd39f96c3940713c5c3353627cba49504f29296a99c1fe8efcd3b033e19b677b
+DIST yesod-auth-1.6.9.tar.gz 52717 BLAKE2B 0b84d830effe84ecf5f4a5bdbaed31eb746b7af32ba39c753e0c40cf9d4a1bb4efb4fc7b4a25620acd69853ae878ff0c0937a1cd9c68c2ce06dba4d0b90ff67f SHA512 071f5c3b01f70d4cf7f9516d97bdf352a6fc20f9191c6a46bccacf84f7e245e8076ff1881fa6e64c3929d300a0361b5ed1bf67c670544e2c2eca07b8aa3e24c0
 EBUILD yesod-auth-1.4.13.2.ebuild 2300 BLAKE2B 6676bbbeae14ea5b7a2d21880e431dd2f27f5b4366c6237b1d1f9d141c71d3bd731b69d72ed3588e6464966c262804bfecb74099086796cf3d90b13e061d7c2e SHA512 ce04edaccef40e4bfb97985f300941d75895e528a8683e40e96ee668817bc4e6f5a2adbdb2559ada5e634739719a9fa2a359818fc8ecf4b1e34e413a6968def5
 EBUILD yesod-auth-1.4.13.5.ebuild 2300 BLAKE2B 059509700625f878bb497d458bafaae1566997d28c51d8226806aaee96ac94dbb02bf698eb4d8b6fe55b2bca8fac7cbdfb521c5c71a578efd21a5d7a47833df1 SHA512 10f6ee2eddad4f2d299285f41770ef094cc5ff3debff76d8fbe9ae52b5df133407570ebd5cad94b652ce7398bb4c88f0cf9451b9060fcd00e231baf816d2caa1
 EBUILD yesod-auth-1.4.16.ebuild 2227 BLAKE2B 80eff31a4df375cd957fb6bef92809dfd8ea5635709058e2e7802e38c2c700fd2ef8c612600c23c9803678eb1748019d0ff9e3ab9955d6881f306c9dbfae7d71 SHA512 d46ff4c267f381daf16d1a44f38d31818d3c563efd4a9c046d866bcea3d0cdad0132312e6b84429dd226368e12e3d32a8ac2a1f559f21a0124ec5dede2298e36
+EBUILD yesod-auth-1.6.9.ebuild 2069 BLAKE2B ee8a54a17edaa0d6ef0475d00cca7692d530e53d8cf852daa8691fd824b75dd54223c63f9121c45c7d918753da317b0583374c6bd39dbf206afdf24c9cb8a624 SHA512 c2ee14f6a1eeae45f47bce8fbd9da72588a3bc1e4eaf59f6460a9355a76a66e81312486dbeba93a1e519f8f64308a5d3908eccb4893275f1598dc7c9c35f0f49
 MISC metadata.xml 450 BLAKE2B f749c959e95168c1131d9132708794e191622fcbb2cc61ccf837d550a36bbf6edb970f8c326a04be54ba5dd8bac7ce52724ec28510e488f9fcace4ea58741ed3 SHA512 76e8601ea8bc0bcf9afb9cb3e2ed69689bd1f969da48c0993e507d2d6fce092d18d38e1417c7d25cb46e21f36de0bc2a035cbd958493cc98cf9a6f8e205ef572
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
new file mode 100644
index 000000000000..c4fad39fdccb
--- /dev/null
+++ b/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Authentication for Yesod"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/authenticate-1.3.4:=[profile?]
+	dev-haskell/base16-bytestring:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	>=dev-haskell/http-client-0.5:=[profile?]
+	dev-haskell/http-client-tls:=[profile?]
+	>=dev-haskell/http-conduit-2.1:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
+	>=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.4:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 8731a3128b50..9c05cce61972 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -3,9 +3,11 @@ DIST yesod-core-1.4.18.1.tar.gz 85651 BLAKE2B d401ec6b53f05f0dcd6936c58fd9dea386
 DIST yesod-core-1.4.20.2.tar.gz 87502 BLAKE2B f689503fe45d202457f0f9bec290ecac360f116660ff3dde5b299d29cc301d45d8771d5a6eca0b2920d2787f962ea6b44df3a59d0e2fb059f0acd52ccb888272 SHA512 ad4be45ee06e3d29e2b936c2962a3d78abb398499f91019a9c3ab94d5a5e2ed9efe3d09c27c7fa078da4ec16e7d2d156765c73e8234b2e87a99c3cd46ad43c90
 DIST yesod-core-1.4.25.tar.gz 89777 BLAKE2B bdce9a3c821dadd5dd238f278230ea2fba2c509719bc6df8920f6461654f22f5062f03ede315bee2596e7241223270823155291e06c4854b61389e1ffe25dd17 SHA512 ede4120909247f5272064671df922c246736c62ddb3775657d10e865322926944de169a7e85c9fd4fe6011ccd45bc08003f872a55b17549058b93a889c080fd3
 DIST yesod-core-1.4.31.tar.gz 91273 BLAKE2B 036cb334ea56c0ed2af4263c073c942fcc9124259fba482bbe9d5a9d6e6707933b0e179d0b0c43bf92f0e5455a0d46fddc66bd05c092aecfe99cf2d99ca534dd SHA512 e701ab5bc56b7aaf0212443fd9057dfefd1709715cc69be0ab4c3a65764de123adf591e7600df243abda4a5232c79b73aecde1c853e0fb15311b30a4da53a574
+DIST yesod-core-1.6.17.2.tar.gz 97530 BLAKE2B 32f0a511ae1fa2250843470b0d4338938b9385287e09dfdf8dcef0316727b8fa93b6647458a18357ae39000d51e55b21ce99e7e46b1572a2977ca2d1321c0227 SHA512 6d07d84ced61800a2b6448862d40c77f3e36afe7d09722e45d276797a80698b40ff5dfc8f67092cce7a6759e4e325ae113fdcd0550524c42334bc15d439dfbf9
 EBUILD yesod-core-1.2.7.ebuild 3047 BLAKE2B 0111f7f246c36eaee8ca20925f05536914307583da2c4d5604d45672373831e683f3cd187ecc8e9eba553217dc24953c7c1f939ef16e3a31cc97dc41540cc1d0 SHA512 e85e372bedf3670b89d14510b6d279286f52a6ad361d224bd9a156d34828c7d7a91a04f3ef7d55bdcbff200d9af9892a5b50866a29cd4d579d2e78dafb6d61a2
 EBUILD yesod-core-1.4.18.1.ebuild 2866 BLAKE2B b765284aaf9850bd00d98a82ad632c3b76b9fcd3ce826a4e2cd40a8a9063961651dcb14998e3e6533e41f404724c6bd7a7666c19d5df7a9bce471ec0560a8f41 SHA512 db11031bba1e14b024d1ca32e3692c8de3a439df4469ea69a832f8aecd3eaa4cc5bc4f8e433f2391004426c034e250bd003c44a8f895fc0f315302fff9c4ab51
 EBUILD yesod-core-1.4.20.2.ebuild 2864 BLAKE2B d8f72ed4169e49a233f6245231296aee86f3f209914b128cc90647e53548bb607d49d7f3ae0e2cdd747cb0be3122e8286382d51afe134f6bdeb0cf53d24dfa63 SHA512 3a392456a71e8330035c38541b9b58df712044c1e232a8d9b9def226fe8b93c2b2d615318c13d787ff422b1c4a1b82c8db8e8f72f68b106e7baaad8b2033c647
 EBUILD yesod-core-1.4.25.ebuild 2865 BLAKE2B c50bf5f9f42476569efb2a766b0f2ba12dd2d07400bf23dfe4c627d71944b8dd898aa8e680b5e1fc8218094460e3e882e228f97ed9407ac3d8a48e8f2c23c226 SHA512 5dff4381ded442d01258de97223de809b530c69b60b16483410614195df853243d6d205dc815a2b8f9af8db62df20c8037658c07a6b4a07ba87cffd952f55f7e
 EBUILD yesod-core-1.4.31.ebuild 2867 BLAKE2B 0b3c37a38677439a4c36443eb1097e26fb11846ada10c9f9254bba8a39c7c06b4af398bab69fb261525f7322b1538b849e2c3e1a1acd5cc7ef96ac4242ed1fb1 SHA512 f6cba28681796c3284efc48d6fd736ade5d7ce76006e05ae7ad2ac0cee7fe0ff999e896c29067d29569f56a599dbaef5c563482636c885e0c2d213ebae56fa7d
+EBUILD yesod-core-1.6.17.2.ebuild 2253 BLAKE2B 4ca8b99c5b552a34fcb085b0e0b5daf06e1d70a95b43e31fc7fee9c0bb69fe6f1b873f0510b775de5f9b76ae2b4478a965da9baa034cf6e1a0987360ebe05349 SHA512 f2646d46b832ce0b2e13f35116350e45db66733b286da017134eb5c0d52b1c93f22b0add92a84673e30d57f762fdd636cd3f9110ccf984d37a9ef86037fb161c
 MISC metadata.xml 722 BLAKE2B 8f4f6d4c278f92f847046b4c85c35c78e2a114b17766bdb24e7b7f2b48a48f9b7aca69c4eac626dd27b5b3eda92b18f0cd11f2fd39db2f8c348f030ce1d5da07 SHA512 a0a229d4867993c1256e99c804f503bdb9461a11003b9f616d2f8985d700aaa6821949316faf5e18a202a05f802f34a0c42ea237a86cbbde076c6279d7be5135
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
new file mode 100644
index 000000000000..9f1561c5c41d
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # requires network
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/auto-update:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	>=dev-haskell/fast-logger-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?]
+	>=dev-haskell/wai-extra-3.0.7:=[profile?]
+	>=dev-haskell/wai-logger-0.2:=[profile?]
+	>=dev-haskell/warp-3.0.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hspec-expectations
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
index 326a9da8d57b..21776dfa1421 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1,7 +1,9 @@
 DIST yesod-form-1.4.10.tar.gz 31028 BLAKE2B 745d2b872eb79e0c5d4504e783ac5f6797b258071009e1ba9874d1297698a01800876f8b28e96a09ddc81de10c41f8710142637fb9cf19a46b8b2598f7a28086 SHA512 a8736407147c2d0158ee4c6d9805450fdc692cb307e87bac753c380f78e1c6a2b36fc482bf6fab7e64403ea82df0af95a7afbeba0f4fdd93c42b9ab75503c8c4
 DIST yesod-form-1.4.7.1.tar.gz 30581 BLAKE2B 27d7c0bbdb835838704a52dce5ab59e77df3813e234b76d3131d121734496f0fe35443f1d96f765c437b63d00618c83a5ef0aeb0ebb42380dcc07a080eeda90a SHA512 71d5eacfb959320f2120304e36ad067c480002fddc2f6f6b1d9fb0b97864ead335eb66e813ebb554a8d312859a60cbd820edaa7541745f847c18aef8130598d7
 DIST yesod-form-1.4.8.tar.gz 30739 BLAKE2B 7a9a2348e537d077225b83d5e2588eac78dc1cd27229a22d34406b4ef8b3536950c43914c4ed4c1b6167dc2e235b4688be7fd8c971257c4aa6cdc793af182647 SHA512 d413f41c820c5428ceac0815d68d7518f8a5e45104a64a92d03381f1ccfcfb7e0c99b176c4440adf463b6ed2a4cf52aaebec6deb422c27ae0e6bd143434e4838
+DIST yesod-form-1.6.7.tar.gz 33673 BLAKE2B 0675fc4bdb5e5ae9b7a7556378c14d4c8a8ff85ae055f3f8989667a6de209e8f1a318bd69148e81ba6cf121c5f0ac18fb20bcccfa6bd85d31ce164a30ba6282d SHA512 a23c2cb67ed0a87afde9e9e903aa789f8fd9c071893a1bebd0ff9dc3dec6e8e03dd08a4a7ef6ef2d438fbf62597ea0181a038bd7bb5631199c9be83d2a8aef0c
 EBUILD yesod-form-1.4.10.ebuild 1576 BLAKE2B cc583ee42703753dfb4a17da7427e7cd8fefb25707c955d602137ec00ec1e52602e1029e4c44730fad458074528427da3d1617775a9b9c81843d1a881016a864 SHA512 7f528b73289221a5573fc3c98cac956a2709e9d92b09727bd6c6cd1e95e879eb993cae0534db2cafc0f8e5b24f41b911de8ae8816aa02dd4e7df464b169a14c8
 EBUILD yesod-form-1.4.7.1.ebuild 1615 BLAKE2B 32e3af350fd135a837889b73d8fd390c9fc06a21c34f44f4f9fe427ca7469a4a52de57aaf6c2f1f224d3130fbbc2fecf3c554b6f84023c4eaec624e223cd9a49 SHA512 4f5bcc6c47a81bedd3aa305de3d8ca3daef4822e3a112810ac9720c434f6133587019d865fbbc621f285335c71af0945784432a6375d9ccd6285289689ba8cf4
 EBUILD yesod-form-1.4.8.ebuild 1574 BLAKE2B f0cfa676c4dc7167dabc5bd0c69ff5b6bec81b2f44f5e8078f0d330bdf69aa59274498d598e12d00372c263346f6eca1ffeceb46970108ea58eaa9c898a1d061 SHA512 b9947fc3737e67641b9bcc85f30dd29913315ab4ab0d75c55b8a8aeab8c89495941d4bd1e0cc049fe77d90acfa00350e45eacc3a70cbe91e54ea9778d1ebf986
+EBUILD yesod-form-1.6.7.ebuild 1511 BLAKE2B e718da6278bad47f927804264730cf9e4c8540f2c8a8760fd0fc1ccc347137641f5d96664186bee60ed22e3bd6c0bfa92c3b0bded9130c956b3a6e9c60f97e27 SHA512 6c8939b8d8678f53f1e8a435f8f7cfaee95102da0b1e6eb237a61f87e95c7e934101a425f95973f8802cce0c9a4ef7cd2c8032e4808c90f697b9b64d20907f94
 MISC metadata.xml 470 BLAKE2B 79f2aeb5212a5ba3e420617484d5ad17a57d2940ce73f630a386e694383bec296cb80eb63debe67ac96094a38426b9ee2f74b936091a61bbe4f863acbda08733 SHA512 327d7c5ee97af05acdff99cb9a4300f97ab84b915ab3f132c2bf91d5e097dd792f31b9c07153d294cf03ef69432a7aaa6cc6ff2c54600e3b26b1a222550a8264
diff --git a/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild b/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
new file mode 100644
index 000000000000..39c33a1f6d21
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-persistent/Manifest b/dev-haskell/yesod-persistent/Manifest
index 09b52db6b83b..bc263d26f3a6 100644
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@@ -1,7 +1,9 @@
 DIST yesod-persistent-1.4.0.5.tar.gz 4375 BLAKE2B 805d7a92af3183a7dbe47f836162bfc6c39c9fe65e40681cac949fe89b0a54dcbf9a41582f4f077d32570b4b5978073330c72087a62f9a3337e528aa12f96cd8 SHA512 867e252e7c511da5b4adaaebb22f53fcf657a588c43be456d8415157e49caa8e51b40fb875bf93834cf93c353c5d9f8455eff911636a13245c0725617ad52eb1
 DIST yesod-persistent-1.4.0.6.tar.gz 4401 BLAKE2B 7fe7900bee5ee3925b9a9c0d557e46a482c9fe40ac1a4669767ee52921ebf0c5d76a5b4e7957ccf9baf1938cf3955ce72ede4d822c056c86f5717d9e3eece858 SHA512 36f949ad6e2740ee3f9e3d198e4e8641b8349f41d1ebb4a958892df638a966b98cffb2579d3d08dae30baffd385aaba93364864736db973ce74174eb2062f64e
 DIST yesod-persistent-1.4.1.1.tar.gz 4893 BLAKE2B 5760256a7dcba44df192e47df3dfc0f4cd8691dd4a48def527e21c29e9111e644aef7a2be089cab44227248167c382b07b4217c8a3ba16bb470830e16c00d120 SHA512 e808d9266299d5d91c8d7766af62693791654213a1c51368e4259c9fcbd16e476d17403870d1ce5dd1c8761fa09932b4e91f713af715ca8e0de63a13f48bda04
+DIST yesod-persistent-1.6.0.4.tar.gz 5319 BLAKE2B ed8afa4ceaad8dabd62e5da4d11d7aef3f2f8c97277de6df99380be8650ca3c0481aba2f62204b8d94f9bc5769e260c1576dd9fe5608626bd6018d1e965389ca SHA512 a52d85b025397ae04641346107124a5570765356bc7209f0391646b93b3c8954219c73d717c98d108d552800eeb2122531f98abd2b0e2109aee59c7d9825f70d
 EBUILD yesod-persistent-1.4.0.5.ebuild 1112 BLAKE2B aafc1dfed2a73b56c16b4d4bdbd1c99cc7a73dc9a38b0b2fca01bb493d122f03f656aebef06c15263d57b0ade1e63076b6670f40afd037f2267b45c9263cedc2 SHA512 d9fcaaa3ed435d9f267c1e2e794396f885238c90b85d13d911535720ecd293c951c6305a2d08604503441a57a74f50172e58228edf37304a043323f0470a2b2c
 EBUILD yesod-persistent-1.4.0.6.ebuild 1112 BLAKE2B d1b553851cd8bf9dbaf7b07772d682b0c9e75e3ff1b2c2708ed9eb6b262d825cd3b1b3f8e6cb3d9ad75ccb8688390fa358b603189455c2127c065aa65783bb9b SHA512 f99ab763678fedb86ac63d3d0a8a4e87dd13acd0970ba3b61ebcb4933d5efa55a4b70dc348c5d20f6f2f111aa174c6e2121a7db9349c10b50ca74a3eadfad48c
 EBUILD yesod-persistent-1.4.1.1.ebuild 1073 BLAKE2B 39ec6381b5def8399a80310d373b4f2fa6514ca972283fec231cf41dfe9afef3e0c6d512f61ccb91a9efa64428207c0df64a05478c6b68a27b750ccc0b3a2c2d SHA512 ba26b800a439280f8c2248e9be8c4b5d34576ea9a2adead92a7b80407f310f4a1659171c235e0ee015fd87185f358f6696fc20233794e0b0423bcc7959b3b42a
+EBUILD yesod-persistent-1.6.0.4.ebuild 1077 BLAKE2B edf8b23b95f34d9cd052522fbc8074e53c3adc03877606bf6f5cdebec45d7d5e9950ebd20cde2057b79bbf26f2f193b217171583fcb4df8ec78d32bdc12bdd52 SHA512 1d9803a68c80aafeff9941fc2cf53822845c6be244087b9cb6e4ec503c554764ee70a546e18e54772211d2cd51ff7673f2234e9b39d9d2c135df4a657fdb04d4
 MISC metadata.xml 336 BLAKE2B cf7088ea5c8be53cf5697864cdc076a550bc1dcb8fb4535d79111ebeb50458857b3545913cdda201432d7674568a85b2cd0d664a0cadbc7b82253ab4461e599a SHA512 f8aa6254ff93489376ed82468a74bafaba158d2f90e0ba2dac473324d9a222ac71bb5e3ff9128f283310fb6834625b5a17dbb11c8439bd1f2168f6f9f2b9ee61
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
new file mode 100644
index 000000000000..f2c67cec55ef
--- /dev/null
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Some helpers for using Persistent from Yesod"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	>=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
+	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.9:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-0.4.5:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec
+		>=dev-haskell/persistent-sqlite-2.8
+		dev-haskell/text
+		dev-haskell/wai-extra )
+"
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index 23ce6eb9526b..9c190f100eb1 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -3,9 +3,11 @@ DIST yesod-static-1.4.0.4.tar.gz 25101 BLAKE2B dba561ed7f0dee38f29a42e95befdd2f2
 DIST yesod-static-1.5.0.3.tar.gz 25036 BLAKE2B 710018d59b605cf28097ea93b009d52e0a4ac5504a0e8b94bfccdc522496538979838c7a75ad7312d8b3b8b359df3b4434a7f4d217e1ba3bbff089d494dc4b55 SHA512 5fd0de8c034063b637ff90382fb5fb31e810eff196327becd6b217df39b9bf8612deb56ffc8996395c7a46223983333c45f14020952422260aea3629d6429122
 DIST yesod-static-1.5.0.5.tar.gz 25028 BLAKE2B 5ad12523d3e09e23a5a62eec2c7cd27a7c04cb42190429627e398fe6c4d8663cd737abb1cb0f696270e6ebd489bb3dd84bd4c8d9c8fe789b42d7696d1073a9d5 SHA512 51c522e51389843da5fb7a3d90d5b18a0e216451bd9322d55f815c393a6f2a5cd3e0f195fe924db15f18d14f1c0ecac521a6e74b975b2cdbc9c1d3a5da85e9ba
 DIST yesod-static-1.5.1.1.tar.gz 25211 BLAKE2B 4691472d183e9350182654b3cba6262143f388e50b9e0b311146b047d47ae2587ea6c663ee8b4fa1fda8110667ed031b6a613d0ed4138b2473db32d6d55fe3ae SHA512 cdca4f3d2df8324ebf26aa39eba0d9f8bef75ea4fa6eaaa25b65e3a223af2229a4ea14130b8a30a6336b8676c34f448e6adede8023e218d7d8b80703813268a0
+DIST yesod-static-1.6.0.1.tar.gz 25463 BLAKE2B 98b5a317a2d8c91d5ef9628422dd7ce8627f7f47c88722e2732aac23705f44f449ebee4bf179c2c7e429026b52920df487c257aefd75a18efe6be1717e50dd94 SHA512 2e1e4873248d435a9d58f3075b6c06cde2edcdd520f700dc7f0427039c236d28787f62a643a8cf57b74d85a885625474a5662b91a56c25e8f4d1737be525bc2f
 EBUILD yesod-static-1.2.4.ebuild 1960 BLAKE2B 9c03c73aa9d9eabb72e2917776af3052f4d84ebc9cce3764a688e4b3461b3415b5b9a7d2ec57d8b6b6a101bc7734fa0afb28c735fbc69c6d85c7aa458dbf5002 SHA512 734f7e64c80ab18ddfcfaea635449f380f6867771d29116f3ae0c029af6f56552cb8a3ee794763f279b89b5c73b729c9c656c11b5d58767787eeb19a8c70c5ec
 EBUILD yesod-static-1.4.0.4.ebuild 1888 BLAKE2B 34d345b02db8a505765e825d249dfa7bc69352633b917d7b83b8d05c382b8cb86e470eaa5bb30233ec98254cefa8fd1dae1241fc7d9e7c4870b8ad89aa5c3cdd SHA512 4b40cc5c8ac0f7eefeff7a60c19df00d726feda7418a485f002f1e3df04323263075dcdaa4d941da76274cf8e4a7f9babbad04f63a6d2c2bc47d4b494375fbb7
 EBUILD yesod-static-1.5.0.3.ebuild 1787 BLAKE2B a14256ff06ab5766f312b7d477c676f54a7aace3371d8e244f00b365ba5801f20e03861b2f7a663b3532e59e53b579ec180fd79bc886acded520277c54e16057 SHA512 c9a772d1586cfb16224ee985de48f7fed04768f3cfe93201a685ae4d6d3eb4903e1e0846900eb53f3f2ad98024915ab596c3dba346b51e5773c3fdb884b6661f
 EBUILD yesod-static-1.5.0.5.ebuild 1744 BLAKE2B c0a1e259d00017db745a878b4fdf9c41f45e150ce8096e770e0a0b13155576c6dffb25dad0aca97f7c79858929a61476b0f446eaf48ed0c62528d4e76257ea33 SHA512 4b164a649d5ae1338747dddd29f27ccaae629092eb69ea1fe9538099c85af91fafb82dc192c9e0f8323dcd35bf4e46dd8235ad443b45e0d7f88d6f60e34ab223
 EBUILD yesod-static-1.5.1.1.ebuild 1780 BLAKE2B c640896f3f127077089e40b28e8d6c13398b92a1bc1cdb6df1b34692cf1fa441c1d6874a3a2e03329c7a9956155eb63d0bfe3421ffe6341f7558eff4a7fabec0 SHA512 02dabc99c5fb1160ff60774b3eb5042924c6c50c9c6fe736cf67e469071ca39d3186d356c890b045cc62fab58c882789d0b53156eda919428f3b960826266258
+EBUILD yesod-static-1.6.0.1.ebuild 1617 BLAKE2B 7384b9b41ca133d0ccffec3c22de10e45b7950ff2fbd67ccde1d13d9f635194e767afc82ba1690320df8e0ce22ee6295eda0683783c16d3857d5798040d4594c SHA512 d621654869bf5850a777d091add913231d53df7f6a9dd6b22fd5af9f8d5449f8e7919015b04369ea0e5bf80ce55da7cfd31be7f4c88573cb80188e04ec810fe1
 MISC metadata.xml 343 BLAKE2B 866801ef740982c4e793193aee4aba1d561e999ad7a958bb46a82c807a86e0cd8f513ebfa89d00259d05247bc44635af39597224149a7eeaddc5179db8115291 SHA512 6d2282bf289e33b310f9e03c31f97003206964bef85ec09b847e530ee39537d27558ec478e301c4397f1db39d3768514f0c33d5407fd93d4d560c7543f37fd81
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
new file mode 100644
index 000000000000..4a792d364a68
--- /dev/null
+++ b/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Static file serving subsite for Yesod Web Framework"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/cryptonite-conduit-0.1:=[profile?]
+	>=dev-haskell/css-text-0.1.2:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?]
+	dev-haskell/hjsmin:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-app-static-3.1:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/wai-extra
+		>=dev-haskell/yesod-test-1.6 )
+"
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index c7a130677a81..d1318809f0d6 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -4,10 +4,12 @@ DIST yesod-test-1.5.0.1.tar.gz 17388 BLAKE2B c975819e793beeb7b551d2406b2ccd3939d
 DIST yesod-test-1.5.1.1.tar.gz 18187 BLAKE2B cfcac2eef52beb79e0ce1cdb52c1bc7929c9632496bf2ae7cbda092959225dc1e7b47e9d898b3b986e554cce95578a829f05b7b2ab119c0a72be9781220c0d71 SHA512 a93db0b6ff7ea4d41c3783c35c3df0ae5bc86ee5797a7b200745db98f3404a4a1eb921b396b1cd23269ec89f092ddc9d572058844190a223b3a3b7d8afe3efbf
 DIST yesod-test-1.5.3.tar.gz 18076 BLAKE2B c89336800790c164156fdaf3ee7b3be440c71a53a67ded18d676d077444a83549122af32bfdc2dc9b077e5c8ea19ab78ffb154560e32b7b51d155155e9ffd7fa SHA512 56454230dcc3fa96eb06a2b77e3dbeebdbc0648bad57b18817d2b07d95d43483c8e618254d449dc5cafa0efce536952a0db95c638ead5bb19bb9818dd67fbdb0
 DIST yesod-test-1.5.4.1.tar.gz 18606 BLAKE2B 0676245dd796dcb333970f43a6dd664ae0f78bcd9fab12cb3e7558d91005ef55ea1a7344c1e411c51f05fab61f892687b306289b3639fddf19cdb3dfebfd476b SHA512 8c21e832b976d1e27f0a7a001c8e54e0ad40e24619047a767c8e74902afa19c29481309ff240f18636242cd543334bcac63fc9a460950c53de406ca047b98631
+DIST yesod-test-1.6.10.tar.gz 27593 BLAKE2B ed6b5be35032246a0e233a985cc7a739a38cd4b81db42ac000c823ff0975ed642d6e4dc7e8dafb6679d6acb53c8cfb2f438f84d4e73c9ab79ecac4c7d3adb681 SHA512 badbd76b9a345c86f9dcf8b5d6043f173eec60bf6f39bdcb4a60d17d95ad693991a1c7b4061a1e86d61fb9efe3f2f29b3129e6b9ffef4b07d5b563116959b016
 EBUILD yesod-test-1.2.3.1.ebuild 1421 BLAKE2B 76a6a62380217996914b8fec52817b501b9fa22f24a2e25014185495f079e77a90741b3761d2efe8cb673f7be593ba89c8a42743b80b1c7f21f3859c5aec68b2 SHA512 296d4487a2e84e079bce2398bfb7e08f0c9d282c55a1de223c38d675fa9f39b19f755ff1c76b7f8f8b512157e0800a42de2620837b88fd3c9a1936683a260b87
 EBUILD yesod-test-1.4.3.1.ebuild 1437 BLAKE2B 730587052e4bafa5930941bf4a3d6a0d2f5a0c6124620711c158dc028e70a9d2876a9e8c484199659caced46393fd96a0dfe8e4b179ca40610bc5016178df474 SHA512 563abf8d7ddbb0c8e13d96b753d406a4bad20a39f7041bc0634b7d474065f492c9734be5f87128798ed9834c5aa5290e9382c822442175fff6d14620ca7ab9f3
 EBUILD yesod-test-1.5.0.1.ebuild 1445 BLAKE2B 22b20e2829d84ddc06cf84af658d3608b55b34e0a6ccacd5bf4349877550ae6bd78afcf280bca528181b6b7b8f09343fd2c9ebdbf346fe9b2e0797d7029f28c2 SHA512 3a6c609d1d74a8c9c168563f20e7bec02271528285561c11441858628b7c98438e6e131597ff1490831d97f0837a0f11a9a861e89651ca1720e1a5eafb89b921
 EBUILD yesod-test-1.5.1.1.ebuild 1469 BLAKE2B eb90be4e952175005b3e408af95b8992c8e6b34b6928498d99a49d68b242f498f4d26f71a51fda61ca272f60322e3dfb568fe47185c7bf75a3000f471206db6a SHA512 2de9005d82e6e36d00787c6d461603ec6bc32932ee441b149aaeab14a95541cb8c8e1a515cde5a160e7abd9a89d8be11484eda8cddfb3c125e22e822d505adb6
 EBUILD yesod-test-1.5.3.ebuild 1512 BLAKE2B 600fb020ae4a48309e7cc6b05fbc0dfd6169e2a692b8d23d5bb6f8721d8da5e61864fd0b7c57c087fe9cb153a7016513ed6d5c732950eda7e89e74c919ca13ef SHA512 6c9976dd2c2d6089bff84a439037c4a5eeb10cf0bc59dda38228b4f172b75f73bf2d5fa168c3be848a2dfbc01f15a7910b9cbd9eaa94b098bda05cf3b2cb4973
 EBUILD yesod-test-1.5.4.1.ebuild 1473 BLAKE2B 72b9a6b11086423450fc0ce36a28a59636fa286ec696b11e55d143aeb1882e74b97280f055f02551aff33cdf370e20d8753c71b87ce7d08d79d94b14d3bc3c32 SHA512 980b27ff03ee61cd1d12b030aac355ec31b6bbe86b255fb0c268f73d8760aaab1be0b6da12e4851633b3a29b79367a899ab3695d5799c88afe6b3360a2ed1e61
+EBUILD yesod-test-1.6.10.ebuild 1507 BLAKE2B 3c60e72c30dc74ae7b92f0d3d6297c92ec5d2337f96e71547ab210b5fc9566b80d078e337316e2c0c8d8bc3d51b2817ad6c8e44d9a3b33350b9c11c2ac49e10f SHA512 34f5db2fb7208d20daf748e9ff55cbb69c2144513b9495a3967e594a26f7930273af6c10975976fd7f82fd76e814f494717ff6db75df3ec4cc3d9052b4739ae0
 MISC metadata.xml 352 BLAKE2B 360c20956049bb17cc79da469b905b2bcb4fe95f1fb98babd9a002924fa0d04ddaa420eff139ada965e4532d5b9fb23829d49ea989aa4b8a689ae6e8a924b956 SHA512 8a4041f29de427e03644bd7b0939346925dbac83b7592ccdf775aaf6f57c8d48955930ed2ee30502f8c843091daaae886263a60c01b939315c6f7d797ad16105
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
new file mode 100644
index 000000000000..a6124ce4ebb5
--- /dev/null
+++ b/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="integration testing for WAI/Yesod Applications"
+HOMEPAGE="http://www.yesodweb.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+	>=dev-haskell/html-conduit-0.1:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/network-2.2:=[profile?]
+	>=dev-haskell/pretty-show-1.6:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	dev-haskell/wai-extra:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?]
+	>=dev-haskell/yesod-core-1.6.17:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/hspec
+		dev-haskell/unliftio
+		dev-haskell/unliftio-core
+		>=dev-haskell/yesod-form-1.6 )
+"
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index a20b16b0cebd..77a767df15a3 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1,5 +1,7 @@
 DIST yesod-1.4.3.tar.gz 9023 BLAKE2B ef7db3731a4f2c828dcba4cb6f5982141897de553ce096460a9514a97ba1ba2074270e25c6519c6ade14a597c50d4bfaf475f16d5308c936cab328285db416c1 SHA512 2964e290307fde99ea0b3ad27af61a5c2d4577fcf24eeb18d7ddd2d7210db8801d4d3a824ae6331e4d79a23155f9943b7b0f705c347bcec4a947fbe7c83b9278
 DIST yesod-1.4.4.tar.gz 9146 BLAKE2B b49d699ac0f5fec33b194f71dba35eb913e6d9b5b50113ccf9602c3bc14adaf7c66d8fb64ef5a1fd268c20196099204d20af75649f965deb2475c07db5279254 SHA512 ff58454e31efa47a50f04905c555a684d2a7415c726f60a206332f96ecb152eb566e285679d97cc1233baae9cc5cd42702365358ec2a55559a8b898540803f7c
+DIST yesod-1.6.0.2.tar.gz 9639 BLAKE2B 67386bd4660401fa98b1c2b2e38fa8847bf9366561ceaf37b14e75afcaee252e72d5b3993268c3f5f471baa72989f564ce4a0192e63e3ca483346ef8abf8a1a2 SHA512 8274e51e48c6cda936b1b1024634ed1235cdeca5e5478fec7f9ca1ff9c995263235d2152290e902151d1c21415140846e0c4a336546b9e1617fae677dfac2cfb
 EBUILD yesod-1.4.3.ebuild 1690 BLAKE2B df7f1a09a848b779fc3b2f11647ad6f810e933b0feca0db69e7f49034148188de6be7548c667eab8307e1734755c7a8bdd4de659e78cffb5fb996db75a50c371 SHA512 54c4267749f543ec1afea3c7dacb10b71ffc4466075eb95e112d7de314d11094bce2271e70fd6f1462b4985eeb30c140c5feaaffd37008e359ee06c633940250
 EBUILD yesod-1.4.4.ebuild 1620 BLAKE2B e31f2a4e4545aaffb1c55d0a53075b5966014510315fb7e3928e110d2881a9ffc2d1b7807d81553132829f6410bc8e1919501f346c89ddfd43687603e254a1d5 SHA512 49cd09512176f95aababffbcf151a878632e4c4d4163e827e40354092b1ffc78d48af33a7edcf23d867613a8000cf4ce45c39c575d611eb8c923c518e327b86c
+EBUILD yesod-1.6.0.2.ebuild 1365 BLAKE2B 4b74d9e7bfb99b2bceaf34a246d81829500ec46263a347977b83077833fc3da7651a1249bea8e762de2ab4549489ad993938d387713828dd523be270d982ec2d SHA512 d56d75cebd1546366d9f4d68714279d1d75899b370f0e7055961c57930a847af4b08ba293e098000547cac98573b6ffd6a9b0c2777ca26c02e338b63d614a9b4
 MISC metadata.xml 838 BLAKE2B 229a6fd86e08c1bc3599a352211185621421c313d5facb16d5801e75b665897b9e4ff1ffe61a6712e1b92ab997bb08ddadd4e2058a812c4d769d69cf50a52b57 SHA512 965f516cfca88189b5e2e6f69a7e939c3c21c308604ff7c67b63176a3cd07a4bbc920c366989b01344b2ced3d8a783ba7f6f69bc1ec20288a73635c206c25211
diff --git a/dev-haskell/yesod/yesod-1.6.0.2.ebuild b/dev-haskell/yesod/yesod-1.6.0.2.ebuild
new file mode 100644
index 000000000000..6782da85b7fb
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.6.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/fast-logger:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-extra-1.3:=[profile?]
+	dev-haskell/wai-logger:=[profile?]
+	>=dev-haskell/warp-1.3:=[profile?]
+	>=dev-haskell/yaml-0.8.17:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+"
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 8205ce6aa029..111024978f8f 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,7 +1,9 @@
 DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
 DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
 DIST zip-archive-0.3.3.tar.gz 18229 BLAKE2B ed15ccb0c80308afa246c7c7e805f01df050242af4fa881863ee07f9b52496a5ea7f41c9a9e01db5cab2734055c5d7399a0d955a35a3c3dc16fe9dd54c96c1cf SHA512 f799c5e324ea40313c312649f5c2b2e96128fc70b52f86a51fa9475354488d8c3b85220b297bc557728a1c0dd5c0827ead8b4613aef16edae7071bbf250ad25d
+DIST zip-archive-0.4.1.tar.gz 20967 BLAKE2B 0e1276aa9dabf70a36041c5acb6d83a571d067bdb40a8be30b35a2943ec28da92225d8f586101bfa87602186025fd5c61347bf8855216ce2a0101e9ff70a81b4 SHA512 216555bd73a46da5061291c2c071e9c71239bd5ae253ac06ee80ade65bb1871366cc8e4dffbad983c5b6a7f4b0cb2a1439dfa5971db3e183124fa90442a73f0c
 EBUILD zip-archive-0.1.3.4.ebuild 909 BLAKE2B 3439afe054e796d10dd06a792f700bf211eb5a190bfc685fb13706a4ed835f5b10a1009abc7b3b6105dad9692e8b9e6dc7ebe42d985789059a607d7c5d21176f SHA512 8ac66c15c5c169c87c6e5ce4d285a0d66bf334c8bedd1acdbac3cb4fa9da241a5c37f7bb067796732fd1746336ca3fe2d8994f51ed341f1dfd84f3e0e43fea56
 EBUILD zip-archive-0.2.3.7.ebuild 951 BLAKE2B 4a6420b2233adea4106a4d9796e6944bcdaa10e5a21ca4d31c6a2793ef4693245cbcac807602788edc7d1e14ecabb9b5d5b03a16564788639a11ce514dae4155 SHA512 6c36f294fae72dae94dd470667ad4bd28a031f678afa4c661619291aea29afee8c67bc21b87b889474664e6de0f214b4097b0c88dbc74e99ced873ec44a69168
 EBUILD zip-archive-0.3.3.ebuild 940 BLAKE2B 47f5b5d6c6c56c54ea96aa2e30fdb9a1d313ab56c92a28ad053050426b531bcbee97300c359787ff7e1273887d7ff7d3fe81ba8ca23f65a757cc66df72350b29 SHA512 6774a9837a1cb710288f76044f7c256574c70381c653e682d54a530197eedeeb93cc3ab3a0fbe601af236a6660bb9596aac5d362206d852c2429f252f14d69ce
+EBUILD zip-archive-0.4.1.ebuild 907 BLAKE2B 58d77e359a6ed3f82746b2bec3487a0887f2d25c856755e772f28117b51019df5d3ddbccccd2d3558c6fbda1b11fb7d56d6a7c325465b5f27b763ebc342ad5f2 SHA512 417e880d12e9cb6cb263910a8990349ae9b80dc87c19eb751200fd549fd0cc63540d1cf11694124675d4fe0b43be20205c01ea27c9a7ee0a1da93cf3bf134cbe
 MISC metadata.xml 554 BLAKE2B c174354f44b6718bb8fe11bd45e5ab1474362828356539197f38160104c2589fcfddd691d120294d65f14a1a7659c5777f018e96b1cbddb9aa952e688c3c119d SHA512 0dd9cdbf572293e8e8aef46bc393c2cdb672b09170e383bc1a18100275061369abb875d38a8d00a7da5a7babe45ea827d551e19e49053649daad9fdd4201e5cb
diff --git a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
new file mode 100644
index 000000000000..8774d5580de2
--- /dev/null
+++ b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for creating and modifying zip archives"
+HOMEPAGE="https://github.com/jgm/zip-archive"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+	test? ( dev-haskell/hunit
+		dev-haskell/temporary )
+"
+# non-haskell depend
+DEPEND="${DEPEND}
+	test? ( app-arch/zip )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e11427577f1c..709bfa1967be 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index bdd7f1833047..108d61206a86 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -4,8 +4,10 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b37
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u262b10.tar.gz 41755965 BLAKE2B b417d12ba18f58fec1e692a567bd5c0551fcbe023370fe52c2e525692d0d2151d4c296f86e6f4e3b1178e8f933ec6ddb9559e358c5d080cc2dba94ce38680ab5 SHA512 63d65c576d40b798dbbf2c6923151d07ba74312d8e8b6dc722d4358c38855a3a5c9e9e7c267569d390065c4dcc7f4bcfddc3f78e8388b4faef1a61501e2b7b8c
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
 EBUILD openjdk-jre-bin-11.0.7_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-11.0.8_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
 EBUILD openjdk-jre-bin-8.262_p10.ebuild 1935 BLAKE2B 820f2a92594f10becc0214e63bb9ab33599c80692bbd3528c64e864f4de284f108b8e7644b0061016d0501f124b887be3e037fc927fede74ab6316f74fcc9c81 SHA512 834f46981819d4c5aac9689e1437333cdd55914608a04a98a4047d144f5b9b417c8a17a4c5aff03a297073f2a3e4eaf4b639abcbed7ac87ef4d3e7c89796bed0
+EBUILD openjdk-jre-bin-8.265_p01.ebuild 1935 BLAKE2B 820f2a92594f10becc0214e63bb9ab33599c80692bbd3528c64e864f4de284f108b8e7644b0061016d0501f124b887be3e037fc927fede74ab6316f74fcc9c81 SHA512 834f46981819d4c5aac9689e1437333cdd55914608a04a98a4047d144f5b9b417c8a17a4c5aff03a297073f2a3e4eaf4b639abcbed7ac87ef4d3e7c89796bed0
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
new file mode 100644
index 000000000000..a38a136210d8
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups headless-awt nsplugin selinux webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5ccfd8e432d7..88ba34c16f70 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index a54b4638e93f..d4954ab3ab29 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -126,5 +126,5 @@ EBUILD ghc-8.6.5.ebuild 25616 BLAKE2B 2c1d3564cf1ae2589f173d0af3aa830c2fbf24228a
 EBUILD ghc-8.8.1.ebuild 26268 BLAKE2B 499c7ad9466ea8fb925d39ff5a9fe301c4957909f200a69080242a546ad2d5a723a09db6d55422c13a7ef7a8f9ffc5e1cf1e0dbbd9ae121db7137a3a2f2e5646 SHA512 17af609df49af5cdcb7edc20c4a8ec7c5ca16bd4b0c66cb3326278dfaf50bad1a1339448dbb43d81dda692510037b718343a0111a3f39071cf5fb098d787f63d
 EBUILD ghc-8.8.2.ebuild 26224 BLAKE2B 2cfc02babfb8a486c3497aef1ecc9c5698bc4624bb46a4f717ff1941733c4e6a5dd289b18f2887eb8edbaa4cf9e48e40c3298a0698e04e1340ca3e18a135bea8 SHA512 b90f763d343cf229cd7d313f6129e27b3e32265ebe6d0c3245b43668d3f6480deccea6f9c56f11714e38231ce66033d5ee75f68466a0856a7e9028ee386c7bf6
 EBUILD ghc-8.8.3.ebuild 26286 BLAKE2B d90745ca181b16b314e43483b5a106534720625dd0029b2f98846da013baacb72218aefb6aa5be9a151d3044f9e17de248746ed86d8e6aa029415e0bd1216aa7 SHA512 a03262c9f56e7e5d06d5f403f01cd6fed5fa18964718956c9e795ed7e0e20019a0426bb92af899f8b14ab652bbaec2fba5b6ff943b5645a46a56875a41a37738
-EBUILD ghc-8.8.4.ebuild 26391 BLAKE2B a60211d259b8459d1176b7f305bbdfba26f43b0d2a8a349a99a02753bac2721c5f665466f097e8d05b90b424d4509f691200acb5149832a77ef2c8ff502c2d64 SHA512 c538b5fe6c673d3c43d8d9dd6f9672616fd7737c069ce4df499569278b9673fa5cab675e30070a83e474e8f1d1bf85c1f18e126c8fe2056688dd068654d090ac
-MISC metadata.xml 878 BLAKE2B aa6aa11c4c60763eb1d29253a6b63057ce98b16dce26d46de216064809665330102cb5313258197a95dda4be91ff843fbe778090110460883f5a367fe4837afd SHA512 97c636844d70431fc41a39318d2d29bf686fab362d0f962a95039c740ef91c6642f229539f34493e7a3f300211d6550a5a976d84d0fcef6f7dfaf026bcbc62e2
+EBUILD ghc-8.8.4.ebuild 26402 BLAKE2B ee496818dd158c899589f574cbd7422307c8712b1e15012f370b2e81e157d5d5d4d11531d60ea2ff9fc23d9c4bc04c9515c117bd5f579cc62df84e0b8a2c1fbe SHA512 a8d441ff83fcaa094d0fa3fe4a6499e7864957d34e21fe4d297db8be9ce044af1a10e4b905197cba2ac4c6c93a49f45cc3d05d48c5b64bf1c60142bd0816b3cd
+MISC metadata.xml 877 BLAKE2B 763db2ffce8c241ef55110ca08aa9f7383f14bbe7f96a443b438f027214e04f56f8216b0cd0d871e516a13f07a8a5a52835b0f75ddd3eb9ebd7faccd3a6b03d9 SHA512 516ad3cdb3b26b242668ae2bbf48628c8fb95fdc84ab3dc00afc940c68c2b78a7aa85634c228e9b3427963f0b86263d24ba043d0fd9ae57752e5075392a0322c
diff --git a/dev-lang/ghc/ghc-8.8.4.ebuild b/dev-lang/ghc/ghc-8.8.4.ebuild
index cd4edbc60016..9ada4d7c1c10 100644
--- a/dev-lang/ghc/ghc-8.8.4.ebuild
+++ b/dev-lang/ghc/ghc-8.8.4.ebuild
@@ -74,7 +74,7 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
 IUSE+=" binary"
 RESTRICT="!test? ( test )"
diff --git a/dev-lang/ghc/metadata.xml b/dev-lang/ghc/metadata.xml
index 5169f69026cc..eef249cad285 100644
--- a/dev-lang/ghc/metadata.xml
+++ b/dev-lang/ghc/metadata.xml
@@ -7,10 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="binary">Install the binary version directly, rather than using it to build the source version.</flag>
-		<flag name="elfutils">Enable DWARF-based baclktraces using <pkg>dev-libs/elfutils</pkg>.</flag>
+		<flag name="elfutils">Enable DWARF-based backtraces using <pkg>dev-libs/elfutils</pkg>.</flag>
 		<flag name="ghcbootstrap">Internal: Bootstrap GHC from an existing GHC installation.</flag>
 		<flag name="ghcmakebinary">Internal: Build binary friendly for redistribution.</flag>
-		<flag name="gmp">use <pkg>dev-libs/gmp</pkg> for integer operations (works faster, but an external depend).</flag>
+		<flag name="gmp">Use <pkg>dev-libs/gmp</pkg> for integer operations (works faster, but an external depend).</flag>
 		<flag name="numa">Enable NUMA thread balancing policy using <pkg>sys-process/numactl</pkg>.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index f24fb930e25c..16872def7e7e 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,4 +1,4 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-1.2.4.tar.xz 5680128 BLAKE2B d8bb186862bf8c8e7e20dd5d1035013c6d48de777512658736ddcd49723e5789dc1e8fe6b5dc8bfbda36d204aeaeba3fdb4e10c6d7955fdc47d9fe78ce17082c SHA512 ed5dd7a744229685c9c034700eb0f7d7c51030ea344c1c371cf2731632fd3376b577a3a9731ed79d65a8fb69f3507a8a88408f2e5c46359a8bbd3b3092d991cc
-EBUILD nim-1.2.4.ebuild 2026 BLAKE2B c421e7b9d31c89822e99b11a7e56e4c78f6fd26c717af43d2009aa8e3ec06b1303ccf7f4f9ceef12661bc70de0fd8bf52e42db49baad5a8acdc7fbf370ed9a1d SHA512 4f69ee0ae3526ccbea8ef8cbf8665679ce3bdcb5b7c6e960228150c05df1dd3bec03daa7d88a4b8baffc10aa976bee8477887a8ab5a08acba8f956d444a6fceb
+DIST nim-1.2.6.tar.xz 5688752 BLAKE2B 8865df1c508b9c21a2808c0eed8c6cd294f57829e8b75a3c3b70964b45ae7a29ae1670763447ba4f7135ce8ef55e696db1a5cd0a9d563d2174c7212c41d9d268 SHA512 ef59bbb0d4b05bd13624ea7da7182f1d73ffb31c7b34f5928b7e0411809fd70d1898fba9bb02441dc9ce802cd8accaf59448aef5b457e64de73c2ffbbcd53fbc
+EBUILD nim-1.2.6.ebuild 2026 BLAKE2B c421e7b9d31c89822e99b11a7e56e4c78f6fd26c717af43d2009aa8e3ec06b1303ccf7f4f9ceef12661bc70de0fd8bf52e42db49baad5a8acdc7fbf370ed9a1d SHA512 4f69ee0ae3526ccbea8ef8cbf8665679ce3bdcb5b7c6e960228150c05df1dd3bec03daa7d88a4b8baffc10aa976bee8477887a8ab5a08acba8f956d444a6fceb
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/nim-1.2.4.ebuild b/dev-lang/nim/nim-1.2.6.ebuild
similarity index 100%
rename from dev-lang/nim/nim-1.2.4.ebuild
rename to dev-lang/nim/nim-1.2.6.ebuild
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 50effc94c972..8cf9399b13cc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,28 +1,16 @@
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
-DIST Python-3.6.10.tar.xz 17212220 BLAKE2B 822e231cf2755e6477e49e9128a983185a4f1e30e9d6c221f1b5720891c0de345e8c5402af458d3627eba124e75fea4b5daa94e01b0eaddc116dc3281263ecbe SHA512 26147099e1f1a0ffc85febad26e18e991f019599a150887ea0b925e34663fad8e03b3c2a941e2770c1a63960695e173ef32709572c9361e7f2cb862ccf75b28a
 DIST Python-3.6.11.tar.xz 17213036 BLAKE2B 4dae9d9c5eb7e97a8990b0b5739d40ba8a85081c7e03adc22a3305e713d39b3a98ff66c17b395b9d45355e124307eed87803211378d14360e8b3455f7146a1ba SHA512 c76969a6602e095641ba5fd0999a47cf0187eb26559ba9a6e80fe401b8928f6cd9eabd963f615f7c667e48f56603f2508d2b5692c83ea8da1e21292131fb11d6
-DIST Python-3.7.7.tar.xz 17268888 BLAKE2B 5f16c9559249470a9e6c0aa686965e7d78ce0f7364b5d03fc9590613c7a5456f92835340e49bf9becbec18b18d1e5a6fc318b6e30f2349da3246a918cf8b05ff SHA512 ddc838a7b0c442c2e465616f20231f2b703ed6b69ed2dc17858aac8760814fdf7cff43d350d359300e47b6bb1f0bd38c31126b855e423a3a65ed06a8fa16d136
 DIST Python-3.7.8.tar.xz 17399552 BLAKE2B 4bf6c47b1132b6d31a79232002c4d38e2cd123ac05d52b21d6bfba5a4e19ec9130b8df8698d5ce6627e4297c4cf756643f036e694e36364c235306c72ef34bf8 SHA512 d2ba299e3cf8ed0f8fed9317f42bcd8d9af7e0e6175939b4be1be289c1658418bed17899e2608d762ffb15575021956cf6bf2054d7863c04b3bd7642f5b8c7ea
-DIST Python-3.8.2.tar.xz 17869888 BLAKE2B f42b35bea5e65f1f0a3fa6f1fd3d749fba3fa46d958608a314c1a98d0e3ca890e856da4d40ee489fe546fc02ce0fc9fa2daaaba96a8928d92ae7eb3d2dda3fe4 SHA512 ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37
-DIST Python-3.8.3.tar.xz 17912964 BLAKE2B 9c415823f70bad97936e0472fc53a1b7650cbf0082da714266095dec74e0cd4a48c9477ad03fbb75fdc2cd8e41ef3aa5839e38fc69751720f5cb5c7fc77cce17 SHA512 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4
 DIST Python-3.8.4.tar.xz 18020412 BLAKE2B cfcfb293c413b25fc3ca48116cf8ffaba7bee18e9af9accf26be9b4373a0c62dd8e9da70e5a8a38ba6da4d1afbdbd589ae5ea4b618b65130ae061698b445908c SHA512 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb
 DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
 DIST Python-3.9.0b3.tar.xz 18518204 BLAKE2B fa1707f0d55a83e739e9ad51979f8aff9720588a8a77b7ce8beb9ecf599955677758dec1551a0549b010f86c1f8fbc5915cef34d63097534d1c512c92fad5bd1 SHA512 c06a6b874fbce93ec37402034158a7bab44cab775d6da467eaddc1eb402663415f9d788e657a204f17dffe5fa6f379379f9215b5198ec5071565486b6f0e4a2a
 DIST Python-3.9.0b4.tar.xz 18602256 BLAKE2B 9f260f2b3c6380745c343d2883db430dda1b76b120050df16e53c1021e5a746c7e4a6aa8e83c746c3705c6872e83369a649c48ffdaef972a7049c44f7bc3030b SHA512 1c9bac850159352effb163b41590b3e9c05100b449798b5615f7a51a59a3877fe9558d593bb47c24915226637e3394e7864a1b1555cd6c5b5e5e308972208ecf
 DIST Python-3.9.0b5.tar.xz 18588472 BLAKE2B 4f430c06bce30a5e554f0aa23e56f5eac74d13be4fe88c91c125a7b2df2a390c78942e02c387ed84f369d9c08d4e0960909faaa80f69cd02b6304ede688dd926 SHA512 fd99fe9b3364811512857bcc7963b59b1cf724cbd2174292ba9b16748f1b97949a7d6c5016fb7f4568c366cf9b9fd14d25400773c5240fc31f11086d14e8d3aa
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
-DIST python-gentoo-patches-2.7.18.tar.xz 15012 BLAKE2B f691e231c793bb8f11fb64c89b90e022af8e0fe0e28839822c2ae6214fdab6c6fd9c07466c4b5797d3964b7db09fd979597774fb7872dc674e8df59321b6bf95 SHA512 a2952b27bfc0a52f322b2f3e177cbe09fa288c9ca5967c13fb9c2d45d3e81033407e30e86bdaaaa258f0b3cfa2cef6eda5502bddb6390f9512a493d145d34e03
-DIST python-gentoo-patches-3.6.10-r1.tar.xz 15556 BLAKE2B 3d4755a083172fc878d3454797a4a7fa809c7767b7f2ba0919b95076b8ecba62ac604a7db349d8dd71f83aa44d4580d0c433ae6cd2027078e7779cec79185ba2 SHA512 b361ff3fe9545bb59a7e85f179a094d58219be35d20cef83db02672d0a9a58fccfda62fbe8c2bf64250c4043b8517cbc2091380611c5f1e63bfac9ca7c4e47b0
-DIST python-gentoo-patches-3.6.11-r2.tar.xz 12448 BLAKE2B 44f89d4c70e241d37f7941f80393ca6395ff4050b06e1f40a34c82541cbb1f62121c3d0049c1f815829dde998b7f12eaf46bae686e0c5a3482bc07b4f925374e SHA512 7e343a1cf4dc70f328d854b56f48a920fdb52c999cce6cffed4b6828bec00d67c8fca463be2e81c0bcc24fa23721586e547bae4e82b573962f8e4da6a84da6b1
 DIST python-gentoo-patches-3.6.11-r3.tar.xz 14064 BLAKE2B 416780c15ee12cfc06bfd1397d510dd42fea61abcaafd9cf54f27d843342debf0caa93c9700686feb14f04239ad4ea8f20ce8736029638abe7d7b9c57b9d659d SHA512 de6a4a5bec89e6149b85b383991c99bd9460a8f59f52a700d54edd0154557727ccc79daaa90336dff434b222657c3f28dda1228d2d474002d0a28f31c9ed0b10
-DIST python-gentoo-patches-3.7.7.tar.xz 14644 BLAKE2B 1a377eac945310082ec9fa257bcb406c7eaf24b5e80469dd49e82a1bc0554b75394678609cae447cb0fc7a19059b29166bf110b6ed99a89a9919b3a56a323f87 SHA512 2c7fbcefd6f4d1674b78f3b67f2be3f1b168e08c318fefe8d4757f2d30c22477f5010ad6f2c0abb265d819ee667617f21f93e002242e216b4ee570200b0ddf74
-DIST python-gentoo-patches-3.7.8-r2.tar.xz 11608 BLAKE2B 6b012f22afd9060dada34566745423cc6d6d000821074e7cddb11c8a11c16bb71704b7d213d43f34f4f17e28d72c15a2e7523e3bcd0065216a63521e467b58b9 SHA512 d72acd627794e5045a84da8e7651b1825900a322aab2d1c4fef3cf02e429ced1d83664a74072cc2133bd1044b2d30b5e0974cf22ca908ff6746e276a9fd6619c
 DIST python-gentoo-patches-3.7.8-r3.tar.xz 13232 BLAKE2B 9df47b1f61d08f62a80221bc48d73ec27cd74a9ade8219912c5b02eaea919b70d91b1154837cd03c0129a5839186e9c970167ca3398129c044c25c7853f1f920 SHA512 e1477d425cb6125ca2286d816f4aa4e9e3c789d6a4f4907bd7b78549598356cae5766f642e2cad9e7c3abe2e82c12cf3cb7db3513be68aa213cb64cc0abc678a
-DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
-DIST python-gentoo-patches-3.8.3-r1.tar.xz 12492 BLAKE2B c580918faba7b13137f108bee28d8425a69501d1f06e114eaf259512d6e9ceb19e6a6355ffbf860210578d2696ecf8f252b411d385dbf3f08ceb7f1bfee589ce SHA512 5e09d61c6d6bd41f5652b39dc502be50b8f85fa9731b4e07af0dbde79101148f6216a8ad56c06047a9b19c4e190ab8316c57654ee03e4773d2b93f55629e4ede
-DIST python-gentoo-patches-3.8.4-r1.tar.xz 10956 BLAKE2B 37cfa00ea888c669cde97ff4adb435f341fb00b14736d807eb72d13296f8a665c33027ce51b64182e553038c88e96d35336949ced21fb80f6ab47c68ef842781 SHA512 dd4e7a8354aa9f5f512c2c4f7227eb3aa60ee67f92017db851fc893ec1914c50ab517457d56ffc14fcabf82231803b4ea188858225e2960d7eda5ec15f7d5e3d
 DIST python-gentoo-patches-3.8.4-r2.tar.xz 12660 BLAKE2B 3197edc6beb2b1be05399f268ff9b337ed67f699e3867160fea8e50f763a62b184ddd7adcdfa55dafc8c14f91e020b409461027361d04858db667992794b1168 SHA512 c56adbec04bfb950f7fb65f38cc0b78eaae9783800c755b7ac934b07725fcf4d69bbc2c29f7d1255acd6e88559a216dc8a6088042a479aa0d453b706e318c0cf
 DIST python-gentoo-patches-3.8.5.tar.xz 11280 BLAKE2B 163c577da75f4ec0ebe86b5a08bea96d5ae406020bd211439b1405c0f8a5dddc9422a9ea5b16eed195433cbec010d9def3126a578d3f9716325482216b9e4d62 SHA512 6b7f72b8deb87fb7a169e97391185823984b5e9c99ec5232504c670843fbe0ca76afe32fc3fbe1f850ec6c42e9325cf4697022f36f7b00a4028b324069dd4d5b
 DIST python-gentoo-patches-3.9.0b3-r1.tar.xz 8860 BLAKE2B 87636ad5f1e2e92b2b12f46384d89b2f478861b320687edd257b4a157afb86a5a9d2bf55e7b51e1e612013e974689c64082012243c5c27afe65f5cb3bb03d562 SHA512 266f0925c1b62bfa38fd05f1fc4bc953d87ae44f0cb54ac415e374ef508e88b5cd07f52dba470f418fa7db74f9c06975778a95e21a50110859f88695a65265cb
@@ -30,17 +18,9 @@ DIST python-gentoo-patches-3.9.0b3.tar.xz 8592 BLAKE2B 261dc9a5c7b370eb3f693f5bf
 DIST python-gentoo-patches-3.9.0b4.tar.xz 10640 BLAKE2B af433fee46ff3eca0ef23cea2ed838cb5a4337a646f3b9a662f7ecf2e75d5fef81437daf88c920b6459160d328b3fa976f7611d1a34084b67e93fc72340fd070 SHA512 dc7cc77fc72c701d09a85dec2a2172ae71223e7a55455f689967d3246bb6e2815c9e4f45493545c03bc949d54a1e9ff354de88c785bc6c215b736862a21dea19
 DIST python-gentoo-patches-3.9.0b5.tar.xz 9180 BLAKE2B 49ce1f4dc4647829037a288677e99f27dfefa23ef4a2930d19e79614e7dbe6bd5c8074f73b452c1092fd3ae9d0ed573a8a3549f0ebd0c95b7fa0cac127ddedac SHA512 7d99090ea08165640915c4299ec9a1d985c6f896b11059063889faa7fb6cfe2ff3aefee5718470e4bb09fbdbc9f4867c9b189ac99596d4637e5aea63a493575b
 EBUILD python-2.7.18-r1.ebuild 10596 BLAKE2B 2aa1a8152a9fd960de4dbc37e3b959d412855e3901c946783b908feeaf25af6333a5d375a26eef50436b8c5167019c7c7b5e0610787850f73b57ee6a4814fe65 SHA512 cdc9dafd0fadd459a4a8d22c5dc7b89fc125ca13ee3ca45166416acc26628b7f97478b4efd9e976177e209b1e2fa592a5034c79f343096053f4ddd790424f0d7
-EBUILD python-2.7.18.ebuild 10593 BLAKE2B 8e0f4c58a44ffe10533a7e534bb28a642e258468a4d546a77e39075d1c8ff63d2b3e9d99858eb1d93f84b40101f9cdc2b1db0e45ab6755167da486e5f9468e59 SHA512 5f880a3e0a47efb13d0f9f7f9e7ad01f78c46d772d9de999c3bb67b68adca05a1e01dc2fff8b21b8daaba9e0b9cdb44642c35e04a98217b04d5e2ee3fda2719e
-EBUILD python-3.6.10-r2.ebuild 10333 BLAKE2B 550cfb681267f867d7454097faabf278517f6dbd93b64b879d08251ca5d018456baa4097c632be29885ed6f89de82482c282b15f9777cfc21ec5b342a25e6836 SHA512 568baa3112199ef0d3beab20ab37fa7e7c54e25b91285b86f27665a987f3303258ff78fe2682b67c22cabdd3db0724387a9d85f6284b1c059ec709c113194e1f
-EBUILD python-3.6.11-r1.ebuild 10333 BLAKE2B 771cfacfc3454636d1a20fcdab8a138e73c37d41cfe71b3b2a4744a843563771881e134794f7307b935317918038dda7657556a60432666e963b70535725ab5b SHA512 7ed47bfec9bc03e3071c66a04c95eeb0e9da2f2a10cc61db16d4f7588aeeec50e105adb60dbdc361c7cf90ebc45de6046320604f7a1f491c00a8854dcf53320c
 EBUILD python-3.6.11-r2.ebuild 10333 BLAKE2B 15d051044b00f3aa2821c8f1309e587f68fd0d120d3eeb058080c5e0516bb76f1ea1adc769604420a3d0e39b3fa2f20720a8e72d468cee572013644588e62094 SHA512 c7c400bbf575eac9766e9282c62a67795db77750e957c6b6400ab6d5462355a996e2d461298b8875855133cacd814c8213eeda31affa4f106d92f64da82f17d2
-EBUILD python-3.7.7-r2.ebuild 9877 BLAKE2B 182391402d72a38090801f4ea95ddcc26385bfb6174d7fffe6d0acb45fc735ca62d561ba64b324f2e6d64761f51ec18dfc1c4f04abe131138ebe8985b927fd2d SHA512 39fed5b175cf581371ae4150c539e4a2d1a3d5f7f247d92147c49fd8cd7eb231688d7507b1efb10194683834b37697c5f4e6721bffd592ca8698355fe9670a58
-EBUILD python-3.7.8-r1.ebuild 9881 BLAKE2B 40a19e8742ab5f6189cdaebba62da34ff347b54490bb91aa2054853cc52256761b32bb7b448950eae81e5ad2b2e01034192b4a917b2242e5fb1290c16d9bc066 SHA512 ae7d765a8b965d934dfed2dbffe1d56487f633100d6972bcf7e0b4bc9720664f2e6cede733e23748fdf94621e321c1f5033930a62db44e6ffd14f3b55332b641
 EBUILD python-3.7.8-r2.ebuild 9880 BLAKE2B 42a924f55eeec7a1856d94a3d4ef4aa6a64d788580fc76edca24f8ba369bfbd883608ef8fa184d9e846890bbfbb6e079bd43be936b2dbcf30fc8550e67162254 SHA512 f08f4c65ae71fe217eb791c885724fecd94146424fea68df3d37f5034cf3bba3730fa27b2a94a14b6744326b4b5f11afb48b4268be690a502999f0b87808c63b
-EBUILD python-3.8.2-r2.ebuild 9928 BLAKE2B e131852b497fd24ecf3768cfaff2188e499a0ca0700443a146b26a0b2e38c1c83a0438455f22afa45f7eaeb96e744bdce9a1530ad831fe929ed561f3f0cc84a5 SHA512 b43d77bf74b18d4d758df5b6399cc38e5edfd52d1652f5b5c0d6083f22ebd5f880e4e5a12244895300aebd284863e77d0318c053b0e87e7e6572e88ec6b5c15b
-EBUILD python-3.8.3-r1.ebuild 9928 BLAKE2B c84d35d83f6fb59930140b3e21c594af21286c5ad63fef81db5e19d18c8627dc08490891508412c8ed4e46c41b479811d2aa3baa3007a5a66b99f87052f23e77 SHA512 a59b1b979130cf394ad216815c8899a4756527a0a4f5b18bbb3f53f6ff30ad3718c30e761fd833afe7be6608d47f772c0f84d8dd308e9d58d96f795479382c4d
 EBUILD python-3.8.4-r1.ebuild 9928 BLAKE2B 9ebf074bef412756a79b6a9995f8eebdb92239e0558101b873e5d81a3ce74ef8bdcd0fcfb12f93a5d684d919b840912f91213351ef2db4e634feb00e3071ca81 SHA512 c3f9125df55adada570e75a521017e503e095335f98ef899b9d932ac731af8e21487e0710a70572c2766193ed02cc1e32f2350b457add36519762607c131a629
-EBUILD python-3.8.4.ebuild 9937 BLAKE2B a16018acc8270224ebc33c2b5b0f23a569557cf7080d866bfb259f38bd80e0cccddf4a4fa68ea518ec704387229f87625f2f618ab7894c0cba50fd26a51597ef SHA512 02ce06f3ab7d4c5d09eaf4aee0a1868bd96d06ef8cb7df639926f1d2399d8aa1a8c14d14da620c0d380764e220c6184f6afa3bca60e7408901d55472368caca2
 EBUILD python-3.8.5.ebuild 9934 BLAKE2B bb16544a7004ec6ef20e2c6bd16a080bad5442cb7f3bbef78c86b6a56ab1fc6299dd92e8fbb20ce3d36d63566543a832244744367ab174a1e959fc83243a493e SHA512 20c985cb2d97ad811851b4bca3306fe7eea2271a930a454de2244fb015c1dbfa2e001634149744125bdc2f3ad668836bea437497a09f2931c3403c8eb69d4350
 EBUILD python-3.9.0_beta3.ebuild 9219 BLAKE2B 7901178a271e7e6bcb8cdc8d7dfa39475fe1f77c298d6222e0aa1a9dc32f999b49691c14102ebb755bf9fef85717fefe1a10b5bf6d2988f8783b6944cb56c989 SHA512 7d05c62b192e2df79c0ed74ca13054f45ddd9c0f2fa77aea0c0ad805cf70274678f8282a6fe7d7f890cae52a07971497c471510e1f1fb1555ee7177b93ccdefe
 EBUILD python-3.9.0_beta4-r1.ebuild 9219 BLAKE2B 74fd4e011dcab66d915e7c1d378a1d158017e4aee1837fc08458a0235f0e21886ecfbc8caae7cf8acbcdffec297b466adf52078a8681d295ec8f2e4472e0c800 SHA512 30bc69d478af510e9279deb8b5bf5af4329babe85920fc35166d4852a6882e46485e0e3669416affcf9c00d273e6eb1f54c31b33096a8eab9cf126dd4ea570e4
diff --git a/dev-lang/python/python-2.7.18.ebuild b/dev-lang/python/python-2.7.18.ebuild
deleted file mode 100644
index bd043f3e2c6a..000000000000
--- a/dev-lang/python/python-2.7.18.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-2.7.18"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	dev-libs/libffi:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	berkdb? ( || (
-		sys-libs/db:5.3
-		sys-libs/db:5.1
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-		sys-libs/db:4.6
-		sys-libs/db:4.5
-		sys-libs/db:4.4
-		sys-libs/db:4.3
-		sys-libs/db:4.2
-	) )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-pkg_setup() {
-	if use berkdb; then
-		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
-		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
-		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
-		ewarn "is provided by dev-python/bsddb3."
-	else
-		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
-			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
-			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
-			ewarn "You might need to migrate your databases."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	use berkdb    || use gdbm || disable+=" dbm"
-	use berkdb    || disable+=" _bsddb"
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		# Force some tests that try to poke fs paths.
-		export ac_cv_file__dev_ptc=no
-		export ac_cv_file__dev_ptmx=yes
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-	# The configure script fails to use pkg-config correctly.
-	# http://bugs.python.org/issue15506
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
-	local myeconfargs=(
-		# The check is broken on clang, and gives false positive:
-		# https://bugs.gentoo.org/596798
-		# (upstream dropped this flag in 3.2a4 anyway)
-		ac_cv_opt_olimit_ok=no
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2")
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--with-system-expat
-		--with-system-ffi
-		--without-ensurepip
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
-
-	emake
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="distutils gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	# Daylight saving time problem
-	# https://bugs.python.org/issue22067
-	# https://bugs.gentoo.org/610628
-	local -x TZ=UTC
-
-	# Rerun failed tests in verbose mode (regrtest -w).
-	emake test EXTRATESTOPTS="-w" < /dev/tty
-	local result="$?"
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
-
-	# Fix collisions between different slots of Python.
-	mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
-	mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
-	mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
-	rm "${ED}/usr/bin/smtpd.py" || die
-
-	use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
-	use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/python${PYVER}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	ln -s "../../../bin/python${PYVER}-config" \
-		"${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.6.10-r2.ebuild b/dev-lang/python/python-3.6.10-r2.ebuild
deleted file mode 100644
index 24b9bc8e4b6e..000000000000
--- a/dev-lang/python/python-3.6.10-r2.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.6.10-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		configure.ac \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.6.11-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
deleted file mode 100644
index feafe7f13498..000000000000
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.6.11-r2"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		configure.ac \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--with-fpectl
-		--enable-shared
-		$(use_enable ipv6)
-		$(use_with threads)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-
-	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use threads || rm -r "${libdir}/multiprocessing" || die
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.7.7-r2.ebuild b/dev-lang/python/python-3.7.7-r2.ebuild
deleted file mode 100644
index ce301b612b1c..000000000000
--- a/dev-lang/python/python-3.7.7-r2.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.7.7"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.7.8-r1.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
deleted file mode 100644
index 9b46d558cc30..000000000000
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.7.8-r2"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" \
-		"${scriptdir}/pyvenv" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.2-r2.ebuild b/dev-lang/python/python-3.8.2-r2.ebuild
deleted file mode 100644
index 543abfef801c..000000000000
--- a/dev-lang/python/python-3.8.2-r2.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.2-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.3-r1.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
deleted file mode 100644
index 098eca65eff9..000000000000
--- a/dev-lang/python/python-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.3-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.4.ebuild b/dev-lang/python/python-3.8.4.ebuild
deleted file mode 100644
index 249da8c99264..000000000000
--- a/dev-lang/python/python-3.8.4.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.4-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-	virtual/pkgconfig
-	!sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat || die
-	rm -fr Modules/_ctypes/libffi* || die
-	rm -fr Modules/zlib || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
-	# Needed on FreeBSD unless Python 3.2 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		$(use_enable ipv6)
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-	)
-
-	OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# Skip failing tests.
-	local skipped_tests="gdb"
-
-	for test in ${skipped_tests}; do
-		mv "${S}"/Lib/test/test_${test}.py "${T}"
-	done
-
-	# bug 660358
-	local -x COLUMNS=80
-
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local result=$?
-
-	for test in ${skipped_tests}; do
-		mv "${T}/test_${test}.py" "${S}"/Lib/test
-	done
-
-	elog "The following tests have been skipped:"
-	for test in ${skipped_tests}; do
-		elog "test_${test}.py"
-	done
-
-	elog "If you would like to run them, you may:"
-	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
-	elog "and run the tests separately."
-
-	if [[ ${result} -ne 0 ]]; then
-		die "emake test failed"
-	fi
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	sed \
-		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
-		-e "s/\(PY_LDFLAGS=\).*/\1/" \
-		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
-	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
-		emake --no-print-directory -s -f - 2>/dev/null)
-	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	local -x EPYTHON=python${PYVER}
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local -x PYTHON=./python
-		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
-	else
-		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
-	fi
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" \
-		"${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" \
-		"${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" \
-		"${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" \
-		"${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" \
-			"${scriptdir}/idle" || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
-		python_updater_warning="1"
-	fi
-}
-
-eselect_python_update() {
-	if [[ -z "$(eselect python show)" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
-		eselect python update
-	fi
-
-	if [[ -z "$(eselect python show --python${PV%%.*})" || \
-			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
-	then
-		eselect python update --python${PV%%.*}
-	fi
-}
-
-pkg_postinst() {
-	eselect_python_update
-
-	if [[ "${python_updater_warning}" == "1" ]]; then
-		ewarn "You have just upgraded from an older version of Python."
-		ewarn
-		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
-	fi
-}
-
-pkg_postrm() {
-	eselect_python_update
-}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 31833695909c..17b0e4139b64 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -7,16 +7,20 @@ DIST vala-0.40.23.tar.xz 3462092 BLAKE2B 49eb5f7205d59b0806e807fc0f99771ace4d188
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
 DIST vala-0.46.11.tar.xz 3424380 BLAKE2B b4af8b8345ac14793ba4b67dd2785408aac7c59ee4ea491c6e83c645d25b0cd7b795cdc35edd7f94a7c36eb40acbea7a8d7e08b41370f386f231733a3185e188 SHA512 c2b61f88deb787622680e49078d4caaaf210c19818607ec5b0ccd4564c5127657eeeba24b98c48e78c093456170b7f8aeea232125d702c1d7e624b6af854cec9
+DIST vala-0.46.12.tar.xz 3430948 BLAKE2B ab04291fd1b46053aa3177504ddd954bbc655bfcdb869ffad21b5cbe60cadc2e96dcbe065eb14cfc668c5bc345d1b0509274ecc0b4abfce7b28b89c27b4221c0 SHA512 13a56583743e249724bb0b642e9f22576a16c195b8f61a5dd19d581071217fa73cd73d5db0b44552fe5a5de9710136dd9f0153d3f71377cc5239250a21178af6
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
+DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99
 EBUILD vala-0.36.20.ebuild 801 BLAKE2B 28a0b45feb749184a38652c09c10e4e10fa89e13ae613394fc89395244249783d5d66e63b9a808a3d2b6d0585f6f03c70d418874ab103032502df7830e64ef0f SHA512 fb5d44393b0ecb62098873f25f16ee9f9f2b268faa5524268923ba88258ada9b6e9d74f3ab4d0d9c11d1972d869ae1e97bae848f4005ebbe29069219a4078d47
 EBUILD vala-0.40.20.ebuild 1188 BLAKE2B 9754e3990f8b9d97a9db2d475a8338dbad1ac0daa74118a4966d08709bbb8d713817ae4a163bdc79ef2ce26aad00e633418734a2333a4e2c72b8a10b6a53d814 SHA512 d55a8a950eda084f4d527d090fa768436808922b4adafbd756cdaed73fb7214d9a1f74c77fc1c0d232e3dc6bd7548ded04ff3fbe566c609c7c2677404e757636
 EBUILD vala-0.40.23.ebuild 1191 BLAKE2B a82cacb22c6078bfe503634ce4b590600f8a4ca578a5e29dbfda07f5593a72145fb29f0085a357a18216597007e4bafe517a3d60e225db8e26a39efecd31ea81 SHA512 4175518ade299eb51423a7ccfd6011d3ee34b5b3e589059f8503ad0d2a7bb9d86cd6d97ea48ef5c8b3f78c94ea25d558a60d55bc6276cd384ac2ddf0b4563148
 EBUILD vala-0.44.11.ebuild 1110 BLAKE2B caa359b186daa04e09b9f3c2185280dfedabd8428ad060304e78cad7fe106ec00c1ec023dcd2f0a7f4239ab5be705413667cfa9683fc30ac88ee2b0b1389e588 SHA512 e14b37221c39f2b50c788c31c28b929251db44e944bae83cb81907c2d304e4b6a9838c7173fc5c74f2ffdecc89d8d0f1ee3cb8d6ffea023491e8f7f92e25c79f
 EBUILD vala-0.46.10.ebuild 1306 BLAKE2B c808af10340e1c711aa13fcfb1bfbfa0c2e7ef1883c476ae983b2b1a11c4485c4f67a2859dabfb04c02573777a931efb4be90fbc7a1a3992d9b2af2bdc25120a SHA512 761838034394585e4b36bf5ff07590b119dc98af38870357ec93078edf3d1ce9ea7b2098bae6f8da933b6e128cd5e4a18681c372ca98c2cdb1f27c6622972fa9
 EBUILD vala-0.46.11.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
+EBUILD vala-0.46.12.ebuild 1312 BLAKE2B 4419e7f83b6eff1279058671fbe8ff62e2d1cf562a07f10d22d09e41c5dccf2b3a4b9694c7be6ce2c671efbb258d0e5caa66c5ce5b30edbc04ae534acc4d27b7 SHA512 3edde48c1cef97c1ef17b3c4587bf26763f14ca300017acb178e32fdf40b7dd25ba462b93b870859ec584e3a1ae1bbf935570c0f783df5871194d8ca033c5ae2
 EBUILD vala-0.46.7.ebuild 1303 BLAKE2B 9eab2887ca949595c7673fb81cd9066bacdcec0a3a3608924ae7d42ce38f8c60609a7ea641d48e379ed882908743d4dd3b62401ec1f97ba12992b5a8ff755efa SHA512 a7d042b51962a8e9d921d2dd04bc4dc6a3e6db4061c894aad3eb60bd142c655f1982f3277224ed85107ee1b20f8d407c2c2f836885f446c9392203cb08b103de
 EBUILD vala-0.48.6.ebuild 1306 BLAKE2B 7317fc4a69f4a18cdc05c7f8aff2b6f88db9a2d31f94f0166f98f2befe23e386e230b771c3d7f9437ec8bc531e1810ff8f8e791cdc4130507af924e70877faad SHA512 8de37289f6e80d0186ab7cfabce004ab62701f3dc146a433219520a32cd2159ae58066915d1701c84e083a550e57593dd6b8da6acf4532c0d90a9b1dbde8b595
 EBUILD vala-0.48.7.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
+EBUILD vala-0.48.8.ebuild 1312 BLAKE2B 2a5c969f40a6f1ec8869e5de0e41e16ee78db748069bc0016e9b5b5ecb1dbc2be307995939134fe36a37b94e4a89284478d4704c04f32db9ae9c0a2786b875b8 SHA512 7354b9ffa72a263f0035b6803d6ab4071c7870cc90a1c9a57355ca637392420e78be6d5bedb866f327a522c0f852f1c78ea798ba66c62f8b5753fac9ec21a969
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.46.12.ebuild b/dev-lang/vala/vala-0.46.12.ebuild
new file mode 100644
index 000000000000..afe20bbc8ab5
--- /dev/null
+++ b/dev-lang/vala/vala-0.46.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+	!<net-libs/libsoup-2.66.2[vala]
+" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
+# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.48.8.ebuild b/dev-lang/vala/vala-0.48.8.ebuild
new file mode 100644
index 000000000000..1f7c05bd15c1
--- /dev/null
+++ b/dev-lang/vala/vala-0.48.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+	!<net-libs/libsoup-2.66.2[vala]
+" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
+# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b8863090c9c3..46baaa5ffa6b 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 807664276141..5e04507ad82c 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,9 +6,10 @@ AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 10
 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
 AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2
 AUX boost-1.73-boost-python-cleanup.patch 3414 BLAKE2B 5167f69bbaf47be548a522638ac4a2dc9bc355d5f237738f9775b2e25a5050b6faacc5f1ce60a484f1664159ca9ba8937db3d9f8e4f0fd76117ff7f61c65cd37 SHA512 b5406e6a31a7feec590f2ee0195fc96e8830b51c270c74162d01b86b748bc11fd353ae97179e0096502b6d7dae69cdc0a478f513e2d7622455bf23a9b0da390b
+AUX boost-1.73-geometry-private-inheritance.patch 913 BLAKE2B 390a9e20a1f86f68f05b61478da3df9043de27f4f111d08789b017b16a4dc6026e5b16658742644fedc5d19cc65186d058f83af6c2d028acac9c21577ac6bddb SHA512 3a52baeb9836a6ececf4b6334c845542c73751ef82b3c0ac217e8416d56a94ece6fc5d80c94ab9aae3cba7123c2e1b65f999c81a758375c3da51807d5cbec963
 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0
-EBUILD boost-1.73.0.ebuild 11236 BLAKE2B 13312c8b44e2c0ac3633d773e7790d241557342d494887357a6f62d561bcd622715245e4b02259cb6d3ed92d7566453034f463fa4370234146892367e4207c08 SHA512 37deefaf6f5eed06e96774782fca198e508f69c2c26c5337e23c5598d68834c85da0d188a0cd8cca46b479cc54a5d2cf5e09cbbf145b403a1317e6dff573c204
+EBUILD boost-1.73.0.ebuild 11348 BLAKE2B 25c73b12e45920322fecba41e58217771e85b5963dae04cbeb456fa540be68488f6b7321290e65662cbb1cdd035d7577b63be3d80889ae476224646cf60e535d SHA512 d63b8b5a3ef6b1506159c435d618af77ef601507ad7bbb8393d65b0c6aefa2a2fe380553556733c10a8f21f67be1eb6c1131fa07a9f0dfc5d11edd5f7bdfd806
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild
index bcc792402694..e5b91ab30530 100644
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ b/dev-libs/boost/boost-1.73.0.ebuild
@@ -60,6 +60,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
 	# Remove annoying #pragma message
 	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
+	# https://github.com/boostorg/geometry/issues/721
+	"${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
new file mode 100644
index 000000000000..fef7bafec8ff
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.73-geometry-private-inheritance.patch
@@ -0,0 +1,23 @@
+From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <boost@kayari.org>
+Date: Fri, 5 Jun 2020 19:29:27 +0100
+Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public
+
+Fixes #721
+---
+ boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp
+index 2d324cb7f4..5709a930cc 100644
+--- a/boost/geometry/index/detail/rtree/visitors/insert.hpp
++++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp
+@@ -265,7 +265,7 @@ struct insert_traverse_data
+ // Default insert visitor
+ template <typename Element, typename MembersHolder>
+ class insert
+-    : MembersHolder::visitor
++    : public MembersHolder::visitor
+ {
+ protected:
+     typedef typename MembersHolder::box_type box_type;
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 64e61b11daa1..61e5ddec782a 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -2,6 +2,6 @@ DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2 SHA512 6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b
 EBUILD jsoncpp-1.9.1.ebuild 1341 BLAKE2B 5109241c4f6941dc6764593d2f3b9c60dd6e1edba2d98dc980a7645a837fa4821e4cc0ab58b24fbd74532353e411dfad5aa086cece7c7bed7b6f19b4a19a3671 SHA512 c7ee5a71342c57a8c3b44f038812651c1acb6897c308df0946c81b33fc1af684b1ed5dd97e95a9d1532c2c647250b9f91293ec5a0b9e5c4aef3086045472a261
-EBUILD jsoncpp-1.9.3.ebuild 1029 BLAKE2B a64080988f56fae4e45f23c7c672c97732b55f15bad7b40d40de5690cd2511268b247e739e2fcc44bf78b3ff402d8ae29380e1a32e2ae6c63eee014bdc29343d SHA512 f7fa0fcb578b8cb37ab009d3fe752b41321da44e182a1d44857cfd14be0b23cd63090d8adec70013dee2f875b5be71d729e4a2ea796e14f3f61c95d059e9efd7
+EBUILD jsoncpp-1.9.3.ebuild 1028 BLAKE2B dd069c035e9060161d44946b167acfe3868fb34d1e9e2c4300640f83c7166037321d859c89d0469abc14dc2668aa8f1202dd71569fb938aca423a0a50ff6bc24 SHA512 1ed1f4cf18305d8839bec28d0a744a00360ac83f220a2ff5f2a82397c66ec6efc265644cc3c8b85bd554fe2b3ca77623e5b3f07498df6f8bd99fdb6442c7519a
 EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1118 BLAKE2B 7454688bae7e11a6ee228f0d3235efcd04b74ee73900a1a18dc29fc9b4b25b767a2c7325a9869384b2bdb03202affa7ba3c1ded15cad20d36bc226dfc2aafb78 SHA512 1b63de1ff112e0bb1d7f94161f81227052602ee49be09ae2cce5bdda5819be0ab98246b44880da496b6b927cbd8fa98a3bdc8410e0983f003ab16d7a145416b1
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
index 36523a5b6ec1..56100b5bcc4f 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-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-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index e01054021772..3b4c72aad7ee 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,7 @@
 DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
 DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a
+DIST libbytesize-2.4.tar.gz 437416 BLAKE2B 4739b6ce5bf852112a5c662e3b5a29428df4a6b0fdd933293a1352e7f81f7ca3c274ed160ade38a705e9858bd2c37131a7409126d28d12ba0d47b64f88c78e31 SHA512 faa546823c95576516a5f4250ea51b381fe5ff6b9d09fc49346e65278e9be42fffd2566dcc24b4e0045cee15dcaead05c1fd1f5f51048c87c382298f7340e1d6
 EBUILD libbytesize-2.2.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac
-EBUILD libbytesize-2.3.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+EBUILD libbytesize-2.3.ebuild 1466 BLAKE2B e1a86be3ba72fcd5d95244ae1cd4d78741ae0e86ab7d7336182e95ec0d3830643f57275b1b20c36c171920af88046bb6ed263ba885cda5d96c92c9e44c8fda4c SHA512 e16f51b9d3091c52f2b8e404e7a9f6d470982fd52756e4b93594396a05f404f191422c9d669801923f4ef112c5a8e570201d32be8edec7b9926dcb29a3956f8f
+EBUILD libbytesize-2.4.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.3.ebuild b/dev-libs/libbytesize/libbytesize-2.3.ebuild
index 0d91bc5f9998..22da6dce9808 100644
--- a/dev-libs/libbytesize/libbytesize-2.3.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-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="doc python test tools"
 
 REQUIRED_USE="
diff --git a/dev-libs/libbytesize/libbytesize-2.4.ebuild b/dev-libs/libbytesize/libbytesize-2.4.ebuild
new file mode 100644
index 000000000000..0d91bc5f9998
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-2.4.ebuild
@@ -0,0 +1,80 @@
+# 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 python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python test tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+RESTRICT="test"
+
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
+	)
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 47f1c260961c..06bb001a4699 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,9 @@
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
+DIST libdnet-1.14_pre20200717.tar.xz 276684 BLAKE2B 829e1293ae4b5c3eb4e13aef36d0ecd7abfdf53169b25e1cc435e59d2cad1019fd94f7b0a3bc9d0d382aff051855d06c014677de92a7af01ababf748093f9c18 SHA512 75d8e25b00dfa59b9354f7e67a7685ac213af79b594584b056457181c6f98ef00ed1243a2eb47f63261007130e6eae8e91b8c1b2f353c62dea666b3eb6a3940c
 EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5
 EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd
+EBUILD libdnet-1.14_pre20200717.ebuild 1358 BLAKE2B fb82b3978e9ccdabb011483e80967a9124cb3e526c226d6e61cef5507879822ee5a96dafdf3b4b3097a09bf70f15315ab9e0b03e0575a52cf1596a9a00fca24b SHA512 067d9e12140cf6eea5f41a4c50799310729ae1b27139a23669b91caf402342d1fa2b5e59b17ed35a9dfb6a53e3ab7188a1f6663510e338abdd352629cd9d9039
+EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild b/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild
new file mode 100644
index 000000000000..3975fee66788
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AT_M4DIR="config"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs test"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( README.md THANKS TODO )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	eautoreconf
+
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		unset DOCS
+		distutils-r1_src_install
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdnet/libdnet-9999.ebuild b/dev-libs/libdnet/libdnet-9999.ebuild
new file mode 100644
index 000000000000..3878f74646eb
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AT_M4DIR="config"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1 git-r3
+
+DESCRIPTION="simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+EGIT_REPO_URI="https://github.com/ofalk/libdnet"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="python static-libs test"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( README.md THANKS TODO )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	eautoreconf
+
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		unset DOCS
+		distutils-r1_src_install
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 665207e3d2a3..8fee5219dcb9 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,9 +1,5 @@
-DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
 DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
-DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904
 DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
-EBUILD libgit2-0.28.4.ebuild 1648 BLAKE2B 3f281a4dc503b2692a451fa10786aff3a8dff090fc311d38ec0cba20fedd13018683e78674df806b4f7370e6a8ac5c09943b9e3fe7b30691c82056deaa286ae9 SHA512 87dbeaafba6af0bca7cc509dcdae5ef8ac5848aa2af048b555424be1be60a0da2329750fd4a9b2858b37ba8bb2c109b4b99d6a31ae15cb5187bb79a507fe5bfc
-EBUILD libgit2-0.28.5.ebuild 1651 BLAKE2B 018c033e9e5eac02a9c95d9ef39daf0627953dcf56984d7cc2dc6e8eaf12da714434d71b6611966e05db3a73d852dbbac256ebd70e62e53cc28e2bafd4858e72 SHA512 dbf0a1e360ef6f5f07d14ae4579fa991fcc6ce7c63d1fae9bef52d791bfb289e33dd67be0236a7ff7726960db7c8d5402d9730cb19d4437f56214a497e452422
-EBUILD libgit2-1.0.0-r1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b
-EBUILD libgit2-1.0.1.ebuild 1702 BLAKE2B 2f7d644dc257aaf38a36b9abc4a2a9463e4de2ae022cfd36447df9533991cf218f242d605b6595ce5c1eb60a70a141696683ef57759fdba00c389ee302dddb22 SHA512 3c6d0e63ad3a6ec38f30c0ebcdbd0bce80208e35db95de731f3c39d0dae613156796314fa31ab68b45a3e5765abce0e8c2741a3e3afa390e892902af868581a5
+EBUILD libgit2-0.28.5.ebuild 1650 BLAKE2B 859432292f7c913953d0c23454dd1c463e44e2696308b29292a4e9b26876c261150d8cc36da549769b1384e8d39eadb1ba11f8abebf20876dd190e72282abcab SHA512 64648a55fe4c25d46fcc99dce81012b3ee586202ae1925a0704b052d73985cd14ceaa0b06988ae2a320fd32c971667caec06013cb03cf25c7ff34b47c7fa235a
+EBUILD libgit2-1.0.1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
deleted file mode 100644
index a1fcb8f72357..000000000000
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ /dev/null
@@ -1,72 +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} )
-inherit cmake python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.28.5.ebuild b/dev-libs/libgit2/libgit2-0.28.5.ebuild
index f26d1e74fe62..567e2678a2d7 100644
--- a/dev-libs/libgit2/libgit2-0.28.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~ppc-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild b/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
deleted file mode 100644
index b9b87e7ffc99..000000000000
--- a/dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,71 +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 cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/1.0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake_src_prepare
-	# relying on forked http-parser to support some obscure URI form
-	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DUSE_HTTP_PARSER=system
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-1.0.1.ebuild b/dev-libs/libgit2/libgit2-1.0.1.ebuild
index 8538f31b0dc7..b9b87e7ffc99 100644
--- a/dev-libs/libgit2/libgit2-1.0.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.0.1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/1.0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
 IUSE="examples gssapi libressl +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index afa91b5fb2d6..2a5a8c71a505 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -3,5 +3,5 @@ DIST libqtxdg-3.4.0.tar.xz 73060 BLAKE2B db23fe8bfb6e8b73a76b710f121464e3a8f5b60
 DIST libqtxdg-3.5.0.tar.xz 73248 BLAKE2B 0e587e640abda9cdf55cbeac270382386be2bc26b291bb9f655d845acb381b7f65048d213039a6e7ae9cc5d03fa29911bc2277140524d73f0e005745759a39b6 SHA512 014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653
 EBUILD libqtxdg-3.3.1.ebuild 967 BLAKE2B 6e1d908b08da2edb6bd01966e3055b36a796ffe18b538935c6b4c291afdbcee417c823b273d980f5c02265544f524015f72cbba082713c803352d175752f7ba8 SHA512 e8a17c51d87c715cdafd1b381b8dfdf8638028ac679fb6d198d89caeeb5b498d33ea392d91e01036903778903b42f3bd4991e77c9e9331a1da30f8c740ecdecb
 EBUILD libqtxdg-3.4.0.ebuild 968 BLAKE2B fd988d0b1b55d110ce23135255ecf40d06895186508852a8fd9665d8e06a344a1608900d113b6a1f0bd5da299b3675fdc88104141ecf7edac62cffcbcd5557cb SHA512 ded8649801c95ed493a7b1ef5f839a9107837e0b1415bc7ef402b849f63b9e7a1bad8d0fe576df39ade21a8ac6ef5cbfe6929dc8997b96a73b8466f48004de33
-EBUILD libqtxdg-3.5.0.ebuild 973 BLAKE2B e9885b7f5f0ce2d36b6cbd6c7bcd7246807d8f1bad8949d1f510189b25f77beb8cfe1fd5f9e9aea7ec235f1d61e0f95cdf33bf86e0a4598f07faeddeb9395025 SHA512 ab8acd4eb8d46f30853df4187c8f160608df4e8af31d7f4edeed0f14824c2f19e64edc077c81c5ce9467a9ca66432c6bc85ca246c55df0c4cfe34215de2ea734
+EBUILD libqtxdg-3.5.0.ebuild 971 BLAKE2B ba8dcbe7eb4f8441654230ebe921ceb6e22a23fa70e825746eb32a4dd4b9326d4f4e37bfa65f1648377118d5aeac767fa73fb1d814d326a9955110e77b41ca86 SHA512 f28619a05a2a9dd692e5bb9cac66ffd7bc91807c54f7fab2e70ae49f9f64adf7e11b6823ba3b5b89f593d91905fcc48381b298e55ee7390964ab48468ce9b8b2
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
index 5c925fa5ebda..b09cc5dd8cce 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index c56cd9adbcec..c917ef0a93f7 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-wayland-protocols-1.0.tar.xz 38020 BLAKE2B 8064a526d3e3e4b36f7c612744285181ba96bdf4c0992ba7d164ea98e629b3456c7efedd2e3dbbf76a3cbd42664d91eea3e485bd67303e1db02964c7fc6158db SHA512 30ecbf9fbf9de7ee1d323fb43b0f4a05586e0f7d2c4d510e2300828e7a6a16e8907d8d2a835d4ecbb2d4d532641ea722ff6572403f767e0ac878b7fdb0897b08
-DIST plasma-wayland-protocols-1.1.0.tar.xz 38376 BLAKE2B 3d9c3b0923932d12598b893ae0584a3a7afe11a9b64a31c3793c57708a85951494dcadb7eae563ad1b250952f083bac2523857db8dab044023808c5f3cf82fba SHA512 e60167780b2d89b9829b38685a0d2cf3bca9f15efa8d683c8070302389a90528da5bd9b905676b462ea36c951941485dfd134ed131766d34c692a1c7c1bd6af0
+DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
 EBUILD plasma-wayland-protocols-1.0.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
-EBUILD plasma-wayland-protocols-1.1.0.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
+EBUILD plasma-wayland-protocols-1.1.1.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
similarity index 100%
rename from dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.0.ebuild
rename to dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 5c61e8170f4d..5a4b492e606d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -2,8 +2,10 @@ DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19
 DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
 DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
 DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
+DIST vala-0.48.8.tar.xz 3470240 BLAKE2B 753c1f4bd1619bb4671f74f3a82ed1919efd5bdfcbc7d2a0797303627214de1b9d22bb9bf4e5d8097773986bf95b27126061cf1ab862837d0ced49e0c860bb90 SHA512 a2a71313161154c3de73fa186728704b2d04ec27eb8cd95954dcfab6287e29c2ee21ecea17bc3e404fcef89c69d6440abca5ae3a526a43c05d3cbafef7ec6e99
 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
 EBUILD vala-common-0.48.6.ebuild 648 BLAKE2B bd688604d8e7bf65b8a902423acbe2e469a81e57fe78171c9f77905190eca95b02b16c52f7ca8b3062e2aca8c94b4e5454e82bc6fa04dbba8484f9d38d526e4d SHA512 00fd28246c4cdebdfb455d08030eed513d649ba2bc0adf48f3bf27f1de140e3d9d2413c45a49dca55baf399d5a9c501d2d110c95f4c3fc8e8bf81bcbd75ea22f
 EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
+EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.8.ebuild b/dev-libs/vala-common/vala-common-0.48.8.ebuild
new file mode 100644
index 000000000000..ee55cfcad100
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.48.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 6e07eab8d1ce..9fde399870cc 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index b8277ce56c1b..245876797d7e 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -2,5 +2,5 @@ DIST lgi-0.9.0.tar.gz 285248 BLAKE2B e5e6fe79899b70f46338827296b921c04c31ac1edc8
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
 EBUILD lgi-0.9.0-r1.ebuild 1367 BLAKE2B 1a24b782bd95f856b103b7751986aa0f92d747a05812845f4ef1c1ad3e04b4ab85c787f7d0c43274691c116d130ac118e084885daad192cda27996eb0f3f5ed7 SHA512 7f9e930a977d55175d71de4dc26792506aad6597509a76fac1146b773387a76389c4269afb0fe769e89e9375f951972e25a29b3b67d6d2ed6eddbaef04b2da96
 EBUILD lgi-0.9.0.ebuild 1309 BLAKE2B 2ed523524ae8122e087c329ea257ce482e7cc61c716c1c814d692e9b0ec3452a83cb18ee20a11a2d6d19355375b0eec5769ac57202e28aeb849a153bc8ca8bc8 SHA512 04526e050eed656971358c99bde3d5ebc79b08e586d77677a6f5715457cbcfd8572e7bf14dfd5f70fc76e05bd1daf2ed3ae26bcc2aed91db3e2227b3b3ed595c
-EBUILD lgi-0.9.2.ebuild 1377 BLAKE2B 0102b7f3f40401ca9339a1cde2c166c10373265ad5a0bb82864c34af3edf88d3d9003fe73a696fd542176eb863ff17907f8a624d342547972bc99d5d81acaca8 SHA512 dc2aa0d675467f7fbd7a9c448eca6de4094a8abd9b298997354ed770da95fb60896568c016aed6d058f747e0c8951e25d897753ae34b956c6f64a867d17bd9bc
+EBUILD lgi-0.9.2.ebuild 1376 BLAKE2B 303e263d60698e38cc53089dc04eaf1e2f6c69825a99f88555c663dcbe3d6a8cc26d05cf5e7b5c9cefc4b8c601cb1cc68847c9e293c23f76a89a903f6eaccaa4 SHA512 9cde1e19d33cc12107e670368d554f8f5d4d6990b7fe7c28cbe767d833d43c4ad213cdd490b9d8b9870d830e0eb4755787a4784ac9a93b18b4bfc371fdc24aa0
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
index c2faaf94dbc1..7ea7eedc3e06 100644
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.13.ebuild b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.13.ebuild
deleted file mode 100644
index c4bbb4c5a85e..000000000000
--- a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.103013
-inherit perl-module
-
-DESCRIPTION="upload things to the CPAN"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-# r: File::Basename -> perl
-# r: HTTP::Request::Common -> HTTP-Message
-# r: HTTP::Status -> HTTP-Message
-# r: LWP::UserAgent -> libwww-perl
-# r: strict, warnings -> perl
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	>=dev-perl/Getopt-Long-Descriptive-0.84.0
-	dev-perl/HTTP-Message
-	>=dev-perl/LWP-Protocol-https-1.0.0
-	dev-perl/libwww-perl
-	dev-perl/TermReadKey
-"
-DEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-		)
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/CPAN-Uploader/Manifest b/dev-perl/CPAN-Uploader/Manifest
index a324e4114c3b..83a10588b2b1 100644
--- a/dev-perl/CPAN-Uploader/Manifest
+++ b/dev-perl/CPAN-Uploader/Manifest
@@ -1,5 +1,3 @@
-DIST CPAN-Uploader-0.103013.tar.gz 20961 BLAKE2B 9da4ae22e049f05598a4d916410619a93c46fdfafc51242836a85aa2ed2ce2806fc6970da082d7bfa72d18f82c47259367ba1fdb478f072675018bd097d8424e SHA512 28133d7e5a9b12abf9f089402108314ca9fd68981d52006136b82a754b56581c7c5b38ad69b6080d247b46d0c68d258674c49218c1c5d61811bf89bcd9d773fd
 DIST CPAN-Uploader-0.103014.tar.gz 21562 BLAKE2B 09596c89e21eb3a4e8ee8b3375f668e156508857828f0d421ea4f2ee5f831ae58e10091e93be7c362fd4cb7cbd42b03d193974497ed8749ed3cf9b6e4b16671e SHA512 2c7434e0bb6afb6aa73b9ac5cb4d1a865d179c63eaf1f985fc2117ced877b9845c71144e5fda29cad24dbf0073d3e167235f4ba359adca58a081c167f5aabb80
-EBUILD CPAN-Uploader-0.103.13.ebuild 899 BLAKE2B 3de2f91e5de160f955ad59d1a7d1b186022e630355f7f7928cda3de630e960bf867d83413597648b644b49a0491822a5c7b4445a05f660fe6000b2914ec1ada9 SHA512 1f48635bb6cf4a831fac928f8346c09f1c31fbe3a61faff9ee4b0a4fb32ccf17abac60485e2896f15307b9cdc7d3745d28b95fa14817cbe10d96ae2c361bdafa
 EBUILD CPAN-Uploader-0.103.14.ebuild 900 BLAKE2B b901b43ab6c121646d005142067ff859168f41c5b2ee66306439e55af74677d63e3edb19e7a832d4fd80183945d0c055097452bf3eeedbe6a66dab9a17660e62 SHA512 04a8f29ef6f953c2b2612e1ab934924b7f7fd9f0cb7d2d98791cdf87f9d9132c4666790fc3bbcde4ac98585bd53c6163148db7c2fe48de8bc0cdc647d48c84d8
 MISC metadata.xml 398 BLAKE2B feb7c968153fec9cadca6c5973834b28161e94d0d4cbc062d1e5b65af914c1edcf2fbc731d5b6c2c264e3ac4eae748519a420c107e0777cc4553a5ed0bd2a6eb SHA512 07efe44d7a1e13c7678d188f012188cb8d5a0bae599a6d8b98ff881f7b99a1d6956c09053f4a345acddbddfad813e3e7aee6a352ce8b918ee5a03ff37481ce43
diff --git a/dev-perl/Compress-LZF/Compress-LZF-3.800.0.ebuild b/dev-perl/Compress-LZF/Compress-LZF-3.800.0.ebuild
deleted file mode 100644
index a8a4609e31e0..000000000000
--- a/dev-perl/Compress-LZF/Compress-LZF-3.800.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=3.8
-inherit perl-module
-
-DESCRIPTION="extremely light-weight Lempel-Ziv-Free compression"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Compress-LZF/Manifest b/dev-perl/Compress-LZF/Manifest
index 28f576fb6716..ed94d04eb607 100644
--- a/dev-perl/Compress-LZF/Manifest
+++ b/dev-perl/Compress-LZF/Manifest
@@ -1,4 +1,3 @@
 DIST Compress-LZF-3.8.tar.gz 31727 BLAKE2B cc704d95ee8569c4ce9a28f09d8cca061011c534ff45b85285679ce713fb4741a01a821c0cac49b087c4ee70d16efa996b1e6988467f9b4f5947f5416f12cfb0 SHA512 363c8ee73f1791c1a772bfefc82da5f1b883a27de74205f8f15cf36223a683811f8de98fba6e94a72ff73b2a325ef9fa07ea8f7aa2feeb3045d5b36dd613c22e
 EBUILD Compress-LZF-3.800.0-r1.ebuild 468 BLAKE2B 8be1396db403367d9eee542d31aad1bef641e3e7823ea22a7f3de14f3403e51e3240558665a852d156f60badc332039ffb53660d87b1c1c78fcdcf0939fc4352 SHA512 d65b87aa4b6047fae6cb7210bf0ac6f01a2bc1193ec79992d53f69d067eb282a7d233702fb4605fe775132d0690f35c6a8974035c2ffcfe7c6850fa8f50169fd
-EBUILD Compress-LZF-3.800.0.ebuild 343 BLAKE2B 53685b68ac4b3ed198b4fa1351a6f0134e8dc5ca7ef41ca23b9106450bb5e6b6225be72338c8792f7cab67e70b0f59a8b244b5960d1575212ce35de062ed3d38 SHA512 c284e67de81eb80362e7a9f4b7040e6eae0a19da7c9d214728ad8335d90f78a2d642c7f2d3fd7010b82939fa0a098e424448c2e2fcfff51e3f6733a87e8f3519
 MISC metadata.xml 396 BLAKE2B 52f2b1b079444ff8a2f397cd5b3835629524ddde3798079d7e168966d4df3d6644bb36468892a4801bb982a529216c38992c4c61b1ddb2f32d450ccd4da5531e SHA512 dbfcea90c54880bb6814c65ced7a98996d4fe15374fbc5014bf2cec8c3bd4c745dde19cfb0e4e096309d9d59a159d51e0d5b8c0f75762b602ea4e7df9a16305c
diff --git a/dev-perl/Config-Auto/Config-Auto-0.440.0.ebuild b/dev-perl/Config-Auto/Config-Auto-0.440.0.ebuild
deleted file mode 100644
index feefb8e29027..000000000000
--- a/dev-perl/Config-Auto/Config-Auto-0.440.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=0.44
-inherit perl-module
-
-DESCRIPTION="Magical config file parser"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Config-IniFiles
-	dev-perl/IO-String
-	virtual/perl-Text-ParseWords
-	virtual/perl-File-Spec
-	>=dev-perl/YAML-0.670.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-Auto/Manifest b/dev-perl/Config-Auto/Manifest
index ea27951b00ed..acaadd6da071 100644
--- a/dev-perl/Config-Auto/Manifest
+++ b/dev-perl/Config-Auto/Manifest
@@ -1,4 +1,3 @@
 DIST Config-Auto-0.44.tar.gz 16668 BLAKE2B bcf0d89b86ef48b4e51db8a067e411c5820592e7c940e0c5937939243c094c9bc11136d12206f650d7ffedf414dac39dd1a62a35a1bf0da0b7dfc8c9f8629304 SHA512 8102100c6c8fb0f644aecf429c265a3ed502497576cfbcbb011697a0eced072ae8e912eec99dc74796382a394036ade88df7b93d1a2882cd381ae789c71196f9
 EBUILD Config-Auto-0.440.0-r1.ebuild 567 BLAKE2B 43c50fad208e95943bf59f5bdee0291fd70019c3b5b47f22b1cf3f35aaff4cd10ae450e4b79d7849275935453760e376d75c5ff59e107a5000e80d288e7fb244 SHA512 fcfb881b9e029c21847ad558aff5eeb101b13072cfc49e55ef2aac2b38943075fc99659d8e66c4f8e9ba58772162a6beda8d626ccc4c75f668e4544d48c3f43f
-EBUILD Config-Auto-0.440.0.ebuild 531 BLAKE2B d1c46f1a06c1b4e23781d34c8f43e16ce4aa569ae927e41f7f5fb67e79d1db2961c97d1c3b8b243c3ffe1a8f70cc723c303e711c5bad5efa65539864677c79a9 SHA512 d11a407fecba27be3babe9f3916dbd479fb71a02a31b2a3272e470fb8b5fb8bbfc7b72781198727819014fbcad3b5edc24d716df50b754e9cbbbfd9681c8e382
 MISC metadata.xml 382 BLAKE2B 2c9f88739d59f5f19fcb1e7b9b595723e540ac4187a177590975dd9ff3545e6f15a5870bf75387618e54324f87a9fa7fded8bae2f2c5482615e30664cc9e4a69 SHA512 24b77d65231d7d1477f1c309aebfb3ee38724b91c043152eaa7aab13054998b30f346067526bcf5b1de6de8eee9e78ee844887a5b8ef8f04ec46cf5da41cf97f
diff --git a/dev-perl/Config-JSON/Config-JSON-1.520.200.ebuild b/dev-perl/Config-JSON/Config-JSON-1.520.200.ebuild
deleted file mode 100644
index 5b771c262f9b..000000000000
--- a/dev-perl/Config-JSON/Config-JSON-1.520.200.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_AUTHOR=RIZEN
-MODULE_VERSION=1.5202
-inherit perl-module
-
-DESCRIPTION="A JSON based config file system"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-File-Temp-0.180.0
-	>=dev-perl/JSON-2.160.0
-	>=virtual/perl-Scalar-List-Utils-1.190.0
-	dev-perl/Moo
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-	test? (
-		>=virtual/perl-Test-Simple-0.700.0
-		>=dev-perl/Test-Deep-0.95.0
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-JSON/Manifest b/dev-perl/Config-JSON/Manifest
index be9a391c420d..3d5273981965 100644
--- a/dev-perl/Config-JSON/Manifest
+++ b/dev-perl/Config-JSON/Manifest
@@ -1,4 +1,3 @@
 DIST Config-JSON-1.5202.tar.gz 18288 BLAKE2B 96630a8864623931969d50d824889dcba2a7ce67087c625c64a586ef1cabda5bd9bc710a2a568355bec275ea36010c2df49bc97eba67885b33870d92cebe3917 SHA512 13821db9318af9b3223e01bc28442a520880a098c333b89a67296fb34979bc0fa9c98a93470a72185e24789c66d607f2c932d6ff4e9a6e407359b86dc1be646f
 EBUILD Config-JSON-1.520.200-r1.ebuild 629 BLAKE2B 7685c462b79977d1db4cd29d2a16e68e319c9a7bfcb3d9073eb08c47d406e647b0b4e11d7453deaee5e08714f9a44b8ab14b0e7e7ae3704dc0b32cf404d69ba6 SHA512 840d8ab52eeb85966e23f35259c07f80782c6e58285f2d88b5a82cb5c5b3d1acd11e737a984ff2d280563522a8b0410adfe0f52d061c4184c1f49856315879ee
-EBUILD Config-JSON-1.520.200.ebuild 579 BLAKE2B 48f968605936d408dce3c58498a03c29c988fc4bd55f77ca2811ce97176abb6b0f89bfca9cadb465b78192c3c89a485f5d4bedace71e13e15e2ebeec3363e828 SHA512 bb1f921b48956dd591db565444eaa0d92ffa344b3631303dd49d7d1a153fe680a6078230ee51bb0616eb89212c414ac49197d30f96021eea1583031ab0deca7f
 MISC metadata.xml 466 BLAKE2B afd60a1e710a7f6a8daab61a85c7145ac3e1938ab93e5405d5a585652fe1f590e81f04729fde7f20cbd55106c4b5711fc325ac601a88a53662e68f35203afb01 SHA512 71241c10df29ebe1d728e12ae89476e2565c7a9e9f9bdd9417077d35b2ed7dcf5171bf794193c22db1f4e19e65f2c8908c38a35426e69a8d06946dc8be828690
diff --git a/dev-perl/Config-MVP/Config-MVP-2.200.10.ebuild b/dev-perl/Config-MVP/Config-MVP-2.200.10.ebuild
deleted file mode 100644
index 2386854bcbec..000000000000
--- a/dev-perl/Config-MVP/Config-MVP-2.200.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=RJBS
-DIST_VERSION=2.200010
-inherit perl-module
-
-DESCRIPTION="multivalue-property package-oriented configuration"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-# r: Module::Pluggable::Object -> Module-Pluggable
-# r: Moose::Role -> Moose
-# r: Moose::Util::TypeConstraints -> Moose
-# r: Role::Identifiable::HasIdent -> Role-Identifiable
-# r: StackTrace::Auto -> Throwable
-# r: Test::More -> Test-Simple (Yes, Runtime)
-# r: overload, string, warnings -> perl
-RDEPEND="
-	>=dev-perl/Class-Load-0.170.0
-	virtual/perl-File-Spec
-	dev-perl/Module-Pluggable
-	dev-perl/Module-Runtime
-	>=dev-perl/Moose-0.910.0
-	dev-perl/MooseX-OneArgNew
-	dev-perl/Params-Util
-	dev-perl/Role-HasMessage
-	dev-perl/Role-Identifiable
-	dev-perl/Throwable
-	dev-perl/Tie-IxHash
-	dev-perl/Try-Tiny
-"
-# t: lib -> perl
-DEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-		)
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/Config-MVP/Manifest b/dev-perl/Config-MVP/Manifest
index f15c5bcc4f94..a338121569d9 100644
--- a/dev-perl/Config-MVP/Manifest
+++ b/dev-perl/Config-MVP/Manifest
@@ -1,5 +1,3 @@
-DIST Config-MVP-2.200010.tar.gz 32947 BLAKE2B d49ef8bf74ee740ff4eac13696fd6bdb943030590e54fb80f14d3cb6a07b38b2ec4b0b5bc3623e89620669fd85139e2eeafc7492208cd01850f46602b6f31075 SHA512 b0febad2c80ab3e9d8c19b2a8b6c8a6bdb1e2358fa7a3c436e639d75ad15560ac4aa08f88c67f32f28dd9fe491ae7b156715e93d0078d27cee20e16016154052
 DIST Config-MVP-2.200011.tar.gz 33387 BLAKE2B cd57bc21b3106ee991dcaf07017a41dbec4453bc98b823820f431d86101ed0c0a0814a8617c37b3df1bf1a264ff07a184fedc94920c68946837e3852076b0f92 SHA512 8e4c178b355a5e4ef4a1d7f8b304a1411f19f6ca601e6ab6593b0b3e9002f7f5ba64eb49714bc155741651dc501b87296e2fc4a3388e7616efdd4dd893866606
-EBUILD Config-MVP-2.200.10.ebuild 1121 BLAKE2B 734a2e9809a647321392434b4f9b9807884d6005981708dc18787456e390cc12eb18acfb197c45150ac2cc73f2c90f9a0815b0bf2801c23325b5919d5b8e4d17 SHA512 ec0042dae46efdbff2c61ad1331cd3377ab3e55b176d62b98c309b0d9bf712b4b12434b7f00e666f7e44d2ae07d61fcf62114e997b1b73866d2ffc8186b976d8
 EBUILD Config-MVP-2.200.11.ebuild 1097 BLAKE2B ed8a4aa634c898c30e6d5e23bb8ac74fc7e32b60827e250c8aa2b8907149ed55694fda55560eb3ed30628137a2c7ca1ca6babd32e7347b710d6cd6e30cb28d6d SHA512 bd447399e64818371737947f12be16850dd94fcc84c673edc67c296aee0b2e5b58b2348bc30977c4ab7853ff26682fba8ce8f8c41fc39a68e458e7d2be9fc7c7
 MISC metadata.xml 1120 BLAKE2B 907f79c0e2bd0f6d98f0b29c6142e89560a33417cde5ce0c2a4b9c0c0d65aeab720cbd8775bec33df54635c4a25cd6e70306759118d732420abd1a793ed75c8f SHA512 5dbdd3e476561f08efd747c14edf5353ee9d8edd3ae50830167aa47f1d2498350dffe4eecc0fb6b9d79031f668b43865c3f25bcb7aba8ecf5ab4d63be64a7729
diff --git a/dev-perl/Context-Preserve/Context-Preserve-0.20.0.ebuild b/dev-perl/Context-Preserve/Context-Preserve-0.20.0.ebuild
deleted file mode 100644
index 8c377713ce05..000000000000
--- a/dev-perl/Context-Preserve/Context-Preserve-0.20.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ETHER
-DIST_VERSION=0.02
-inherit perl-module
-
-DESCRIPTION="Return chained, modified values from subs, without losing context"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		virtual/perl-File-Spec
-		dev-perl/Test-Exception
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Context-Preserve/Manifest b/dev-perl/Context-Preserve/Manifest
index 2c4bff00eb0a..ed1fe2d58d17 100644
--- a/dev-perl/Context-Preserve/Manifest
+++ b/dev-perl/Context-Preserve/Manifest
@@ -1,5 +1,3 @@
-DIST Context-Preserve-0.02.tar.gz 25305 BLAKE2B 6974a9a8827e67652e407dfb05099449bfd2ed8c672552235746dd13b1504799694390e537795946eb4fbdc703e5aee129b40128d35d0d9145fcfef56931d229 SHA512 e5c230e38430c6ea9b7ed75e075a12454262adf1883e5ab6ada4696099e2f246d0f9b613934b4197b0529e126ea083d12d9bbe4ece5cfb82a93f913b7d70b068
 DIST Context-Preserve-0.03.tar.gz 25915 BLAKE2B 78866e1c0d20f12fd95da981d42f8de2405a9bbd092d5518c777d7897955b8823c8607f49469b556fcfa58dc48643ec50a394e7e3e938f5777f8b3c65602f21b SHA512 a5f412d553ba2ded7302f594b920bd9c04021c5ec60e94939da097a0fa2de61a0b49dd864e3212eb9b3a7d5236295e1923452e81d56789ae6852c73ec3086cea
-EBUILD Context-Preserve-0.20.0.ebuild 580 BLAKE2B 5c5a50c7ec3166b43b19209a5820d1742fe6543753e39a58e4d64a3c8f6da05f8be39042d60908f4684626101548ed0dab4a88959e2c655173e1ef34e940bc65 SHA512 21de20680111f85a4c2eeaeaa4438aaea8d533894abad7792e968de1e04198f96ed49c24da7c8ede73f18663d427138ef6c5897485cd0ce36e3e62cef6cca0cb
 EBUILD Context-Preserve-0.30.0.ebuild 581 BLAKE2B 165a0494a4124e92653f9cf2fd5e8ac5fb149500787fad8a75d9197fff4238315718a40a3ab006b90cb1da1427532faeb4c32eadcf388ac8b4ed9548b51e3cc8 SHA512 73c1b9f8140aae2ace5328ff22514bbaf003bc09d77ddbda5fb10d2022d40df71ecca05862f59918c97e93e8cc181c2c4c16b66353f9164aa3ad2ad4a6273b0c
 MISC metadata.xml 404 BLAKE2B ec63adad9597a82a537ad43f1d34c8b7ff68378f565eb53c154de3ca7c7324700b8c025a3f77d50349a847c14e449d9395a8d101b95296dcabcc7cc4d4f18b3d SHA512 1601b335caac702807e3fa41aa6ba625b85ae3c3736e4dc2f47c39441feb6da54d3a19630b35d6d8d103fd1418a8b05e36d81aaee6ef4226a60afd26d6b9310e
diff --git a/dev-perl/Dist-Zilla-Plugin-Config-Git/Dist-Zilla-Plugin-Config-Git-0.920.0-r1.ebuild b/dev-perl/Dist-Zilla-Plugin-Config-Git/Dist-Zilla-Plugin-Config-Git-0.920.0-r1.ebuild
new file mode 100644
index 000000000000..8424d799f71e
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-Config-Git/Dist-Zilla-Plugin-Config-Git-0.920.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BBYRD
+DIST_VERSION=0.92
+inherit perl-module
+
+DESCRIPTION="Plugin configuration containing settings for a Git repo"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Dist-Zilla-1.0.0
+	>=dev-perl/Moose-0.340.0
+	>=dev-perl/MooseX-Types-0.60.0
+	>=dev-perl/String-Errf-0.1.0
+	>=dev-perl/namespace-clean-0.60.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Test-CheckDeps-0.10.0
+		>=virtual/perl-Test-Simple-0.940.0
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest b/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
index 32696f13388c..791ebb01b57b 100644
--- a/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Config-Git/Manifest
@@ -1,3 +1,4 @@
 DIST Dist-Zilla-Plugin-Config-Git-0.92.tar.gz 17755 BLAKE2B cadb4c1ac9a1f77b0302d07748b4baaaae5dce91dd082ef212da5b6daa77f757eac3b1f61ef958053f47b844e6840cf8cda40ddc4a4340f13925c85e31edd430 SHA512 f319cbebe197a1c3c6f1ce19435f4e7a93378f211051b94b8bb0d3ce94da209c3d72ff5f3f7084222fd22c785bc75ac2ebcb4c7f0600ee87cec54f3454cc0fe9
+EBUILD Dist-Zilla-Plugin-Config-Git-0.920.0-r1.ebuild 636 BLAKE2B a454ce6a5633a20f9e827ae18bb7cbe81fbba9af42390ea2d61b43a7e91641f4822536f6017d6cacc223b14c5052d4a3686c94895f4baa8c61323dcb17df3abf SHA512 df08384eb18c20e433cd40953a3f7a31efe1cf4c156e82a62274bd7a5557dc5582cc229d86500381e474d9e088161c987c907025bba7b50007c998556f476db2
 EBUILD Dist-Zilla-Plugin-Config-Git-0.920.0.ebuild 615 BLAKE2B 769b3deeeab95505b75272fd95f65040666a0baa1ed29712aa8921ff89443a0918492d65af133a439d62be71f80d28c9dd23dc2ba0f3f5b8f5eb2056c7ca4e82 SHA512 b4626fa190e6186a8da2ad148e586a4c9d48f8ad3471cfb8a599aff977c5753c36f0ed7e031b48a3c5f1b1277af1472fefc686c7f78afcd3a217f7e8c4abd3c2
 MISC metadata.xml 506 BLAKE2B 2e2431f715c307dcdd0d5799cfd06666faaaacc4162b4221c7d1f3eb6fa5002b9b2774a2c9010438f8c28dda308664964bc96bd7463264719cd16887d5eda04c SHA512 fda072ab2adc0a37daf1625b1c48ee1c07eb595a341da0975e3f1083e22bfda43428eae4a705014ac0946cb0348b5e3f20df1da62bce72929ff85eb19d761559
diff --git a/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0.ebuild b/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0.ebuild
new file mode 100644
index 000000000000..524bd67c8ed2
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.007
+inherit perl-module
+
+DESCRIPTION="Copy files from a release (for SCM inclusion, etc.)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-perl/Dist-Zilla
+	dev-perl/Moose
+	>=dev-perl/Path-Tiny-0.70.0
+	dev-perl/namespace-autoclean
+"
+DEPEND="
+	dev-perl/Module-Build-Tiny
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/Module-Build-Tiny-0.34.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Module-Metadata
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-if
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest b/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest
index 90b24617a082..d5bfc361f23d 100644
--- a/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest
@@ -1,3 +1,5 @@
 DIST Dist-Zilla-Plugin-CopyFilesFromRelease-0.006.tar.gz 26548 BLAKE2B 2aaa612c3a62e782f9e0ae35d9d1e54324151230f0b111d64927cc0f66ec185956cd5716746b137ffd8f8ff410804500566999f9656963c7731b1b8c2b65dbff SHA512 31ee120a168ae55ba96c5f5399f16a6cc7b7bef5d6c7d55d469f98530a3fa7e46ddc66509f83c25dcb01d425c750d65e364dc0e1065284671e0a2efe5b44d7b2
+DIST Dist-Zilla-Plugin-CopyFilesFromRelease-0.007.tar.gz 30175 BLAKE2B be67083902d4e1d9fff23c20aa2df8e770fbeca0c82e04c8e46a189af7faa1eaad7614b93996526c1de69c2f7bf5bb4601b47338436aca165b29a3092806ce41 SHA512 2a68a8c534ad713243552fa62da1f8288b5ebf1c2ce15e9944325a5f99854b6835450f49431d7f5bc36f99d1d843adb75a68f54ced2212971445f2521f0ed586
 EBUILD Dist-Zilla-Plugin-CopyFilesFromRelease-0.6.0.ebuild 639 BLAKE2B df967138bd2efcabe1a0a728b895d53223972478cb0da422993797edd198446ed3201b5c880f98027ed0e890c6286ef5c1eb01ccb6b8590570bb27553a1ea3c7 SHA512 823b5ebe4377e7425a2da4666b5d0481f0cab8feb9ac8fa8f1feaffe187d9caedb4353033dee68e773fe7364d3fa78edf3616e8efd41eb4196a6fb03fc11fb51
+EBUILD Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0.ebuild 708 BLAKE2B 818ca119154885c4d1f2082a103e3084f495899e0d4f16973ade02e35a5e96107ae3b67f4967f305a5d6341c4b50fd8b69ba374d2bf6f49e69060a8cb3c446bf SHA512 9b598956dfa570834408ce01f6093a530e7199a123c0b4b3b12e4744b87135e2cb0d9699101632bc718f35d1eba0546364983e9b04f9155f2aefe9739356c09d
 MISC metadata.xml 450 BLAKE2B 5941660ebebfd7d63ea39f5fd3e879e62594d7576ca0e48595eb13acca481c7be8d28c2dca271b4fd4d22477620056dddd9e040805c917c218483bc4e03cc121 SHA512 0ec3dedd9863a7aed6cf95a693a83c50a3f225701be841532472d9b40647776155abda37a881cffc9e264a5bdd9a734c6d34967ed82316402ef9dff7b63c1adc
diff --git a/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.46.0.ebuild b/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.46.0.ebuild
new file mode 100644
index 000000000000..2c410eee88d8
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.46.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=2.046
+inherit perl-module
+
+DESCRIPTION="Update your git repository after release"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/DateTime
+	>=dev-perl/Dist-Zilla-4.200.16
+	dev-perl/Dist-Zilla-Plugin-Config-Git
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/File-chdir
+	>=dev-perl/Git-Wrapper-0.21.0
+	dev-perl/IPC-System-Simple
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/Module-Runtime
+	dev-perl/Moose
+	dev-perl/MooseX-Has-Sugar
+	>=dev-perl/Path-Tiny-0.48.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/String-Formatter
+	dev-perl/Try-Tiny
+	dev-perl/Type-Tiny
+	dev-perl/Types-Path-Tiny
+	dev-perl/Version-Next
+	>=dev-perl/namespace-autoclean-0.90.0
+	>=virtual/perl-version-0.80.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Text-ParseWords
+	test? (
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-CPAN-Meta-Requirements
+		virtual/perl-Encode
+		virtual/perl-Exporter
+		dev-perl/File-Copy-Recursive
+		>=virtual/perl-File-Path-2.70.0
+		virtual/perl-File-Spec
+		dev-perl/File-Which
+		dev-perl/File-pushd
+		dev-perl/Log-Dispatchouli
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-Git/Manifest b/dev-perl/Dist-Zilla-Plugin-Git/Manifest
index 913295620e83..11b61c1e588a 100644
--- a/dev-perl/Dist-Zilla-Plugin-Git/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Git/Manifest
@@ -1,3 +1,5 @@
 DIST Dist-Zilla-Plugin-Git-2.042.tar.gz 70195 BLAKE2B 3fc7a01f1513d43b0bc68b1066cbba4e8c7c9cff6ed374e3acb1ae7246bcbb9ae8e902be55ac22d69c0c452f8bb0595d2b4efc17a80f8f5b46942260182d78ef SHA512 00f27bc946ac209e35073ca50a7ac52cf17d9d5bbb7f7889b80064260d839e76566dfac15197a907b0defdb1f3b099baa2bf19903e510cee22cfb6c49ff6f2c0
+DIST Dist-Zilla-Plugin-Git-2.046.tar.gz 72313 BLAKE2B 93d315cc5c3f58590fbeb3af9c217c5f6710ad632e0f16ecee3de9f92dd3ff0f33dfdadc74d9083a525eed5cbd0a50d9c2e13c660d194452d5e05e2f5ee2f1d1 SHA512 ac94d73c19f4f4ef9736a58cca439cc5fa64ee0c91869b2fc8be205134258c49e8164e8b67eb1d2e9e34fe6ad1f377ecacd5721d79f6d22f258ab1b275cbe92e
 EBUILD Dist-Zilla-Plugin-Git-2.42.0-r1.ebuild 1371 BLAKE2B fe0b9584e94c15e34fe3b3d6f00511ed5e844fcf93aebe937c0b97e5b2171ddec37e38f0ff1cb18747b2dafd3361c5bc98544eceb3fc40701474ce0c76903afb SHA512 5f1f97137562a847bd2b88befe4208e201ebd9685c40c4694fbc80b6192eb2b2e653f09a914f29c3d1eadf55337ba296a2cde9ae8b91bf4348f7d7dd47d9bf9f
+EBUILD Dist-Zilla-Plugin-Git-2.46.0.ebuild 1333 BLAKE2B 398c6102fc70aa110701c1a043d79973383a54db72e3b7b6dcca135f13389a6be0246024cc045587eff13bd15b975f03920004f0196f4691217fc2d756b3f8f2 SHA512 49536a8ae163d0d45e798cebfc43edb1db119ee13aa6f211574732b0b76a38a8526a0b3301753333416e773f118835bb28c8e61b0d9e9bdffaa117a3121eb037
 MISC metadata.xml 1372 BLAKE2B 07c016295215b247ff0e7c775b28c49d0dce829f71cf974e2b765f2787a799c37a6b53598302ee38ec3d5524f9d914aa9bf106080a833cd61c50eb1f14ae95f0 SHA512 a550d604e56a44626d0e0ab1413feb6846a7426c70f8a374a454b196a9202bb5e72b849aac09c768b30a47acce3a4feec82dd3f708b9deb308def59abadc6222
diff --git a/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild b/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild
index 4b4b01444373..1a1c960a6670 100644
--- a/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild
+++ b/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild
@@ -24,6 +24,7 @@ BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-Tiny-0.34.0
 	test? (
 		dev-perl/JSON
+		dev-perl/Test-Exception
 	)
 "
 PERL_RM_FILES=(
diff --git a/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Manifest b/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Manifest
index 971839a01b2d..3f3ae87b7fac 100644
--- a/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-Zilla-Plugin-LicenseFromModule-0.07.tar.gz 12340 BLAKE2B 52426d7fc4cd9bb071ef1b824b4964a426f3cbe8bdf578d060b716a3690fdc543426bea3e890b644b5a65d7a8c148790b01cdef84180b9f1c719cc53efa9897b SHA512 864aac4ae0961530021a027f823800b72aeeb0b64413fd7e011442a2c5aab87a2bf0191ffacf67787f54ef27456c9d4d1006bd9f2b028c539f51e645614d38db
-EBUILD Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild 585 BLAKE2B b0dd1468123673ee4fafa7b781a3ea33aa47c52f92710a330989c3dcad64045c1bdc12ba4c2fe1ddfc8f1eb0177a36790910c0d3ef6f91be3e7767be837c315a SHA512 ab93d12a875d6a751fd5c36f7d364907f10be1b33f84ec70968afa9a7303fe59fdc6b42a748ebc0c70550eecf5e5f0cf4814d919c08d36b5f9a6de708a199c43
+EBUILD Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild 611 BLAKE2B c2c321beff74a259e46cab5e70a733f14ec9406b244219fc5c723bfa0c2fab05702866857cc0d2999fb6865e39c549ee2576f480a86686c965a6ef1a618c9524 SHA512 71596025febb68823cf4e14931fd0d35b72bdaaa2bf72fef38006fbd43e24e67bc906aa80d68358a0a88d0d60d1b265006cf6cec3aa86c963a067e182bc2cc2d
 MISC metadata.xml 444 BLAKE2B 1acffe6de292b040015ecc132d5ba4cc51758a9c525ddd44a1f59bda5f6615a8295d470fc63a8d35c7eee7c9a6e5a0d8a652820ba799ec8f82f51b0ae7bc69d7 SHA512 9c20e4fd3b3f17f12d189dd00988a98def96396b4f37952cde0d7e5a53800f3a42be804ba82892f0f7311b70cd79c0a8cdf48ce9d6171d562c6172b4463e3654
diff --git a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0.ebuild b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0.ebuild
new file mode 100644
index 000000000000..b58b41006417
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.48
+inherit perl-module
+
+DESCRIPTION="A more awesome MakeMaker plugin for Dist::Zilla"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+XBLOCKS="
+	!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0
+"
+RDEPEND="${XBLOCKS}
+	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
+	>=dev-perl/Dist-Zilla-5.1.0
+	dev-perl/Moose
+	dev-perl/MooseX-Types-Stringlike
+	dev-perl/Path-Tiny
+	>=virtual/perl-Scalar-List-Utils-1.290.0
+	dev-perl/namespace-autoclean
+	virtual/perl-version
+"
+DEPEND="
+	dev-perl/Module-Build-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.34.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Spec
+		dev-perl/File-pushd
+		virtual/perl-Module-Metadata
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		virtual/perl-if
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
index c1d8fc152926..e2641f52b1be 100644
--- a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
@@ -1,3 +1,5 @@
 DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.39.tar.gz 43621 BLAKE2B 7babddaa7f550b7e243bc152d940fd877dd0516cca648a8239edce04234efc9113611157b32a85dacc8b4732b79a897b2d2b61b7d190b8e89eacc93fdedff8f5 SHA512 b0e2f4c83759ff8ef040d507a52b4465b6eb5cd4b43db40169b49890e89e9b98d247dcaaf2be1ae5ea4d5804faa54c25bfc0e4349d38046fc05e1287ad91a42a
+DIST Dist-Zilla-Plugin-MakeMaker-Awesome-0.48.tar.gz 46262 BLAKE2B 76c3f4b12fece663df2ace38b6734f95ddba3f70eeda48b1b5228691a9724885b67fe79ee1b3f6a39c9f61a1995590165b8db95fa6c3abc2bc928b7742e9ed49 SHA512 590936c5bfc185c662eb2d9fa7626b54a6ec929fe78cc68e76e902f90503e0f0c9524af42f705dc201b651c83af3e44366c39bd35abf074e96939e2fae245438
 EBUILD Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild 917 BLAKE2B e649d37d24f9bd292c97a52322745a28018d90b98d138abe3a0fac6863b2ae92cd64df5ac3469252acffec0233865d6d145e62db768240b57f2c2a9f91f00804 SHA512 f9cb613c60de84ef8170371d5b21110419adef93d2c371dd4dba18654ae3d429facf1dc08f1f41482f4abb8dac54ac21ad0c7162ab6dc2510c777467dfc0928c
+EBUILD Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0.ebuild 990 BLAKE2B cf7dcc401657e0a4310ced958d2db6f23592b7a9a148e682b6dbaadbe597142143b56622d5d9244726572418cd165bb26684ee1fde4ca382c8f8d3188ae18ca5 SHA512 509c0de6811c37242c6e81d2307740f76adba086420ed0881430bf46a9e90b88383e90235f6a2ae07d2983c64f0b39557a1ae69c37b54d4dfda3019596f7b587
 MISC metadata.xml 445 BLAKE2B b686b7d22dd430d344ea641d7a8acbb09da9e1305bb67b74876dcaddd9ac5ba4475d3fd061761f179605ab5935a39d27e7dea41730cc120b872f8d5cece2ab6d SHA512 ac613ac05d79396ad1f658ebe8b2aea6cb276a7f3deb2a40d2a32bc16e3f510e009f4ab4506f048afd5a866c382690d181b0883f5b9311bfa32b66bf37e195de
diff --git a/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1.ebuild b/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..8c47fe4d6a02
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.003
+inherit perl-module
+
+DESCRIPTION="Generate an x_contributors section in distribution metadata"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-perl/Dist-Zilla
+	dev-perl/Moose
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Manifest b/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Manifest
index 30936ab28198..512a8757c1f9 100644
--- a/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Manifest
@@ -1,3 +1,4 @@
 DIST Dist-Zilla-Plugin-Meta-Contributors-0.003.tar.gz 14141 BLAKE2B e4aba155af7e193e66c81dfb14ed76e625d94c923900643647e865bac9a2756a08dd177777c9bc61393c27e582a96faf0c82963342977208a16c6a8b851ccf9c SHA512 7a22ea5f0d58e71a6725e42a86f7b5a30657ab0e5bcedd438875422f71cdf347508f29e7c739e797ced662927b9ac01ae53e7b3ceba5e6cff3ad13e067acfbd9
+EBUILD Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1.ebuild 523 BLAKE2B b874bfa03a68051960e5a00aa0dbd4b7f45b445fde03655ca6b15ad991bad8f2ac305a8672dc3b6aabcf6fa3be01c090278e213e1493d47c79979e599b6bd41b SHA512 595fc7babf982f53fa8e3d4afadb1478acb929c4ff098e315cc9d581608590a8a182bd3662aa8624abaded660cbb1ac2a26572bccaf39d785dd323ca44a7058e
 EBUILD Dist-Zilla-Plugin-Meta-Contributors-0.3.0.ebuild 502 BLAKE2B 9fe96632a4b33c2998d84d82bfcab7958712f62dbbb7dd2939fdb3eb7609d8b3e19c21b0ee10cd59f79f866bb3cd2017fe04d6fe46adb2a0e1e571fa1921475d SHA512 09f043b2076eeb29c6956567ba5793e5ef7ee31f9a731d33838d759c55c0c28a99c6dc36d2c43ed1ad94e7ad2c3255c37b65dc20b2ccd3c489a7a296bf8c9fab
 MISC metadata.xml 445 BLAKE2B 4af15bf51f180f40871ac47990d904583d69496dd420e38ea0f4ea3bd7303f9d74fc21de429ecaea8ad62c992e022d871ce5224a277dd9fb93adab8e95de83eb SHA512 a2aa4600083192a949707457b44465dee2be3f180c5b6f4b4a9e4cffd07d7321639db4ca984f8e5f9904bda4200ba17de88eeec37d6e4ef42765d337f5784e91
diff --git a/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.11.0.ebuild b/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.11.0.ebuild
new file mode 100644
index 000000000000..dec91b0b48a9
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.11.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.011
+inherit perl-module
+
+DESCRIPTION="List prereqs conditional on operating system"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Dist-Zilla-5.22.0
+	dev-perl/Moose
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+	dev-perl/namespace-autoclean
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest b/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest
index a1ba7bd8e6bf..3d2a86e5caff 100644
--- a/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest
@@ -1,3 +1,5 @@
 DIST Dist-Zilla-Plugin-OSPrereqs-0.008.tar.gz 18051 BLAKE2B 6a6b1f68593d62a6e92e75eed7b390277b48d31960da7a755d068e7447c0ae1cb157ec85cf96ba12cde58dc1db93729d75ca90395053336a54412ca3711077ba SHA512 e539005fbc7d33a76f9cd48632a4f90ccd5beb278db48aad00c04fc80b2dab4de41a6c6fce22b0a9ac189a9a5e0222a6a51dc41b517b8182a00543f3ce07b672
+DIST Dist-Zilla-Plugin-OSPrereqs-0.011.tar.gz 17278 BLAKE2B 89aae8d9dd92abce1c7b8e198466dee7410fcf74e4657c1c8c15d799c2fdebcaee238300a8b7fbfe0a187239bdc45e8739fd489d61a8bf3d465333d283594012 SHA512 1103eebef6db63ce410f2033a641a3af3457ea9623d138ca7a9506847f1421e6dc26755973aaa1b8e56b3edb9664bbbba915aa39714683b42f42922bfe0926c3
+EBUILD Dist-Zilla-Plugin-OSPrereqs-0.11.0.ebuild 654 BLAKE2B f6376369edbdc49427270e74f5cbfda9f55051d6fdf6a5d610c722e5490fd7f7c1b25a664b940843804f5daa8ba10fbaaba419dda30e4da4ad8b05432246f145 SHA512 505f28953f1954b1180ac2f7ada019af0943937bd5a06c4bbca733545eaae2ebeac9d0a37f294f7cc050e8827dc09dedbb4fd508aed4cdbba4ad2e8aafa5ab63
 EBUILD Dist-Zilla-Plugin-OSPrereqs-0.8.0.ebuild 725 BLAKE2B 09cffe5957944970b26c68d0b89ce861fe1b677c4c9cc645886762c42fe2866c69f53d4287992e965e67c21528711dff75f56b0c3a4e55a8fb4da44f22473503 SHA512 0a62fba7baf653a0f4c6a576e6aa9956a79ab6373b75014fddc36ffba8c56a17f31bfcdb7223199960fe3c74ba853da092a3d5cf566396e06302f4ac9f077fc7
 MISC metadata.xml 428 BLAKE2B 02b2ba68b3220ffcc8eacc552e6494bbf3406740d5fb3bd7945cf240273b8571ab72229af413c14f3035c977790a162de86a9ead927b5ce26a9b3ff81a2020d7 SHA512 1363350441b2275722ae47230342941c7f93b040567a347d4278c62e5a94ede18ad0382b222872417b901d404761f5b95c6d60ef217fad1c6f5f0025807f37e4
diff --git a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.210.0.ebuild b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.210.0.ebuild
new file mode 100644
index 000000000000..2f069f46ef62
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.210.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="No line insertion and does Package version with our"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Dist-Zilla-6.0.0
+	dev-perl/Moose
+	dev-perl/MooseX-Types-Perl
+	dev-perl/PPI
+	dev-perl/namespace-autoclean
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		dev-perl/Path-Tiny
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Version-0.40.0
+	)
+"
+PERL_RM_FILES=(
+	t/author-critic.t
+	t/author-eol.t
+	t/author-minimum-version.t
+	t/author-mojibake.t
+	t/author-pod-coverage.t
+	t/author-pod-spell.t
+	t/author-pod-syntax.t
+	t/author-portability.t
+	t/author-test-version.t
+	t/release-cpan-changes.t
+	t/release-dist-manifest.t
+	t/release-distmeta.t
+	t/release-kwalitee.t
+	t/release-meta-json.t
+	t/release-unused-vars.t
+)
diff --git a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
index 864a8e0f0bd9..07980722a619 100644
--- a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
@@ -1,3 +1,5 @@
 DIST Dist-Zilla-Plugin-OurPkgVersion-0.12.tar.gz 16929 BLAKE2B 72dc0aa25e3a87918e6084ca945b0db6c0da0381527f30e8bf57a3641971caacad97640ed58c27df07da83b151c9434cdde3ad17119b7351cf8264396ac6f0a9 SHA512 6826c222bc402a747a6f7d05a0373b8c2b53121c10c0e5651fde54f389b51bdf45f808d823120f57f0cc75786c7fb7c5f3a2c80f08b7c0754377e97b2375b4a9
+DIST Dist-Zilla-Plugin-OurPkgVersion-0.21.tar.gz 23181 BLAKE2B 2504af202bf8497d43407eafa4622ba1d3112674b07efa72fcfcc5520911d3c56197f0d34a00a14fc1e69fd9e5663766029fbfd72bc6b9483324b2362d2840aa SHA512 b7341dec2cb564e1ff708ffceca8ad63fff4af20a32e1bd0e802e9d897acba19cbf6ab58db9d2ac568e0651d75c503927d52bfa323e0878d0492aa7d103fe639
 EBUILD Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild 749 BLAKE2B 96a171ce0ce0b02db05577d56d0bb1ec1f89854112b7f3b6ca8d9ca287e880e8e9ca4c764a3e86705a8643eb6cd1647656eabaf1690b2f58da7b2990f3f1c6c4 SHA512 f4fc3fc7a875cd309ea354a85314ed2d58216f842ee837612650ca31be698cd061d74f0a995383f0ae7a53fe048c614c95ef72a133e1c9ed8782e205f418ad8a
+EBUILD Dist-Zilla-Plugin-OurPkgVersion-0.210.0.ebuild 1037 BLAKE2B 8329ebd0a7466aef514fa5f573029855d3946ab9e943847492158637198d8b5e701a8ecc2f6d0443edb47a7eb7ec9d40264ada0ede30e97568f135c01adc58a8 SHA512 e5e9ce72a550b599dc495815a1f5f75c04c0d01f459b393fdb5ba82cc347849c3ce1b8de4e58aba010225a5baeaa1c1a371697047b99993ea80a4be51dc1ead8
 MISC metadata.xml 436 BLAKE2B debbc695e1e89de885f5ef503ff5a8ad5f4cd3edca456bfd9cf908e2aabb1b86e5062ecf0eb7e1c0e90781bdfe284c62646089701f3ee664d77a91276cc81f31 SHA512 e95b665557c05305e78a2e2712102e3e0a8f5f630cf5510492c9b58864bdff73c3fb7ed9ccb6cc83252feb9e9d5ad3f5636c6f38706e5a718d06ff37667ff3d3
diff --git a/dev-perl/Dist-Zilla/Dist-Zilla-6.15.0.ebuild b/dev-perl/Dist-Zilla/Dist-Zilla-6.15.0.ebuild
new file mode 100644
index 000000000000..f96f2921b33a
--- /dev/null
+++ b/dev-perl/Dist-Zilla/Dist-Zilla-6.15.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=6.015
+inherit perl-module
+
+DESCRIPTION="distribution builder; installer not included!"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+## CPAN->Gentoo resolution map for grepping in case upstream split a dep
+# breaks: Dist::Zilla::App::Command::stale -> Dist-Zilla-Plugin-PromptIfStale
+# DZA:Command::xtest -> DZP:CheckExtraTests
+# DZP:Author::Plicease::Tests -> DZPB::Author::Plicease
+X_BREAKS="
+	!<dev-perl/Dist-Zilla-Plugin-PromptIfStale-0.40.0
+	!<=dev-perl/Dist-Zilla-App-Command-update-0.40.0
+	!<dev-perl/Dist-Zilla-Plugin-CheckExtraTests-0.29.0
+	!<=dev-perl/Dist-Zilla-PluginBundle-Author-Plicease-2.20.0
+	!<dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-0.161.230
+	!<=dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-Filtered-0.1.0
+	!<=dev-perl/Dist-Zilla-Plugin-Git-2.36.0
+	!<=dev-perl/Dist-Zilla-Plugin-Keywords-0.6.0
+	!<dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.220.0
+	!<=dev-perl/Dist-Zilla-Plugin-NameFromDirectory-0.30.0
+	!<=dev-perl/Dist-Zilla-Plugin-PodWeaver-4.6.0
+	!<=dev-perl/Dist-Zilla-Plugin-Prereqs-AuthorDeps-0.5.0
+	!<dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.161.170
+	!<=dev-perl/Dist-Zilla-Plugin-Run-0.35.0
+	!<=dev-perl/Dist-Zilla-Plugin-Test-CheckDeps-0.13.0
+	!<=dev-perl/Dist-Zilla-Plugin-Test-Version-1.50.0
+	!<=dev-perl/Dist-Zilla-Plugin-TrialVersionComment-0.3.0
+"
+# r: App::Cmd::Command::version -> App-Cmd-0.321
+# r: App::Cmd::Setup  -> App-Cmd
+# r: App::Cmd::Tester -> App-Cmd
+# r: App::Cmd::Tester::CaptureExternal -> App-Cmd 0.314
+# r: CPAN::Meta::Converter -> CPAN-Meta
+# r: CPAN::Meta::Merge -> CPAN-Meta 2.142060
+# r: CPAN::Meta::Prereqs -> CPAN-Meta
+# r: CPAN::Meta::Validator -> CPAN-Meta
+# r: Config::INI::Reader -> Config-INI
+# r: Config::MVP::Assembler -> Config-MVP
+# r: Config::MVP::Assembler::WithBundles -> Config-MVP
+# r: Config::MVP::Reader -> Config-MVP
+# r: Config::MVP::Reader::Findable::ByExtension -> Config-MVP 1.101450
+# r: Config::MVP::Reader::Finder -> Config-MVP 0.092990
+# r: Config::MVP::Section -> Config-MVP
+# r: List::Util -> Scalar-List-Utils
+# r: Mixin::Linewise::Readers -> Mixin-Linewise
+# r: Moose::Role -> Moose
+# r: Moose::Util::TypeConstraints -> Moose
+# r: MooseX::Types::Moose -> MooseX-Types
+# r: PPI::Document -> PPI
+# r: Scalar::Util -> Scalar-List-Utils
+# r: Software::LicenseUtils -> Software-License
+# r: Sub::Exporter::Util -> Sub-Exporter
+# r: Term::ReadKey -> TermReadKey
+# r: Text::Template -> text-template
+# r: strict, warnings -> perl
+
+# NB: PPI::XS is suggested by Dist-Zilla, but upstream of
+#     PPI say PPI::XS presently doesn't do anything useful,
+#     so the optional useflag and the dependency are skipped.
+RDEPEND="
+	${X_BREAKS}
+	!minimal? (
+		>=dev-perl/Archive-Tar-Wrapper-0.150.0
+		>=dev-perl/Data-OptList-0.110.0
+		dev-perl/Term-ReadLine-Gnu
+	)
+	>=dev-perl/App-Cmd-0.330.0
+	virtual/perl-Archive-Tar
+	>=virtual/perl-CPAN-Meta-2.142.60
+	>=virtual/perl-CPAN-Meta-Requirements-2.121.0
+	>=dev-perl/CPAN-Uploader-0.103.4
+	virtual/perl-Carp
+	>=dev-perl/Class-Load-0.170.0
+	dev-perl/Config-INI
+	>=dev-perl/Config-MVP-2.200.11
+	>=dev-perl/Config-MVP-Reader-INI-2.101.461
+	virtual/perl-Data-Dumper
+	>=dev-perl/Data-Section-0.200.2
+	>=dev-perl/DateTime-0.440.0
+	virtual/perl-Digest-MD5
+	virtual/perl-Encode
+	>=virtual/perl-ExtUtils-Manifest-1.660.0
+	>=dev-perl/File-Copy-Recursive-0.410.0
+	dev-perl/File-Find-Rule
+	virtual/perl-File-Path
+	dev-perl/File-ShareDir
+	>=dev-perl/File-ShareDir-Install-0.30.0
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/File-pushd
+	dev-perl/JSON-MaybeXS
+	>=dev-perl/Log-Dispatchouli-1.102.220
+	>=dev-perl/Mixin-Linewise-0.100.0
+	virtual/perl-Module-CoreList
+	dev-perl/Module-Runtime
+	>=dev-perl/Moose-0.920.0
+	dev-perl/MooseX-LazyRequire
+	>=dev-perl/MooseX-Role-Parameterized-1.10.0
+	dev-perl/MooseX-SetOnce
+	dev-perl/MooseX-Types
+	dev-perl/MooseX-Types-Perl
+	dev-perl/PPI
+	dev-perl/Params-Util
+	>=dev-perl/Path-Tiny-0.52.0
+	>=dev-perl/Perl-PrereqScanner-1.16.0
+	virtual/perl-Pod-Simple
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	>=dev-perl/Software-License-0.103.14
+	virtual/perl-Storable
+	>=dev-perl/String-Formatter-0.100.680
+	>=dev-perl/String-RewritePrefix-0.6.0
+	dev-perl/Sub-Exporter
+	dev-perl/Sub-Exporter-ForMethods
+	dev-perl/Term-Encoding
+	dev-perl/TermReadKey
+	virtual/perl-Term-ReadLine
+	dev-perl/Term-UI
+	dev-perl/Test-Deep
+	>=dev-perl/Text-Glob-0.80.0
+	dev-perl/Text-Template
+	dev-perl/Try-Tiny
+	dev-perl/YAML-Tiny
+	virtual/perl-autodie
+	dev-perl/namespace-autoclean
+	virtual/perl-parent
+	virtual/perl-version
+"
+# t: Software::License::None -> Software-License 0.016
+# t: lib, utf8 -> perl
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	test? (
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		dev-perl/Test-FailWarnings
+		dev-perl/Test-Fatal
+		dev-perl/Test-File-ShareDir
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+src_test() {
+	TZ=UTC perl-module_src_test
+}
diff --git a/dev-perl/Dist-Zilla/Manifest b/dev-perl/Dist-Zilla/Manifest
index 149e60b05a9b..326b4a82ea37 100644
--- a/dev-perl/Dist-Zilla/Manifest
+++ b/dev-perl/Dist-Zilla/Manifest
@@ -1,4 +1,6 @@
 AUX Dist-Zilla-6.10.0-perl526.patch 1963 BLAKE2B 23237b2231fa160beca39c06d15bd82148476c2b3c44bdf7509fcd7c52931aeda4300bbc64c4f50257f26a8323f4ec0fa824e15a78853455a980c22ef23f2cee SHA512 bc2058c71160be5cd191e46e19d245070d2f4f12bc2f067c702757e30394aa1bc986d055f40303716e3da85bc48e40c31683cf21bf495da634f983227c20baa7
 DIST Dist-Zilla-6.010.tar.gz 198805 BLAKE2B 82c5792f81174d74cd917e77f9e3899d0fc8233b6a36147618cd324dfc672c47e91305b2e5335a376846a8f25a5ab1b6d10c5ce1e11def5eb17a7af88d03e12e SHA512 707a736c43b1a52038a01c2e238ac39fa35c5eb7120c7fa11a06248f5fc3518c5c75e3660553058085c5b930e6df6cebfd1957435b78ae48f8b4d45d3b99300f
+DIST Dist-Zilla-6.015.tar.gz 202822 BLAKE2B e26d50d7cf90940e3e003f1d056885481878aec8a2b16ed8413c237aeafb878bc002ee231a0edbdc4b5fd584480f1b245b3469a27a2c5edc93fd79a57de96dcf SHA512 956a32d2123fa371f2589f2d18d87b6408fd13ebdf0e711da4cac8ebc3dd82accf9e97d6dd577d69bf795c589b7246b9f9f1124835a6dcdb89730fdeec547715
 EBUILD Dist-Zilla-6.10.0-r2.ebuild 5090 BLAKE2B 5652bd38017e7257a2c6793a8843375871ec9830019c60c5a61c5dabe8568c94b7832ad87a9bc5a07ba4a1a42d0d1b6d221dd0ea5ad8f8ae74df2e71d4a533f2 SHA512 8ef90ae082eeabc52d2dd8d32121f423594a4be7d61ddf055dddde15c6d25a67986f406d0fde283732f841179c0eef2174191badaff131819128877ea5584514
+EBUILD Dist-Zilla-6.15.0.ebuild 5022 BLAKE2B 009794e51cc27c0dc1575d31e4e0899b3f14281834d0c84e47b4af294d20addbac1596abf0fed05028aaa2a0fd8f301360ff6ef116954ad81dce7d9e7f24175e SHA512 b79007778dbfd17edd877c204c93a49ee24a1d7dc6a97a3d27cc279fa4964b21f71106083a1844d0c526a2f4e440935cfada4ad8e9bd30c33390b6db6ee769c5
 MISC metadata.xml 11020 BLAKE2B 583f3f8c1e23b7ab140c69e3b1beb6d95cea0a88499735f5ded96a97532da6692efe11f0cb0247ba2ebb7529eef31f99a842a03be3083c078b1f059065dfe460 SHA512 e4fb36dd97e7e8d984a9eea534b194df7943458525a893f236396ca6bc2e361aebd4d977a48602126c166a111fc0b1f70e3eeeef55c1029a504c2c201abaf178
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 13db7e1e98c6..8bf1cd069c50 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Types-Path-Tiny/Manifest b/dev-perl/Types-Path-Tiny/Manifest
new file mode 100644
index 000000000000..5be13d75208c
--- /dev/null
+++ b/dev-perl/Types-Path-Tiny/Manifest
@@ -0,0 +1,3 @@
+DIST Types-Path-Tiny-0.006.tar.gz 15614 BLAKE2B bd35285a3e53f1af1d813eb485aaeb98f7c8ea07cac6b81ff223bfbaacc551364f3b349b88c48c5bce6439529d917f45fbe1fea5013b51ae392f203f6ba24c64 SHA512 9820b5e23bd916895d64573273dd0ffcf8fdc1f0cf6af2db02400bcbbc3611628f03e2ca83f9297dae3b28784279689ba40256f94f0e7ef841bd08e026941b0a
+EBUILD Types-Path-Tiny-0.6.0.ebuild 581 BLAKE2B 7db45cd2211a1db37148b6efdd70c0078440d0a96230e4613f1c2fda60bb43779af5dec9161006272732191fb8e4ad929ee0338b969814d0ed587520ce729297 SHA512 7b4e6125e27a583ae020537e6c83d4fb5e5b39aafde013ced18ade13d1e70bd7dff22a3fc291d298324776ef0b97fa919c2d4680e13b0674214bf68ebfc7ddff
+MISC metadata.xml 403 BLAKE2B 83263bc3aa26b20890acfd0ecb3f8723fbb9f84a5f5ff577f1f1774e97ff167776d4e7bfea6239f37977cf617bcfa36c270ee8fffc6fc25021b0f4014b1baa06 SHA512 23d00aa3100834beb9d8762af643c9005dc76f3cec6ba4784c364b51ec3c93586005b298516aab377ca50de3c4e37440cce59e70e8074e763eef588416e9e6da
diff --git a/dev-perl/Types-Path-Tiny/Types-Path-Tiny-0.6.0.ebuild b/dev-perl/Types-Path-Tiny/Types-Path-Tiny-0.6.0.ebuild
new file mode 100644
index 000000000000..21b2f429b05d
--- /dev/null
+++ b/dev-perl/Types-Path-Tiny/Types-Path-Tiny-0.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.006
+inherit perl-module
+
+DESCRIPTION="Path::Tiny types and coercions for Moose and Moo"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Path-Tiny
+	>=dev-perl/Type-Tiny-0.8.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-File-Temp-0.180.0
+		dev-perl/File-pushd
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Types-Path-Tiny/metadata.xml b/dev-perl/Types-Path-Tiny/metadata.xml
new file mode 100644
index 000000000000..7916e6e08b35
--- /dev/null
+++ b/dev-perl/Types-Path-Tiny/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="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Types-Path-Tiny</remote-id>
+    <remote-id type="cpan-module">Types::Path::Tiny</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fb2b018de1eb..99000ba186da 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index b4c665eec664..89ddd2fbbc2f 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
-EBUILD PyQt5-sip-4.19.22.ebuild 2149 BLAKE2B 2041761c23aedb1d17596f59ca891e3289f730e907c1aa46c0e809e98364e2fd8cb34cbaaaffb3c08facfadd37304b6c8b685814316632a8ed5fc15cfc6a0105 SHA512 b023c90e43e30376b95355abbe66df3160995c0bb352db01ced54dfcf264bff486f677c1c28831c8281907b3b9e62c1897adf72dc96d253eac75246cadc8139e
-EBUILD PyQt5-sip-4.19.23.ebuild 2153 BLAKE2B 5d6c9245a3db34b81ac48bfc4662af00413ae10f873ab6754d33afee233e08868daecfe793824182f2b5cb6807605a1417d4c097c18b26c2bb7e1494ce65656a SHA512 3b67f2da95af4cc32c82723c533ad28a163c4be2169a2d9032e04da491e66e2601e887441e46e72fe59e04365576cab95fa1f72941b19949d5907c5a009d67e5
+EBUILD PyQt5-sip-4.19.22-r1.ebuild 2053 BLAKE2B 0925192dce6fab7d8106f83ec522c8f1a9828f5a4a8a654370adf75e82c427453a3345ec9c6f005b5dc861c5b60a92c909077624a87a455839e5db5b13fbf6bd SHA512 d12679262992b88569f41a66b1df7c38c4330f0fde21fdf874081066459581131ac6ddd883473268cf797502f36a7f4f14bfe870abc042d61cc1450cb9099db4
+EBUILD PyQt5-sip-4.19.23-r1.ebuild 2057 BLAKE2B 11461c7345631242eabc7a8f234cfcf6effefb678d7104278e8b13ef194bcb85522121e19ffae23c980a6ecf0bf7de1593fcccda00c8ff67e548e6d7c4fea32c SHA512 e846c688c4732add0fed0bb4b971c880becbcea2728e4a510f9d7dc6de906a0ca743405a060866c56b6f0ac2d04e9a089b7ec17419a16600f366a14b38775c3d
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
similarity index 93%
rename from dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
rename to dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
index a69499758b4f..9313ec901ef5 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
similarity index 93%
rename from dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
rename to dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
index 2c211f51a220..c61529a6f32a 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index bb19bc694766..be78bf3e22bb 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B 0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3 SHA512 56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
 DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B 6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f SHA512 35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
-EBUILD PyQt5-5.14.2.ebuild 6055 BLAKE2B 78fe31e1a5f1fdc6a6ac41f20529a4b11adae36219fc59877c95eb535aff360a91d38adff5e05302b8073cb48c7e77c5aba27eb37e7db397e14753c82f400e33 SHA512 513a2652d9a9263bc3af836b3a85ec54bab56e5073b23eb7367cd0d8d4efe79572d94ab90ed212d2c96cb25c5d2a25407c72979105bba80a04ac2ebf78bffc2e
-EBUILD PyQt5-5.15.0.ebuild 6067 BLAKE2B d0cc1bd723d1184fad838bc87931f495bf65b0a246de487fb33827d9a68ac159e7ada3014bd0a12a570d55baf28bd3ee549d7f790fa65b9ec7375ae01fcee3e5 SHA512 9bc5abbe91c29fb6721fbd1c60c2d2076a8fb969490ca2ec6c8099e678ea6687b819e5dea55e7413fce12f69ba3616f383c3a45df148c4a8fe00eb28589ae6d4
+EBUILD PyQt5-5.14.2-r1.ebuild 5728 BLAKE2B be7eb17461a7de96db7093a308760f5bc8e7291cf33c85a3ec23cd587c06448d27b83d91c2359ef6bd5f2fd0fa07ac8839e79bb378e9314ad14e20c08ae79ce4 SHA512 6a29fbc177ee262d0f5551b3246d2512f6f2ec0b47db991a0885372c5c0afa5ce8a4d3e712791746894b90a334ce5bc33649b6a290ebb2d9c7a96adfc77c6c85
+EBUILD PyQt5-5.15.0-r1.ebuild 5740 BLAKE2B ef0da446f5bcc809cd0bb1c1d194a6183cc0dba0ddeee12658995d127542377d19bb75c46a4fbfa9353f8462b4f74cca16b81e5bed03bd1aac2dbaa5f8ddf461 SHA512 2d077f9eb58f623f835cdf0d13a8b5686037a553e4bad4ad7a14771fa58e0234f9ed9fecc580b43d98430f09afe101431e3b1098467960e6cf73df19740bb107
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.14.2.ebuild b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
similarity index 90%
rename from dev-python/PyQt5/PyQt5-5.14.2.ebuild
rename to dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
index 04c639a05ba6..6f47872f089c 100644
--- a/dev-python/PyQt5/PyQt5-5.14.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -54,11 +54,7 @@ REQUIRED_USE="
 # Minimal supported version of Qt.
 QT_PV="5.12:5"
 
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
+RDEPEND="${PYTHON_DEPS}
 	>=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
@@ -156,13 +152,8 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
@@ -187,11 +178,7 @@ src_install() {
 		done
 
 		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
+		rm -r "${uic_dir}"/port_v2 || die
 
 		multibuild_merge_root "${tmp_root}" "${D}"
 		python_optimize
diff --git a/dev-python/PyQt5/PyQt5-5.15.0.ebuild b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
similarity index 90%
rename from dev-python/PyQt5/PyQt5-5.15.0.ebuild
rename to dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
index 3d51e939103e..075b00012939 100644
--- a/dev-python/PyQt5/PyQt5-5.15.0.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -54,11 +54,7 @@ REQUIRED_USE="
 # Minimal supported version of Qt.
 QT_PV="5.12:5"
 
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/enum34[${PYTHON_USEDEP}]
-	' -2)
+RDEPEND="${PYTHON_DEPS}
 	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
@@ -156,13 +152,8 @@ src_configure() {
 		"${myconf[@]}" || die
 
 		# Fix parallel install failure
-		if python_is_python3; then
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
-				${PN}.pro || die
-		else
-			sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_qscintilla_api' \
-				${PN}.pro || die
-		fi
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_qscintilla_api' \
+			${PN}.pro || die
 
 		# Run eqmake to respect toolchain and build flags
 		eqmake5 -recursive ${PN}.pro
@@ -187,11 +178,7 @@ src_install() {
 		done
 
 		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
+		rm -r "${uic_dir}"/port_v2 || die
 
 		multibuild_merge_root "${tmp_root}" "${D}"
 		python_optimize
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 09a4a3fba918..e58535cd1204 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
 DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117 SHA512 1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
-EBUILD PyQtWebEngine-5.14.0.ebuild 1676 BLAKE2B 2efe92296137c658c62d9300062e6b649c9be91b4a3dc1633d8b4b4ddfa65c34fec81bea0aede6db1182a86a9cae1931366277ca2262cfade1c3c159aaba817d SHA512 876c06b3f50d75cacc473109d5c859f99070606cb6e5ad9322d02704e9a0e6057876498cf979d84834e45d1043795a6c90a4e819b87db6a11392c11a7069cb0d
-EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1678 BLAKE2B 3df1591f025cccc318c3e012a9ce546a3875fb23329a3b812028a0f7b5a692c6390ca5bce82a12a3f1bcac464b7eae1d8a5e14d8c2e0f27752df00e808a271ea SHA512 a5cd1bb633b3fdaabcc4e6754e9f78ca8f81b77c55aca410d436207483c52766b0415a1486921ebffe934a5acf5b1037a4fb2360ba8c16e43ed469d3720ef633
+EBUILD PyQtWebEngine-5.14.0.ebuild 1666 BLAKE2B 50ceeff152ddfc9bd8809eadf514ed5be1363829d7533d4431f7ee5d23a6d3d172dd96303912dd05770391b633774c2931e11ecf9a1eb9cb5b10294f25a557a7 SHA512 ac328a51e306f15d4fea2101968dab5df731935642938915bc62399ce9eacc1a79bb5666af51594db0d37efc1ec9efdcc6d4168e44eb7c6d9a6e54515ec4c0a8
+EBUILD PyQtWebEngine-5.15.1_pre2006110847.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
index 7846273daf9f..0f869cca5363 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
index 4d322572d51e..94183f43f9bb 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 66cccf5f8c19..91a78c7f2098 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 498 BLAKE2B 59da5e0a5dd9f35b1391503407de56f2da9b25ff32d52a82bc3b5ee957fc7abbbd3c29106861956f59cc49e347c4973f7aab8d0c9d8f804bc9323e0ecbed15a8 SHA512 19012152550039a37ad3d5be8c43024dd689b07e239b5b821d1e8e1fd7ad96481ba5e5df61e9273116c440cf84c350556bb0502f50ec72209f111e328381886b
+EBUILD alabaster-0.7.12.ebuild 488 BLAKE2B f95fc935d4f3c01d9c109f2cc679db941d62b8be857e16c484566db9e67b3f1af38c78066aeb07dbfe624bdcb40e71703353cd84459e3bf9fbf5fc99f5b166de SHA512 084df9a711ba85503712c8a1ba3ee8360a6b0dea6177116abbdd2a0ce4d8c0dbe33890b15866274a20ebe6579ac935e986a9b4ce5dd639d0ff1bf3ac34e91d9c
 MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index f4bf497e0911..fca86004f512 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 007c78b57065..4b6e2fa8a554 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,3 @@
-DIST amodem-1.15.0.tar.gz 28779 BLAKE2B abc2afbce47cf5e3b2ae34bd54228618e887b3f0b919d421114ce5e56e3e8a14477f130f03d77851c1e256afb22d4b657367c8e59954438dec72f3059278de64 SHA512 5d39e08d47410a55c218ed2dc5a413cbbba602fe1049d3e8824ca62b439d029c42294b2a17e4077b2c746336b1471a4a94ffa19b9eb3145869dfc158404bcad8
-EBUILD amodem-1.15.0.ebuild 446 BLAKE2B 2ab6154da631c158c329491386f7facd65116ed1f408e3b4b2bc0ac55e6358381427006a68d1ec2214c556b52e53f288a91495f62db95f30109aa788a870b7c2 SHA512 e30e00c50d3a0499a69818918ecf199a79f561a6c64220872f74e9160358f4eb776a77574ded33b1e7c2475805f3a7f8100957b358eb3aefe440414e31ba2734
+DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
+EBUILD amodem-1.15.1.ebuild 485 BLAKE2B b0485af0cc92db054467ad8c96893817a4711f4d06a6f0564436c6724908ca7e287eac3deb21334cb396d3adf5497115b5e2bb99ce879d7223aa1bb7dff02e1e SHA512 93cbb086208a00e9aaa94e1d369ac725de82c6536da19bba537ac143badaa901a32c7743dd8c38878a2972698979fe3937fb5357d51187e2dc0528403d87b9be
 MISC metadata.xml 514 BLAKE2B a9a520e6446c6d3713bd0e56d69d19f2ff0731dae551184279ade5591b300446f4fb2b4db14f495fbca2bb3fa126de168e6c0d8d27fdd8ac3737b15c7472b997 SHA512 6544f7a44ad78931b88b85d7046dfc03967076efc5ff5395c44a84cd7a649adb1bce38221fb7d86c4569cfb912ae4fb0ddf031f27109fbc8ff60e187f4eb4a83
diff --git a/dev-python/amodem/amodem-1.15.0.ebuild b/dev-python/amodem/amodem-1.15.1.ebuild
similarity index 83%
rename from dev-python/amodem/amodem-1.15.0.ebuild
rename to dev-python/amodem/amodem-1.15.1.ebuild
index 99aa9b456180..6936d0183c30 100644
--- a/dev-python/amodem/amodem-1.15.0.ebuild
+++ b/dev-python/amodem/amodem-1.15.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,3 +15,5 @@ SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6fb8e9e49578..d1f3579d845c 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,6 +1,6 @@
 AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009afe8e98f8bc4529db2e4a5aafecce674f0cd4dd8e6e1354b19f00ed9f2afefc8038e938713872115613545c51933ffa6e4cf1 SHA512 0d187868ecf3428d0840fc97311c542c782a938cf039caa777e521a9073b525d3dd0a8e376ca9fe0dd4260313642854b21a0bd3d9c2f9a3fbbed8b4edd6ed3be
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
-EBUILD argcomplete-1.11.1-r1.ebuild 902 BLAKE2B 7107fbf5ad5da5e7873d8ba06790faef1eaacdf72d75e9c05c36e3ff0c5956b66344a19fc21fffabef884dbc914819f2e5497e19ab04743e4ef392165381db3b SHA512 42f3b17332bd501981f32f5c450c89b8f67af722cb10a9ea2969f130aa8586356dbe141c277e25d45688fa1d93913a39d6c6378bf920834afa8e2ac0d71b5a59
+EBUILD argcomplete-1.11.1-r1.ebuild 901 BLAKE2B 1770d3cfb95776575473b61d203078f79530692ea255d8e153647fbd3c5782e87ed61f2065a5c9e1a334b95e641f192b2a2fe98a1e8d031abd38fa32691a2db1 SHA512 92f6c8b4a13575eb5266c0caf76092ecef83bf98c1c9815c55eaa2d17bfa0334fbd15588f9ec0802f84f262201d1dce0a8b8c93adbc4ffcb268436b794458e85
 EBUILD argcomplete-1.12.0.ebuild 844 BLAKE2B 42021b83c0918fb48df9f65a0c3acea7d051b9f29c388d3bc4760cc677b87e7e347f6fb04c10bd26095ac35e8bca23f0d81d8da8857bc913af999ae05370dd48 SHA512 4f68e8e8e613f4845a854cbb0be8e64f10fae5620271dc60f97f6298dd970401feebd84ed9a759886d77f0e3eb423afabcf271d8f436b2624056679d1d5feeb4
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index 7fde36f6b5ab..254bb7d63ec5 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.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="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index d72655685446..8f00cfeb7513 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,4 @@
 DIST autopep8-1.4.4.tar.gz 114796 BLAKE2B 0eef2550e2e13a79e4c3199dae119ed49b13056d9bbd98be5d9e4c7d0288d12bf6ad30162c0e4c485f6de9b47b4b6ecfe92dcb278f2cb265b75e395bdda77aa8 SHA512 06822df7cd02c68980965c1fd987dec03785e155554ff0f735dc707c4de99b4d152b0d092e21017ec5d9176b33bcf22f3ef2b0986f38faebab0928443eca4d32
-EBUILD autopep8-1.4.4.ebuild 828 BLAKE2B 5165808ba2ceebf03711638b4bcc118e07500047bb8db18627578dbc344e9149cd98dc87367f82be89e331400926ef70d2bdf1ee0ad2943fe7399b9265ae277a SHA512 b1f3adfd7ef7cee3e180cd8d2307b20ca08bb826de128652945f63127e6e0643e3426945fa92faca1608a2ad5ecc07efb9184ae23b6ce90f00a40102a7b4d717
-EBUILD autopep8-9999.ebuild 805 BLAKE2B 2cf72deacc03c5063d3230e6d2c1cc2cac0fa5ae320be4e14e107286c69036774316d9ea79771a8253986841d575d844370ffb151e2ce3b6a09ca0a693eab0dd SHA512 ac92e7ec145f7186806a2e0a7c85e081cc0d997894718135f7f944421d000ac6b69f890ffda6406880f0ccf15b77fd7d51d70d74709625ed31e05739e68e9b3a
+EBUILD autopep8-1.4.4.ebuild 822 BLAKE2B 166a16771249241a262188451b1d0ffdd629bc8c6755b804a7f4bd1bf103bb99dfdcdcf96e1ff651b6442bcfb847524809e58724d493ee01d483c53c1c9196cd SHA512 ee8f3ef92a8454b7d51a56e42c5373f5ff3861d5a92518926dc96ee83c2315e41fc5605fb737053bb3db2661a6aa378dc4d507c4167c3675a872653aa05d7ac6
+EBUILD autopep8-9999.ebuild 799 BLAKE2B a0a3cb93be6e0d566e42a7f92906de125f88e7519c3c19852977567e08e44c39059af4ca53c6c6741689d9633df6317d0e3bf48fc29ba137ebf66d0778977348 SHA512 79ad3a98848af6ca1cf60a4dda33b6adf41e5e0fd9e6ef13b3c04bf61ce060c6111962d35d0e894e909fabb9a336cb73b06674c6a573baada40a22de5b803dcf
 MISC metadata.xml 378 BLAKE2B c45e6a1e950f4288d6bf63969fb59c426a483c9e27294b6aa18c85d827f0cbce3cad2111852f6c7bb9347a17650b92b98fc3234989742459c57652fb6600adcb SHA512 e7ac8c3772bcdef589f909947f23d6c97d09ca98eb3aafbd88cf4af53ed56c12f85741e0d8f872ffceefd59012e11f4c98939b0daa79590255685cbbf04acf80
diff --git a/dev-python/autopep8/autopep8-1.4.4.ebuild b/dev-python/autopep8/autopep8-1.4.4.ebuild
index 1370a111334f..df9895f59c98 100644
--- a/dev-python/autopep8/autopep8-1.4.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 136de80ed7ad..90456b8815b5 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index df182a12e4f9..73d182b6ca89 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 2f5dad5190c8dc96f83b3233313cf5b5f65d2ec9ac096ecb8370eacee5f2f22789cab327fdee9c00bf52a623e6ee1a58a205dee73cc0b32bbf9346d3006acf25 SHA512 68f18fa7928d3decb16da32d926318cae7553e6458fc4eda1e34e58fc56aa6400c5b84dbd0b8e329b4654bce033b5051a745e2d368971967fd5294d4577f13cc
 EBUILD babelfish-9999.ebuild 521 BLAKE2B 331b3daca4d202f1aa39347f55861455ba9039f013c2847cdf7a8ef3206f85c601916910a776e8907d28247e49d24994dbb020a56ba6bd1feba843d523881b91 SHA512 2568a358b19b9b2b91fd2bd04f0e275dbe1bfe43b78f6d2d55bec9aef5e2095c74a220794a3bfb1cdedcfce2510a63003ce1452556dab9cce5afea78db6dfce6
-MISC metadata.xml 295 BLAKE2B 8753e4e51cd05d5389050cea0d9c1c105c22f795affe060fbcd4b8746e8ea4bb0c424e6c431678e820b358c599f4cf32e5d716da9b37ece8c9897a73ab4b44e6 SHA512 837f0811f7168be64415b914c7d36900ef1965bf133d635e5e61f1fdecb7bb6fa462fafc7a794ab1264d7603d748fa0d65c8a176dc1b89962561a562b7b4eaf8
+MISC metadata.xml 319 BLAKE2B e16594ed95b5c5fe602a2606ce330499c9a42a5b8f5ef45ab1e23c27fa2c3bd83c2f9c9c9338ac93890dd4f13bb50968edea9573b73096687e04c00971a7e954 SHA512 0b2b5fe7e255f3534eae94b6d637ccaa16695f054454d15d93c3972d530b0311defd67f8aa9e7c4a0ec43ab55baf29ff78b6ae48fcc1a0e90bf9c2fab4ffda75
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
index 70240e51bab2..600c19293e34 100644
--- a/dev-python/babelfish/metadata.xml
+++ b/dev-python/babelfish/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/babelfish</remote-id>
 		<remote-id type="pypi">babelfish</remote-id>
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index abcffea91873..d0b45fd8720a 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 1017 BLAKE2B c7dc0528213d02c07d9cfec42c652df2ec5458609fc98dc46e858a7b2fe2119f683523a33baa06c7b3fc9f779661eac0dd7b7e2666e12e48ccb7602e8cbc6279 SHA512 914aac0b3ec46296b2949529eeb2cae326227fcf83f55737cf329fd1694bfdc8b360bd91ed04d97bcc1e7d4456f1b9a280cedc6a1d7550a36ef76f88a974ee11
+EBUILD backports-os-0.1.1.ebuild 1007 BLAKE2B 8b3b739ae3db9f2387bc681bf8e48574bae2cb434d337f69fe36c81c6e507337ab17cb1496f00edfb3f81483a518540f62ddafede294cd035769f243d0fb1a3d SHA512 5cf3d591cbed44976237f00f89feaa5aed8c8be1ceb6c96a746c53d738e7446fd4fad6aab46055315c565849bb79038e7d556c6c16380163a9ac60760473f382
 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 eab837aadda7..ddb578ca2545 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Backport of new features in Python's os module"
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index fd6fbb2d27ad..084242097778 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,3 +1,3 @@
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.5-r1.ebuild 1611 BLAKE2B 293b9b36a5e8cc3b26cda944c606b48116096f7760483fc296cf56dc2ee8e8c21166f9a6f97473cdbfbaec3adc47f7a0cf94a53593400c0e2021a9b53a4e294c SHA512 d0d3c4dbfe4c2d0f8d145dc5dafc607ffb86a34b55a567c96628aa8a79a556fe110431937e17a15ada103e7dbec2dc423f703d1645a4e29ccbad9430b0a132bb
+EBUILD backports-unittest-mock-1.5-r1.ebuild 1605 BLAKE2B 2a56838ba5cb467358546852341ede30f043acb9a44960b118cfca128d5779f74f6cfa1d304f0d618e8e3a95794be0d0f687c036c5593bc5e2ad53c9e01b5654 SHA512 79e96f3c4812a8ca16709b07edb8377ad8a563379f2b7027dbe0762f897a99ef73432ec53f2ccf956051070270c749fa8ce4a1fc373361890cc60551772b746b
 MISC metadata.xml 681 BLAKE2B 22de012464edfac5f0affab83c4cad95d416b1c822f9f50e788e60cd4a5d438ef3ece606c55621896ffe1778c1d17595c23449bf41199b964a7c153cb98e90bb SHA512 161c7de36344fbeca29706e7a7e12b9acb1e22ae82dd179b336054b64e04bea7a5af53386c0d4a06b45584146103cbc8546e83e6f5aa51eb345243aee8a6bf15
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
index d81eb8d9fa1b..3cc0eb0d8c6d 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-weakref/Manifest b/dev-python/backports-weakref/Manifest
index 3bbc1d48933f..6445cd6dc676 100644
--- a/dev-python/backports-weakref/Manifest
+++ b/dev-python/backports-weakref/Manifest
@@ -1,3 +1,3 @@
 DIST backports.weakref-1.0.post1.tar.gz 10574 BLAKE2B a53a64dc22d8d1ac93a157bef4a858156f620593ae3d9e69b99762298e9aed73a04fd0557d98f53eed8816e746869718bc028aeda619330ce7c031f8b6f346b1 SHA512 27fb7ffd3313e62ca5ac220efe5ce0a9ae2ba8a589c80d3c5cf98741e913da7f713e1ecf2af848510383f574fa3bc3b7b3c21e6696f0a252fb517fe836c07cc7
-EBUILD backports-weakref-1.0_p1.ebuild 1129 BLAKE2B 73efd969a264e6c192d110bd04af55682f811fd460435fa4b6a02fbd1b7ab6f6f3d8d2384c7002d00c8736c7a4c6351c128485657cb5af2b74837de4afb5f49b SHA512 f67f7bdf4cde85156956bc9706b3e0d37d3e4b2d33cfed3ce31e7b4298dedc397b08c1047a4a74e0934dc77fde9bc9466ee7c855d16524636b34bc4378774ea0
+EBUILD backports-weakref-1.0_p1.ebuild 1119 BLAKE2B 8a5ed2462f8df606eada517542c7149f144fa7ff5e047624d8d1b570064b573fc96dfaa82b3bbfd8dc6b39903dda524b1cf747568d6bbb869ea06f57e18fa0e1 SHA512 4ca1c2ee7ce9efd0ecfb8e11ad5df6c4f40a22b6289eda35c94327cea46a257e4cee963e50a1871af6f5f3c7cee597179c907d2158d69962f4a5c0cca41c37c4
 MISC metadata.xml 466 BLAKE2B a722c32d4462c21ac4fc1ce66a92571a26c283d10cabb187a8cc107604632c4ab79ad74290e07c318b3ee634a624459b667b9963c2a0a8485c470fba6ea982aa SHA512 77a6a25be5149dd2b146364f46e70585320f03cfd88f037f012df3601a8d74c789f33ab111d99d77667cc41be80050b398536e0b687014ac094436a7605b62d6
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
index cb1d11c06227..92fe99eca4fc 100644
--- a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1.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/bareos/Manifest b/dev-python/bareos/Manifest
index 6250b102dfb4..560f2f8fd2c7 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,3 +1,3 @@
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
-EBUILD bareos-19.2.7.ebuild 535 BLAKE2B 36e29280708faabef8209da385989a966e9334ca6bbb5c6401c349f8811cb66c9230feea6c2c33d0237cf4a31401c4ae6ea2a7ba039f1945baebce445a683fe8 SHA512 959a4475cc6ef5e68fa4ff10d6226320e41fea65a09ba07228ea6cf60b7fbe2c2f2ff9180e86ae309db2f1771ec82c151f4177c23b1351ed7a6c2c7ae0cc3cbf
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+EBUILD bareos-19.2.8.ebuild 525 BLAKE2B 201f92ac9f2846588d9a5a50ed424417a1e35b5e9dc5a0db879b88f0cdc4ce2f21e999e7a3495e7e63430a31e34302b8fc87aa71a14c489d6617d41a5e77c7aa SHA512 f65b7da77d707f0e258513e9bd5a16a2620e4b8dff0e9e07cbffddbdc19e7b1fa55cd764b3baef5c977a8b2704e4269acf034e4747e8317d4392e05de9719056
 MISC metadata.xml 328 BLAKE2B 47dda9d82b55f78bbf9b78f8ac463db48ede507dd62dfecd1fec01426e834f2669203956b0a5da31ae133bb0f362ab1263123318babf65abaa6619e1feb209f1 SHA512 c16ba92ff73595406f24c4f2cb18bb2059d7990273d2c91c4f83486f1349ab0ca3d709f27f929956987b60a24ff8426687dafc7f79be0d32df0a176ee2528d93
diff --git a/dev-python/bareos/bareos-19.2.7.ebuild b/dev-python/bareos/bareos-19.2.8.ebuild
similarity index 91%
rename from dev-python/bareos/bareos-19.2.7.ebuild
rename to dev-python/bareos/bareos-19.2.8.ebuild
index c66b7e5732e2..cb507a579a96 100644
--- a/dev-python/bareos/bareos-19.2.7.ebuild
+++ b/dev-python/bareos/bareos-19.2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 inherit distutils-r1
 
 DESCRIPTION="python bindings for bareos network backup suite"
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index 34c10671e4d5..5d58c981d48a 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,3 +1,5 @@
 DIST blessed-1.17.8.tar.gz 6697594 BLAKE2B be279f1962e8643fdd2f03c63292700ebcdd89f29163f72de89d649990663e9677391a134e19e97fc51c64341f2efc9dbb8a13a467f864c04341a55fe31a87c1 SHA512 fbdeea8159f535824600bd4e9b080998d0a8336731c1d53ff5b89c7488363d35b87752b8e424317f64f2b90aec3c62ce3368503b1a864a67c1de48245dc2fbbf
+DIST blessed-1.17.9.tar.gz 6648453 BLAKE2B 75de7585de7712cb4314ca22fd30ea811e446e1373ccd9a8750526e9fd0b5ea31d4bd0cedbcb35f7814bda32c75f8d58141beb32f131cc8fcfa127e89c255c25 SHA512 0ead3e3a4b96213acb2834fa8a0d8f0c590027a1d3bd49253ea58af9da55fd687beea6b5dfe3a8f7e6f9868967e24e468abcbe260a3cd55018f32d7b81a58d6c
 EBUILD blessed-1.17.8.ebuild 1246 BLAKE2B f91427e6e66f6172c9d3ac7585ce6c6863d8fc9290313ee38967961d86d28d87138cb121ea40dfdc0a4886d99f69d82fd358eaef6d64d9e28fb1a209336c37ee SHA512 adade6c585167ca0b8dab2cc7d98bf466a3e3e958905c0ead79d0151c5c1596105c8b1e9deca72dddb6c7e30c7c6246e1f9778ffe66a32b2abf364e50cbce5aa
+EBUILD blessed-1.17.9.ebuild 1276 BLAKE2B 1ef99e20d53b684faf5f2aa102d5c80925cc1520d7246afe8da703d4042fe981addafc79342ffd91df8b0971f5b392df6d24a5ea01dadda683c42b23340e3c68 SHA512 5a729cb464295c62968174e58dc860c09bb874927a13bf018ecadbedde990f9af0fa3c4a63531c3f881f1014f4995b83b76e71286a52f792309bf9d969986496
 MISC metadata.xml 431 BLAKE2B b957fcf973dc786a7358b8554d5969688c86974ad0d304ac752f1f48d246ba955a9acbe4ccedd0a670a3039488c1b9dfc6815b08e08e7085fbef39e62c447f59 SHA512 b962ca5f456fe442dd2d88866d9aec050d0b456b53f22900cda6ec304a055909c0befe2de085775283c9b098fc9d7f53351b9e67d55eeca1744fb09622eebc01
diff --git a/dev-python/blessed/blessed-1.17.9.ebuild b/dev-python/blessed/blessed-1.17.9.ebuild
new file mode 100644
index 000000000000..e810dfdd33a9
--- /dev/null
+++ b/dev-python/blessed/blessed-1.17.9.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=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
+HOMEPAGE="https://github.com/jquast/blessed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# Skip those extensions as they don't have a Gentoo package
+	# Remove calls to scripts that generate rst files because they
+	# are not present in the tarball
+	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
+		-e '/^for script in/,/runpy.run_path/d' \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# COLORTERM must not be truecolor
+	# See https://github.com/jquast/blessed/issues/162
+	# Ignore coverage options
+	COLORTERM= pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 322a3940af78..b41de628fa49 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,4 +1,4 @@
 AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
-EBUILD bsddb3-6.2.7.ebuild 1971 BLAKE2B fe4ebed73c2686c541e2f5dfc52c2d5e1ece020674d6ba85fd55584f3c012ed681783daad45293ff17674665bdf8d1661d28ac1109413a499aa383983485f6ef SHA512 e9b35e4d38a8a93f191dce9dde584542f412f28db9619ec2eb8908e63076d7007b170ecfc68e02025ec427dea691545d027e87aed60a253918ad5dfaf95d585f
+EBUILD bsddb3-6.2.7.ebuild 1961 BLAKE2B e6f81a376a3f258b720f03d5b3676998a8c961520979333c020cae178474cf6b83dae68da109d02423e2629e927cc4bf4b79af64f35b6c3459e6c9e9813e5173 SHA512 5633dfbe8aff8225a5ad730f23636c2fb0dd3776d242f4387dd1595e486ac6c828841f3be43b4538d716a95c4e9e9c4ca0f676da1a3c3fcdc7c07396fe73f238
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index d217d17a5f11..b925dd3cd69d 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index 78f428b50d1d..f17004982230 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1,3 +1,3 @@
 DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
-EBUILD cangjie-1.3.ebuild 984 BLAKE2B b8ba71fb202c2dff403be8ceb934aa24e67ed380b9a7b9e272cda5d833ede9778800fd02ea264af824ecb20a7f59b245ccca747f824938205a4b187b1fd97413 SHA512 be0d41d7ff9c5fe75ade77ef9462e6187cc39e8411fc8f40963d0d628677175eae92aace8b06769fbbaca035bbc659518344bb35aca189070f98b12819ec7fd1
+EBUILD cangjie-1.3-r1.ebuild 1051 BLAKE2B 15cc1821f26edf61b15981b57e660db827e56f1fce629d7281524d89a698b4c6b16a734cebd526931801a657e36dd4333b851e7e678080e77f745c0b85fedd59 SHA512 e539a11e9bfa9d90bc2008ae68b9d259110d6c93de62749cd19bcd8df2206b1642b7681a9c87ee8c4e50fccb92d62d0411f2b21044cf2cee1f893c7699b92d54
 MISC metadata.xml 318 BLAKE2B 7ec0867350c50e5dd8bb12e583f3b9fd3d396922facfd592bed942cb6c082ecd6e61a8b80c124bc6f092ecf9a8f1888f2e36165d862b246737c5387ed53bc59e SHA512 052a2ca9b301c41b76960284f760443dff543294b9a8d13de4c2454747e61a2d85e317a1ce08b224442c50822d0a39916aa897ba63c31b4707ebf667fd5ae70f
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3-r1.ebuild
similarity index 83%
rename from dev-python/cangjie/cangjie-1.3.ebuild
rename to dev-python/cangjie/cangjie-1.3-r1.ebuild
index 61b243fd4fdf..646ccfa41771 100644
--- a/dev-python/cangjie/cangjie-1.3.ebuild
+++ b/dev-python/cangjie/cangjie-1.3-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,7,8} )
 
 inherit autotools python-r1
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	app-i18n/libcangjie"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -43,7 +43,11 @@ src_test() {
 }
 
 src_install() {
-	python_foreach_impl run_in_build_dir default
+	python_install() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir python_install
 	einstalldocs
 
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 65ed26e005d6..d289cf645aca 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 669 BLAKE2B e59bdc86ce8ce52b9d5d9957a0d2e0abc25a881e5b7413604508db1305f068043ceafbcbd045ce6bbcad7b6dd84c87ac55a9466193fb75ef1b367d5c5e7c7494 SHA512 782ae8943e36d14b284fd655340409c55dc2a0b80650858c929527a9601434ac27d17ba764483a5038a53c4040ff7b894fca96ede16615984fa56120dc01f6b4
+EBUILD characteristic-14.3.0-r3.ebuild 659 BLAKE2B 654dd133c42b3aa445d672e7cadbb12166021ef2f884a940379f80e3ab27facb0dbc6e6ca00bcdc1b0a9c726b3a05a52718d8312ebee3e9ebeb53a8900d7dd8c SHA512 ece46af5d584a05a205d09898bfcf7a5a4b1162a401fca9950ec703393bad9548a302d1bfd7fbd9323cf372c280189c93f2339e9657a395a32eec085731790b5
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index 2fe3077b4082..ae5ce89e809e 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheetah-docs/Manifest b/dev-python/cheetah-docs/Manifest
index 7e17ebe8f184..b51ee9e8a10f 100644
--- a/dev-python/cheetah-docs/Manifest
+++ b/dev-python/cheetah-docs/Manifest
@@ -1,3 +1,3 @@
 DIST CheetahDocs-0.9.16a1.tgz 1031641 BLAKE2B dfd116242ac389e437e0aee9da72c9b6fa766e82adadee6881f7c32b74464244b8c802a1ed70c8c5e911dd4aa7b683b650d42c474b70af81c25d5d36489e5794 SHA512 b0628e85200c4231fefd5eb770bd797d5eef3d6d85eac9b1da6d34d9dfb755a028a50a224bf9202d43a3458e15059ed7f5d4a55c49d484eed2b4caf1c7af835d
-EBUILD cheetah-docs-0.9.16_alpha1.ebuild 726 BLAKE2B e1c2ce4a8e407eb62ca26ccea9ef22250adc5795376042c9adb2db61ac37514684f42bde1da53d9adec935d913983086ad39f2e51b3e0320c7a8006a8c76cfe9 SHA512 8b08811fc50f49ca6d7b02b1e6c1242e78eceb9adeb58e831256b50d646e0738a1b6a8d0d69751b1ec66a2ba003e16f8cc3ecc7c4b6df790410ce65a6c7960fb
+EBUILD cheetah-docs-0.9.16_alpha1.ebuild 727 BLAKE2B 085e4bdc374113a58768e5c87510d294adb68326744e84759dc92eef91574596a8d8db13bc52677b2b962ca33df35098ff9fded0246b47715083fe49849b652d SHA512 dd9b0d76d6bb6fa93a1514153f35a27959237021a49d6200e0eb7d772c9e0a330dc6b82f6b849feb23e8d74fd3b21ca8402f581abc8a02f62820d4e073910bdf
 MISC metadata.xml 325 BLAKE2B 7ddfa9ff7690f262fea51f5ada4b1aba2dfef33ef2da822a8f608021fe008737153d29b859d7018f8481f124ebe6bd00810c89aceb5abef7b13d44007bfad39a SHA512 98a1f6fbdf321900f9bd0d3357ae65cb94e70572cbb6d2919fdcc779a39020db51c8b2191e52e4258c89bf01a9db47db18d000d946c14671b2148a57856da9d0
diff --git a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
index fbb30d45f632..b9d0bf999d2c 100644
--- a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
+++ b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils vcs-clean
 
 DESCRIPTION="Documentation for Cheetah templates"
-HOMEPAGE="http://www.cheetahtemplate.org/"
+HOMEPAGE="https://www.cheetahtemplate.org/"
 SRC_URI="mirror://sourceforge/cheetahtemplate/CheetahDocs-${PV/_alpha/a}.tgz"
 
 IUSE=""
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index c967596c5ce9..a68ca64a3f9c 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,13 +1,8 @@
 AUX cheroot-8.3.0-test-unixsocket.patch 2069 BLAKE2B c948f064e6d8f7d9b650d3fdd00be71880f2df04c928093b7e0e61c6095c854aaa1bfe0ca85e1afd480102826ea6c81766374d2886b916f98ce23e18613a5225 SHA512 0e1f04fa069917eae4267408b6f791108805ce831612cd78acf53e25ed435e38cd542b3a8d0a75cb149e55fc35daf1c24d5b6637899303861bea2e810f6e3889
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
 DIST cheroot-8.3.1.tar.gz 104332 BLAKE2B ac79a5e84c534456067b83f11bd72cb34c0e3c850e49c69e0ff329cbe71fd4331397a38bc3b354529a8c4daea6e527733965ba8aafb33fb67e29e6a714b345cb SHA512 5aed493904d7e60118ae4b9498c10d48da553b3cbc1d713e3e870d771a7b669988d55bb0aa3223436cacdbc2249538be759a9145cf655603fbe5b88ee10e94dd
-DIST cheroot-8.4.0.tar.gz 106091 BLAKE2B 4749e8dbbe3b368fb350ee11f1494919cae71b5d1dbda8ddee1b0ca812343c09d800646c0e757e0d1e711e486bd1985ba516a5f95541d56623ded78741e25d76 SHA512 b030cced23811659070dccacf3790288d4a0ba326b35a683c7eff9fd3902581f6afbf408315cef129187085c6adb2a813bc5d30cbaf56d2d00369b6e19336a37
-DIST cheroot-8.4.1.tar.gz 107221 BLAKE2B cddfe305b472df4a20b5f93911a941c7d2f36dd5a7edfd593832d705b50aca2fa4bbac9f9e3a3b586623da2edafb115ebdf13b34ee3b284264ba6a31c544c8f8 SHA512 44ae1fc9a47160d3469ef1218dc60fc4c4bdb445c69b32d597fb6341b130ba36e9f04d2082e7218911ae07f4fa1a271526590db16840ff798a3788209498c10c
 DIST cheroot-8.4.2.tar.gz 107264 BLAKE2B d28d602ebd442ad5d85dfb2f4618b279e733cfca9d3c516ad1fbefcd318449155819549f6b929713d51d44fbaa9a7db383af81ea65271c6646a9245e521b3178 SHA512 d0b807969d491e0b3423453d27acfbe51147f6786c0b2c8a1b4774589e3e82b027277bf0ddd5ff406f31e0ac7d9dfbd6c2f02efe6911889986e72e9f16b8e62f
-EBUILD cheroot-8.3.0-r1.ebuild 1410 BLAKE2B 3b60200f146f6090afed49a507d64fa6df6ad43c39778e0b2634a44d4526e67e0261b104b0460f23ff201b43679161ef2e54f03d78f9c0e7e1274847173e984c SHA512 da956b8e1eed2184052a840997e38e40edabeb7cf7469626b19c167c5a3d9fc82cc1dcb5a4e20e7f078840a3656f1579fc04d6aa6fd061a90787a08630d51567
-EBUILD cheroot-8.3.0.ebuild 1179 BLAKE2B bf73b5e86d4c320b64d172518ad2f09977a2cc9972ace933e526ad56853a2737716197a1a3d8701ab7889ef8afd09a721e3f926aa3e113a9b568da809727e89c SHA512 ffa04abc8dea424dccd55a93bf9da0074132c8308d82a7a3b9e3264007593f0ae2cdc7a88f7fabef91a1d4607494c16c0e2f1bf51d42b7ba7498b277e110ffd3
+EBUILD cheroot-8.3.0-r1.ebuild 1409 BLAKE2B bb5c42a3682198b4fd398d4a4bded944caa79b0e17721d49266e368297bba90a216ae10dc7653fd2cb1fb58fc61ff53623a407e55dc8600c4a8f04daa130be48 SHA512 ff73d49cb031988681ec77508c52cab9138b6a38d5eddc98c3f1e0d752a75870793391677f575ece594be53aa7b4d72f482139cd0f291ed52023e2cc743f20ef
 EBUILD cheroot-8.3.1.ebuild 1384 BLAKE2B e8fa11f7a80810a17b38ad4658312841a785d4bf947710c61b87e57ad52f5ab2798e80036acc4750a5a2500b36a108e043c963e283eec8e0ab26271960d71f58 SHA512 e9154934e6a4a0f7c51704db0e613bb9d4855cdaca9a088fee9e5eaba415410536c18d255abf6877c833208f5dc745e78eb0322bdc1845b8f1f84809e580e88e
-EBUILD cheroot-8.4.0.ebuild 1441 BLAKE2B 174d8a6212d962dddb15c2f40e61af60c3d60260589c5ee150701f3578f370d11b9da5ef1ac5cfbc7c6cd0f28e7c8e5e28242d7e76be577fff17c78f8f44bac0 SHA512 b30a4da702bd1c7e34639b4396e2358d9e7523fe9c7efcef83b71955bcf0d497743fda176eaa33312dbe627d2fa179578c22aa8920c5f401e6fe1605c2ab1792
-EBUILD cheroot-8.4.1.ebuild 1441 BLAKE2B 174d8a6212d962dddb15c2f40e61af60c3d60260589c5ee150701f3578f370d11b9da5ef1ac5cfbc7c6cd0f28e7c8e5e28242d7e76be577fff17c78f8f44bac0 SHA512 b30a4da702bd1c7e34639b4396e2358d9e7523fe9c7efcef83b71955bcf0d497743fda176eaa33312dbe627d2fa179578c22aa8920c5f401e6fe1605c2ab1792
 EBUILD cheroot-8.4.2.ebuild 1441 BLAKE2B 174d8a6212d962dddb15c2f40e61af60c3d60260589c5ee150701f3578f370d11b9da5ef1ac5cfbc7c6cd0f28e7c8e5e28242d7e76be577fff17c78f8f44bac0 SHA512 b30a4da702bd1c7e34639b4396e2358d9e7523fe9c7efcef83b71955bcf0d497743fda176eaa33312dbe627d2fa179578c22aa8920c5f401e6fe1605c2ab1792
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
index 5c118a65240d..5344578553de 100644
--- a/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
deleted file mode 100644
index 2f437c4031f2..000000000000
--- a/dev-python/cheroot/cheroot-8.3.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-# Unit tests are temporarily disabled for this version, see below for
-# what needs to be done.
-#IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.2.28[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-}
diff --git a/dev-python/cheroot/cheroot-8.4.0.ebuild b/dev-python/cheroot/cheroot-8.4.0.ebuild
deleted file mode 100644
index c66aaa7c635c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cheroot/cheroot-8.4.1.ebuild b/dev-python/cheroot/cheroot-8.4.1.ebuild
deleted file mode 100644
index c66aaa7c635c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index e2e7008dcba4..164e53f75e95 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 706 BLAKE2B 89ec5c18cd709ff564ac90f3f019ebfe45d2f33fc4e89c4e94b5c769ea6bbb9371554aa2ec4bb09cfa78b5ca7f1bb510c59454d4073000effefc6a0a3f347282 SHA512 dd002208873a9fb4674611a709ace9a79dbe521e4581c5d51ae9c98141a54c7c0c59608fb80f1dc64e0376086e63c039c7e5b9f40f7814b7a86f22af6ced3dfc
-MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
+MISC metadata.xml 737 BLAKE2B f434d4398ccc7e8feb419980f2a71e69a74eb8e66ce506c180349bc4a3f69947e6002b3d930a3f3695f63f8acdba692c531cb9e700776e0889422e235e0ee5af SHA512 eafe24ee36b106a31703feb548b75d4eae9ba6d5a903570351bc647cff3f42ea2481602500f53abece88ac054b46629d46a5643148b514fda43f53b5d201875d
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
index 41dc97f59633..b7bd76ba47df 100644
--- a/dev-python/constantly/metadata.xml
+++ b/dev-python/constantly/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index b27040f02945..cc3c9addd7ab 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,5 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
+DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
 EBUILD ctypesgen-0_p72-r1.ebuild 798 BLAKE2B 46552f34043b363b6969306405caee564b7e5cc7e19554a35cc186665341a5635727bd408a65f6794477288f1f1625dec65ab7f3f0872570825b73da98cc42e6 SHA512 d0e8d35eeea35b4cff80bbe9836611064b4cd5f43a850c21ea6c92b9e6c571ecc29d1df272dd8d9754db46c57a160a5fac887dafd48ab8b58c61581d2fd1d9a6
+EBUILD ctypesgen-1.0.2.ebuild 749 BLAKE2B 48c30bed24c64e51b96e5e898b2520f1770e5cde90df4c9d28486dfa5c3487fa1b15d0a122eb02ec4d229c1f77c542537000d5785ca6f008bfd489f25dd4200e SHA512 0f66533a2eb5fd7bbda8a4f50281b5aa13937bf88eafa631028dd22679cfe55aa0fc7d7c4abac45a58802ae80529f65dc9e2fc0bfb6b762c79898e3723622390
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
new file mode 100644
index 000000000000..a71817580b75
--- /dev/null
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg compiles fine with py3_{8,9} but tests fail
+# https://github.com/davidjamesca/ctypesgen/issues/90
+PYTHON_COMPAT=( python3_7 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper generator for ctypes"
+HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
+SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+python_test() {
+	"${PYTHON}" "${PN}/test/testsuite.py" || die "Test ${f} fails with ${EPYTHON}"
+}
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 30f680926359..88fc0b453144 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,3 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
-EBUILD cvxopt-1.2.5-r1.ebuild 5534 BLAKE2B c2a6da2d4ed13e71233cc759d27e33306577c0c52e6b439e02d790529ad22a95b5f06e685891c7c36306dd014809868d068151d6f957d5766b7c6a889889f07e SHA512 c83625f8a004cec9068815363b1e47b2ee93a5cd1d4cbb65b1737c143a65d2061ffe50bd7c86a71394bda45f807763a645e76bc2389f772e4b8c55f7e0809238
+EBUILD cvxopt-1.2.5-r1.ebuild 5535 BLAKE2B 328b146d857bfe5e294c7c3e0baf101e2a78f70700f272d2edbbf4142285e73fa55e2022032089bf398e2ba7457e3a1150fa7a6e9ab2d9a563c37510f025bf95 SHA512 6577efae0032bc3c3abb9c7304c9baf48366e2d26c787ba1a2ceb76b53b197bd2dc1161b2f520d320248fdc2e482ff159a1c35f8df0785ad0ea4721f2678b034
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
index c4670120832c..df93cd110d8f 100644
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
+HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1d2a5dc94af2..1fc94a5cedb2 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,4 +1,6 @@
 AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059bf14dbd7e7761e1c5e07455e067cb6ad13a83084e573be4be71fdd1218fe1fd67c6ce2f9c0984a20f4373372e8177a7519eb9 SHA512 79ccd5ccdd6709dc01dc0f6c3ee1dea9cc3dcd2c8e443cf74e9002e5658f0e72b709e0717e342040f2bbd85ee8ea331d6d6baa2c600fa498154b7137634b74e5
 DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7e4f4ff89697c254efc365091a61b298333b0f8d660cc9f760d3960a355beafde2555dfd912606dbe4a49db1 SHA512 c00886768b331f48ac9627f81c39368afbb4f1083ee9f7e3ebbe64352cc48c3c580fccef8d5466592f5bf772f873bef2ac084a972d30e7c1b4d1028e1d456059
+DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe56a786bbb00215ade5ba5fa7687176f70f12802b06bbcaf00db76f0c97eaa5b87cb65fc28bbe3e37c8b55f2a6 SHA512 90d6391a8dfc36788e819bf09f4ea65a89f37b14d0755fe4ade9179e5d3edd6dada30d5c08ad730f4ac9e08a0cc64a354933f52b92eb13fb8e60093dbcf28567
 EBUILD dask-1.2.0.ebuild 1204 BLAKE2B 9acad86af714eaf0f95d3bb857bf2bc6ae960316a0304a6f3b1a5b47b0b0e063347732b2cfe116de9ae69b3a6413729b1c610bea08e8c8813ca14e8e352e2b2c SHA512 364829d15951d615f25fa31cfd95134d338f292fb75deaff6c50cc558d934c3c99b4ab046c3cf5d155159c1f3f54beff37361edff0172dafc811d1f62e794f0c
+EBUILD dask-2.22.0.ebuild 1439 BLAKE2B 803eb816c75cfe7673f06fd183d4a7d31626ffeb9f316087ee847373bcdbf5c291a8c460a0aceb6f4b2ba0cc16498536388b2971ed5b02d86fb3aa8044646c82 SHA512 0347960d435a11d58c31c4bab787bbb633d0f0c8afa72a90946614e0fc4e968e5334ffb46071e8098ddc101b6427a546c6eac4d2f3a489f2ccfd4547186593ed
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
new file mode 100644
index 000000000000..01da771a26e1
--- /dev/null
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-2.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# don't die on warnings or xpass
+	sed -i -e '/error:::/d' -e '/xfail_strict/d' setup.cfg || die
+	# flaky
+	sed -e 's:test_time_rolling_methods:_&:' \
+		-i dask/dataframe/tests/test_rolling.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv -m "not network" -n auto ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 85c0e9c6bcf8..5bbcfd020e31 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
 DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
-EBUILD defusedxml-0.6.0.ebuild 706 BLAKE2B 89b25d405f98d8cb4c9cf56be3ac607f0eb0141fe9ae7f2aa094ada4142430869e2632ab90008ad5e4651cd2a2c2745c1922fb6a4e9561227b8186de79fa59ff SHA512 80409fedf6cfe66a1422fb8595f0e51a9325db0f6279b940b7d582f9b132511bf5fa31d85257cc28b16e7cb2cc7dc5012771e213e05303dd974bdbc9f1046ea6
-EBUILD defusedxml-0.7.0_rc1.ebuild 777 BLAKE2B 23a52ec840c99171ea492b215716d654318ade7ec9ff3b7ac969462cfa931097f428bf01dda1055ce1867a2bef3b568d3a80a39ad60f555e2d2e8c12616566c3 SHA512 b4a4887383cf981b364f2982836c795e601940397a2dbaec7553486115a7ae96b014bab43a63c49436986664dc14f443c8589a6215dcee43ea2748da67c08956
+EBUILD defusedxml-0.6.0.ebuild 702 BLAKE2B 712cfd279ff7fcb7ff24ff3bccb95e6e66a7ff74e2101514e808fb4f2b69d7b98bc56dc7d19f626a70b5fa1209d8d67c1f61e1957fa115c73c4a4a81cd6aac68 SHA512 43447dc724bc2e7d998860d24ce7b724b4e0aa647ad72dc3be6cac0d1af035b8666f5ff0618a1b048f44f1d49a22f726c1dc68ebcb269957e10b278893420a99
+EBUILD defusedxml-0.7.0_rc1.ebuild 771 BLAKE2B d63911866f1f1a8c0336534e0f2cd5aa9e9cd1d83451b87903bc839d0f5072044bec76b8f55fa267a17ca6f56dcddae5d3e1d45e3066421e74ff2004ae712bab SHA512 783bd2ba24afadf94b2d58e3468196dbfd4770ece78002eb1c0c52dcbafb35887907322d9e29318d9d1089c9ff3fda67d4b2547c927762d5e0a198164df07c3e
 MISC metadata.xml 409 BLAKE2B 9a961d587d44b320c8d15a987cc6f06542f5208c013587ebbdc5f7dbf1df5cc67691ac7f9b21c7cf465dffa0e1c25e2b822a71d6f7fd00d62964f3068b21a78f SHA512 2de7bb348b7e8005bf13eb5e077c9d9ab4b5ee4cb19c7ff858cc73372ad40d0e45e7bc978da4658c379e784bddab0f9123daf3161b85c098c163a81ef128070f
diff --git a/dev-python/defusedxml/defusedxml-0.6.0.ebuild b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
index 441697b064e6..76cecdcd217b 100644
--- a/dev-python/defusedxml/defusedxml-0.6.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
index 3249d1629c0e..638f19676f45 100644
--- a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index ae790688eb8e..ae1d23fd0cfd 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,3 +1,3 @@
 DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
-EBUILD django-redis-4.10.0.ebuild 488 BLAKE2B 9734925e3c6ddb09df4f6976ff7343f765614984eee1a2fec4f8945294a896cf8d887389e3d5425c85dfcb7f8a6c456730e1f74f1033630b83fd4404c202da28 SHA512 a596767f628071fe8f69cb512ccfa3101f46fb35d06838e905e2321b5935709f4275d3b5b414ba23429db39d3a16638d79c9209693fbe990a15a1af072d52883
+EBUILD django-redis-4.10.0.ebuild 493 BLAKE2B 039ea4a4634f71978a87859654e857c411332a0f28823a115536f5d578cee5e620da9d7a6ff8003ebfae6b3cf1621300abba9c21357110f11c8e33a84d5d5980 SHA512 e7da9e7f0379583323b54b4e639debf153b98abc4eb02e5d16f0ef668513b8ae96da796915d51a53c75bb9d811b4048a9f943fb7566436cda3c61758f3d5cb0f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
index 6e4c252662ed..cdd13fa9c909 100644
--- a/dev-python/django-redis/django-redis-4.10.0.ebuild
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@@ -1,9 +1,10 @@
-# 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=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
+
 inherit distutils-r1
 
 DESCRIPTION="Full featured redis cache backend for Django."
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index d059d104ad61..23ae6db2eed7 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r3.ebuild 749 BLAKE2B 1d46da13101de507ff31ae667ec7e3898cd211cdc7226bae6a048010ce69bec5029446210454f0af9c3b8fb3dee8ba10bd88b0eb386640cac41c8df2648e5779 SHA512 d7ff05f09d82df465383f7a1ea82d02db090094b3508ca9d40d9bf8f506b42f18fd407863d601d43cf855cd544e6e528e6173637a176fe4424e64875729fbd77
+EBUILD docopt-0.6.2-r3.ebuild 739 BLAKE2B 6c53dda9ebbee3169a7a0471d4b8249369e8c0afe1896befcfefc23406cfed3b21b763dbf6dd84263a3cfde389d5ff29b364c37d1f47beb074eb31df42276a4e SHA512 125ed87c50fa41601c4e59685281ce5be76e634072d1c04588a8b8ee7fcd3ffec56a1d675043c26482d1df3459de28314300f869d2a74f6255ea98b597a0a56e
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 552956138548..4184b22735b8 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.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/dulwich/Manifest b/dev-python/dulwich/Manifest
index af3d61550116..562a56861c97 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,8 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
+DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
 EBUILD dulwich-0.19.15.ebuild 1704 BLAKE2B f8f942038ac1d9cc28ee4de418a7fa90a31fb03e05adf3d10516678a7a20de70c3921c9c35ff6bdabcda900d0bfb2b74f0db92ba97e9458a4f4a8c4224a2cb80 SHA512 dee6fa6ea58ff8527196195c6483d9ee20a70dfa1b9e996c519ae2f9ae6973f7dc01c9b35381180dfad2aca12349d65cd46a6c0a4f7f487d8ee94b76680ef057
 EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
+EBUILD dulwich-0.20.5.ebuild 1604 BLAKE2B 0f5eab76c7fd88680bb3782ec6ee16743caffbdaa53e266fe45045e51f0f5f2294dd6cd9dd282123f281687a9e6eb61e6b26e51f93e23dccc96229dc826345e5 SHA512 eda5203d4bba40c13c8474b64962448f3e35ee26c31aa3277105bb6e177374e2df6bf350a852af340ca42ae52e5c8aed2acfdc73523394bb5addd22740de0d28
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.20.5.ebuild b/dev-python/dulwich/dulwich-0.20.5.ebuild
new file mode 100644
index 000000000000..bea5ab1da2bd
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ready for 3_9, but fastimport isn't yet, #733838
+PYTHON_COMPAT=( python3_{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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# 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() {
+	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/empy/Manifest b/dev-python/empy/Manifest
index fcac4742165d..77855d3698c5 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,3 +1,3 @@
 DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
-EBUILD empy-3.3.3.ebuild 1012 BLAKE2B 8e02325d3e98ff0f3ffa3bc3136c0226b7182fefa5b2f8074a5c0b71be899d1c76e9cc76d1e52e66487f9a42311afa4faf9b38dbad5e17640aeaf5e5e507e40f SHA512 8b080fce64d86a948bca47fe7a9c60db04e47dcc80b634e4957cd4616b3ea6a42b9087a8069a19bf8516fa985d11dff25dcfef9891cd09a04184be69801287e7
+EBUILD empy-3.3.3.ebuild 1006 BLAKE2B a095c4d9e751095706826410b7b2c03e8249830960e84141205372a8381ab4895e3119a88a15d46349ff84d430aa57dbe124b92edc3f28488a3ed1d80788a10d SHA512 45c50f89b7b8950ceb609230c4cd702dd5c58497086b334e6e514f40f42d8dc59334d5d49c60c25dfdf6e2fb43be2733e571bfc13eb1b636d4d754d7f1d78c9b
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/empy/empy-3.3.3.ebuild b/dev-python/empy/empy-3.3.3.ebuild
index ccd4cb6ea1d5..24d0274fa10b 100644
--- a/dev-python/empy/empy-3.3.3.ebuild
+++ b/dev-python/empy/empy-3.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-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/enzyme/Manifest b/dev-python/enzyme/Manifest
index 45415dd5be37..8659377a02a6 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -2,4 +2,4 @@ DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce46
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 EBUILD enzyme-0.4.1-r2.ebuild 1005 BLAKE2B e1231b88c80de54ab17391bb4770ec5ef63c523109bc6b5979cce1c1c50c46760b915a7cfb25015e3cd9086659657d84ae3f7fffc048aba8c5941a31efeef754 SHA512 7cab553c27c134baa288d2d5d406641f345d1e27f5f83c82f28bc1920a496bc3f2d1f464331bef947805f5a18f97cfb0ca62007436ed8b51e2a6f41d13c1fce6
 EBUILD enzyme-9999.ebuild 1060 BLAKE2B 64224d263bee5b11f54f3b2cc564df25706925765e6080dbdfda8d84899f992c5fab1b5c0a60a0951e699ebae013b9eecb02d7196af00c72b2e757b181d959ae SHA512 939da49f05f42f5f3ce2529547bef0b4fd394c26bc768f65e5ada301572247b11148b8963b947d8f2db8b4f53e48dae9dc6eb98ae818b9baf8397c5887ed3544
-MISC metadata.xml 342 BLAKE2B 1f5c47ca80b45dbb9476f33a22c12596c9b5c319bd278a6ae9e6910105a12aa3d6f15d4336c3fed77bfdb1501338a2514503158d3280e7163fb2b321c0e915c6 SHA512 4ed4ebc1027d54008738661d92361d44e317533fff94a03fc1c5d3e0c33f2cede8715947cf772593df0ab56d642aeb895a772250a31a946b49bad6ff07fa52e1
+MISC metadata.xml 366 BLAKE2B 25e77584024733289e4a8a524e8b4f634be09e20c2ce3738d0999be66092e874c528b15b8cafb7e4ab6e7f76bf300374c0635e2fac93a0147e3e8f700bd6906b SHA512 e5685506fb707f7a9d577317908e72b46db00d09125ac5907de0f25d11b67ea94dcef2bfcfdd7754583c77796106569e1a8143d0041f45abd0233786d9965ba8
diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index c8ba51a8482e..949fc3c7df10 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/enzyme</remote-id>
 		<remote-id type="pypi">enzyme</remote-id>
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 81d37131dd23..52c4e7247ee0 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 867 BLAKE2B 6f937bb0ab5262a5965b4578a158ac9fee2ec2e92fd589b0f41399691506b357406c062906e6517eb4f1a3fbef4d8f69fdb4ba7e0cfb77b306b6161c1e00b691 SHA512 790572cb0b49b75dd30f27910272b08f3552e93af1bd37438803b4c31e5e770328576f0f1f77700c7f330ac3ef4431c1409c71748acf969ce10f1cf16c7df740
+EBUILD fields-5.0.0-r2.ebuild 857 BLAKE2B 05bafb4a5b8a9e48308ebb97d3783bfe4361f7b38947e5105fd0d664ce57e55c0002559e6bbca94e12b2f22a174d4af736272bd4a3500531b946d4310e972f19 SHA512 76963d4735f7ad660f2068ee5b2c81f028b6a5db8abf99b5869a59c6292a4722945de0421956489eac3f7ca43a310b8b039993b787a7b08cbadc3c6ea260a78e
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 1e6194144158..af2b8086ea55 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index f1e4ad38fcdb..4c44233f4ea2 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2.ebuild 553 BLAKE2B 1d10671520c096c8659db788fe8a0b00f601dd30a7b18ce4b21dfad875fbdcbde48c3f87a9281c7f32b4a69b00960f012de6771781323653282f7391516bd376 SHA512 8a4b30ae5ede318cc7685bf36445b97402d1013935fb65ddfcf7d53eb2cbbe2f87ac8c7c904450ae88b98b83d5374dac26c01c7a5792ccd4c0cfb7d9fc971cc1
+EBUILD flask-sphinx-themes-1.0.2.ebuild 543 BLAKE2B 0330763b7516712125cc9ed2b7bb98e5631f54e1e985f679dc343a019546a37d2fb83c569194d1aab10442c62bf927d28748b41cc7be2b1cfdffbe144b6527d5 SHA512 42807989c50cf712e61ecf8724bfc268b45594d64afb6eb628128d781aede21084fa899361fe5212d004dfa370ecef512e7ab61bf93841507ea35f3e9a1df49c
 MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 15f683023120..66c669a90888 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index d09e9188c758..a119eab007e4 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
 DIST filesystem_spec-0.7.4.tar.gz 222128 BLAKE2B b111b8194e2c31065a26dcd952aaadf0bc39bf75e94b10f79a387dc1b66838de820bcdcd90af60533dbbd33cfcc275470ccd82b98d0c82154f0633efab355187 SHA512 086e7e7905ff4a55b7027d2b005fd875200bf40469ea4b36effb9805a3416145ba4c709c4a6c8a3ac24a033cbd2104e7ebe401e2610db6c2d8548a63587b343a
+DIST filesystem_spec-0.8.0.tar.gz 235922 BLAKE2B 5ca1ce8fe3932ace39f3623217b0918cc7f24c07e86357fd4d3d56630010c37c33e94f0419f5fd6bb86292751ccc93efae305ad3c86c4f94a54b0ae360c9a07d SHA512 55513650f1795657ce274478d4360f2cfc3d2bbd8114df7a458fb3a20277b1594e48b5be38e26154a3af525a169f1e4b3d3c0e387bf3889b78350bacf12cc02b
 EBUILD fsspec-0.7.4.ebuild 805 BLAKE2B a52ba3be3cd0adb632e5fc992b399d256bab2b2f64f638b3d87f41b4bb2a4b2c8594dd0ee4aea357c17d7806b5e5eb108e429352c2f8b8c5df6502d99e587183 SHA512 203299b7525e670fa20cfcfdb5467e37e66c089a7d8bca7308c64fb827efb6be2d8b9ea9aa23e7d362922a547b9ddbc70157ba88508277d7156eab76d964b9e5
+EBUILD fsspec-0.8.0.ebuild 806 BLAKE2B 6efa415e61d8b70d92fd7a85562d14bd452ddaa682ed3394c142f9b4a54d87f287b33f49f2a69150b4f7bd64bee3a209d0750db7df12c2c269798888f71967ca SHA512 a818c72e33bd948ed5dbbbdf0a03a68e33c0b10a017ef32e8b3436e42744a56e3b328b36594a2088436c88015037e1881f3b45a8453c2e04f76b186d02f5ee6a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/fsspec/fsspec-0.8.0.ebuild b/dev-python/fsspec/fsspec-0.8.0.ebuild
new file mode 100644
index 000000000000..32a13842c168
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index c3f976c53464..dc463bccc412 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.14.tar.gz 548493 BLAKE2B fff352d0e0d685fb51fb30302542c2e8893209df1e01912efae06821fbc885b05ab3fea8786d6924b48ddf32cc6bdd6def5e90db1ff949b005437b5d3771c3c0 SHA512 0c7daf1a6d87f56663ae0d37cc65654c79646c313ec530ac57e6ee8de04849b8846556fda10dd762f92e44a5ffa54d32880bed4cd77cec99ae865de0203d123a
-EBUILD funcy-1.10.1.ebuild 437 BLAKE2B c28ac7940780ec84d5b530c59b87b4e42b47c264d439dcd824e088705fd119553ff0cde812165948b5f572168f9d8611462d6deb59fd6209a090aad4549f0e85 SHA512 78f7d8fd129bda101e70856a1d97f96173117d0da4c277d6a3a6e87ff89b2b4ecf87fe001272bb1888c1e3fdbe83ef81cb4b5bcfc6eb2cd12d8b4cb76cb96b6f
-EBUILD funcy-1.14.ebuild 448 BLAKE2B e88dda9d0b19cd25cf5f669cc5e4f19916925dba0b858222841a799ff193f5209b0c5b22a63fdbec95e450f6a19d5d6cc4157e1d7ead532efcfd22c241f8fd88 SHA512 4a867c96195d4a65aa6abb1a4a1087a72ab7bff131cc905c1debad6fb1e28d981f9543814eb30393881d4e9936c6654a43328e4eab41d1255188fafa0089f653
+EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 5bef5e2eedfd364e39f99b86a8da7cf57245f280e6115d47e78e054dbca41ec8f3e13b0d8194248e2af6a49babc07635005017baad4d0271b948db4022069449 SHA512 6e126cbd12f1554e34733553b50df2ee835884170d99489080cbd479e493dc969368530d5d7dafed8d7c308b498e4248f99ab16e00a73106ac142f5d6f104f9d
+EBUILD funcy-1.14.ebuild 438 BLAKE2B b0e5f67af15dffb59b2ab2f0df9f0920ca4c5a6e22ff45452c1875ea5c044bf71282ff14a2b74eec7f529570c9897bf0559f862f9e65452d7ba77dda80140595 SHA512 81357b83df479ef25e0b6865caefda24d93dd7d970a37861520c6786b837b152ef535da3b072f2c0f4f1a0f30ac2e8a4d842cdcc972c27816a9b7c6aa5558af7
 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 1223e2f48a5c..10053c851502 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 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
diff --git a/dev-python/funcy/funcy-1.14.ebuild b/dev-python/funcy/funcy-1.14.ebuild
index 9e8501191d4c..dbae274d8803 100644
--- a/dev-python/funcy/funcy-1.14.ebuild
+++ b/dev-python/funcy/funcy-1.14.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="A collection of fancy functional tools focused on practicality"
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 0c90ced64790..5fe39416e1a9 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 921 BLAKE2B 2dff77f0d21dfb9aad4972124f6d15aa0d29ea2cddd4b8f6e9badb2f5780b7ddcacf5e172f5a21dda13d248ad3b88aab38fa6becb870e9c4da49d5b8ed466738 SHA512 4c9d6b570766161d723bdbf12793d6cfb7c20d6b96866720e7d0848db211cce45d95acda276083d4f7a115445aca410e2528a0b41ff92275b4d47fd1d6bbb358
+EBUILD geoip-python-1.3.2-r1.ebuild 911 BLAKE2B d2f2b5ec02c73642a2cc44c32a30665f6ad11f23a78fe1df5aa60daf4d41f0597f697b9076e4387e83fd4f63170d79211b94852beeec2bf34c35285a35546e70 SHA512 16401a0ed57326e9c8d3a4b794039b0e22a14e519ca27da8bf3cf61dff0a53c437e1c1adbae5f4b6f508884e02cd71b55a5b0142045aed99dbbc10e2874c3550
 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 f89ae7f8f23e..2f9e9c7cfd98 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
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 9ed1688277e6..abefd585b2b3 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
-EBUILD gevent-websocket-0.10.1.ebuild 531 BLAKE2B d393f86d507f9a7daf7810ff2de64ca58bf635ce136ce53dad6af8e1993198af37531cfe50c9f372766679ac4f7de6d302316b9374a1305908a22f28a3c6985b SHA512 5c9ed8fa6ca1775be58277e9945c5bd01767e6fc3318b66e65963df0036f51d8afbea2f08293a4c34ca565c5ed513a07a507c17f4a1ce5c04945a9d0840ceb23
+EBUILD gevent-websocket-0.10.1.ebuild 521 BLAKE2B 236046bb6e800798d9b612c925a9f93dde1b32282591a6feb5b122e0e4728086174b7315a5dead5046a10ce6e869578f9fb0b0d90c97a9add8f3b6e420d3d77e SHA512 85cb9a3fbd1b34ddaa0295aba05742f0d162cf8c306daa30f33ef6c60d6c514aa2c3920edc9b7ad5ea67bcd7319d8feb74b70b274a0089734c22a061c4629983
 MISC metadata.xml 417 BLAKE2B 9fa2975161a6b01016fdaa704195d8845603b8eb0de45a0ed0d31d7892fe482c750aca59f9f5fda43a63c1e6dd17907b598a970505a0d04a881ff3ad1b9a5889 SHA512 ee229de187c372e975abd1ae71313da572ecdf5f9c2d3bc9601b5e3554f477a4d74160f043dc1725c8fb193da348844d7f7549af8eb505e4d0fb46abefc7d7fd
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index 8723a4a8b4b7..70fe16344d32 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.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/gst-python/Manifest b/dev-python/gst-python/Manifest
index ab0618a4c7d6..0e6d37d14a18 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,6 +1,6 @@
 AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
-EBUILD gst-python-1.14.1-r1.ebuild 1747 BLAKE2B 3c562186e3f902f20a05fb3e3dba066481ba7dbca29c727544188a4b478edc7e0a5f24de9b5e1ecdad1d886eaecf58b408985d85c272effce77b7bae1ea7d201 SHA512 ff68669724389d6e7ba1f93b44f5ab7487950b1ae26fd1bef6c9f923dbeed1de4902458112e80827c56d66d7522aed5da1f8ed2acb34a7d9898e7f52ea5686d3
-EBUILD gst-python-1.16.2.ebuild 1614 BLAKE2B 0e1e37893bed984116855d85a2d4b3f6d2550b49603f1afc25218f85b77ccbc0d68086a56a6119f932efdccba3c81f11c99218f28bc29ccdf453b14b837f99fd SHA512 2cb8ac7c357b5966a6970902cea3fcc9f2bb4bf1ac8327ca39a480e4a7356ec44aa2b482aa3c7d1204933c981c6a4743591fac3ed4dbf44ae2ae4d39e324963c
+EBUILD gst-python-1.14.1-r1.ebuild 1743 BLAKE2B 0b44d77f6b04dc63ca3775a096b4080d4e9936f8d1cfd14704cfbe5986af45b03156c8f1fc5015a79ef40f28ba67413bddb9edb2cace5ed94a600e14de2443bd SHA512 d5edfadd026636f2f549fdb9ddabb75853b7b98d26b553b166f65f5bb256ad42f7e83ce1c5e871490a6fb75f5a655bf7e646e10c7aa16db7dd5f4fa5b455aed5
+EBUILD gst-python-1.16.2.ebuild 1610 BLAKE2B ed38455c15f2440357eace6a29f23083adae52dfaca3def18d73a6e0acd45a1eeef38cdebc3cd6a731aa8d210f53d423e672d30b3ab17089b678d103e95ea7df SHA512 8856e28a2886aa1a0df0d975699da9acf1e1a871f81a471205a650438709d9179b788063d1fe557a99c3be77009302fd296d6dc6a1b5bb3d71cb1e1933810519
 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 81c1c472fe53..c29ae445db24 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
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit ltprune python-r1 xdg-utils
 
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index f0bc9e15d221..2a833b621532 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.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 meson python-r1 xdg-utils
 
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index c2e18c0cfd3c..e8ab8a84b11f 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,3 +1,3 @@
 DIST guessit-3.1.1.tar.gz 147605 BLAKE2B 3b11747b652e922aada12ce771c1e91e8842c78c221ac39c068488ae6cae95ebc6d9f6d8849aaef11d522e2c7d6e6f8e34981179e48d9db649e811c5fa2e52ef SHA512 6a02c4024d286cf49c62e072bcb616a052cec1ce51d364b17cea1768504c4ecebba914a3bf5beda9a61dca0e7764c8642cb5b918a20fb25cdd7120ad1667825f
 EBUILD guessit-3.1.1.ebuild 1056 BLAKE2B c840803bff97921a512961d515648c95ff20fc5aa0ac63758112b207e2be8d3c57886adb2b9c7e31b7f5f9af9f967f44b39a156d66d347484a407e8703d1d406 SHA512 e07d0ceb8fe44e0c308df0a0e48f18e116735d8f840dc5e5bd9dd1dbbdba94bd85fb22b473cd03e4de6172b3a00d8d39d39fb6ab93f31bbb6d1c5671f6b20cbd
-MISC metadata.xml 368 BLAKE2B 4436422efbe713e768540e695777319afdcbb0e986843ddfd1b78495c66af5effd96bf671850131336e2a3159cd741ab6179c4323527724a5483e0d4ec04727d SHA512 be4bec94b4ab2a711dbcc1ba79a5284187d5e83c8db648e4d374e533de9bc9e84fa16c590a41d2dbee7b63fc6a0910ba71366d974b22c35f53bc020fb4498683
+MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/metadata.xml b/dev-python/guessit/metadata.xml
index f09daab85f07..b7679a22e451 100644
--- a/dev-python/guessit/metadata.xml
+++ b/dev-python/guessit/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">guessit-io/guessit</remote-id>
 		<remote-id type="pypi">guessit</remote-id>
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index bd9106a6f67c..ec6b97325e84 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,5 +1,5 @@
 DIST helpdev-0.6.10.tar.gz 12864 BLAKE2B f022e4a76b8f416e806bc11c11c27e4ee1c2a92cdc2a19561d2e8c0de60027eb03ae6696d968f7dcd803d2a9935c4ee9b3a0f8248f4cb8ca2afb13ff58d8be46 SHA512 6bdd51e573ec656de12e5b4c17e0de7c2cbfc26e696bb6f62eacd148fecde1c8c239879a9d44f8a30b12d744ab40e225799fe6176805d676cecabcbee6c1e4ff
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.6.10.ebuild 498 BLAKE2B 8c06dc2fe8adc2f71e397a985ae4857fb150e8403804fa188d254b69da4eb5738260fc314c9415492e00af506ac48b33a6d7920fa617892e6897c9f6748f8472 SHA512 bf0c1b0ba45282181e6d2e26536d31e4588856d72f40b590a43e941877adde2d423a945a04dca948ef877f26f0a3bfe42683c22b9617480d16ad27e599c52a03
-EBUILD helpdev-0.7.1.ebuild 664 BLAKE2B 9854efd6bcb127079ba25d2f2ee7bbe20203a5d7d65a1693e940200b8d56bad088e0ccef0a41d7ce585d20787fd7c3ad0c817baea6e52f5530dbd8fa708a40e8 SHA512 4f80222c44b78b4856448ac64948eb5c47a19fce0cbe1e69ddc6fe40bca78cd37f755363ca0192e4ae1e879c904a6d9e7ae577f52caf6f04c0c1f3091925a8e9
+EBUILD helpdev-0.7.1.ebuild 718 BLAKE2B 83abfb3e45fc6507a3de18071799bc9c7c9778559a74b62c17188eecd64b2a83e558c616cf220a7964b81f5d3a4b18c4fb6be5e5f9f0195dc5cda95c63ee4841 SHA512 c680222511815ba1dc384de73db5693c2a7e2855417ca09af566d67d527c8b0bc3eec5188945e135bebeea5147b1985b10d2e813c5405294b8d20eee90c76015
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
index 48dabc7184c9..52bb4cf4873e 100644
--- a/dev-python/helpdev/helpdev-0.7.1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -21,5 +21,7 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 
+BDEPEND="test? ( dev-python/pip[${PYTHON_USEDEP}] )"
+
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 6c9910119b61..c4c8a9cef967 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 791 BLAKE2B 163b7865b5d579fc13285436f77bdf10a3eb6cee35cf5e228d5898c690e2998e6cc76aa92f552a555eaecfa00484639f5acdceebdf3d667557682ca080a510ee SHA512 d530785223ed11b740a6ae4206f2c19d1e838797414cd1088b581297eb6fcb0e61b490d2d7d6f223fe59bf0736d049ed078305105553e5d2bf3e6877336d7f3a
+EBUILD hgdistver-0.25.ebuild 781 BLAKE2B fc00822bd5975f2ea7586909f6579b3b5770406ef26e22c2c0ad0a00fb6ff28ff8b7849bf13b418bbe768d732d2b9b2072a27e8ab85b63f8b85e015f77da07fc SHA512 361656aa8faaa968363eb4cb0ba367577442aa906fd409fa2c24b02b3e88e3ab7389f34ba056f479f033ce8ca5154317b6442cc81b581aa2b1aa3dde213cea06
 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 eebff5382012..0d7d367e807f 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.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} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index d9426612d3d8..afda5f89c44b 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -3,5 +3,5 @@ AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f200897837
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
 EBUILD html5lib-1.0.1-r2.ebuild 1000 BLAKE2B f9d18a3bc62939db608535664b81d2d81e10cac020b08ac940798a036145f9e1f0156a98d3d17dbc56ad25785b9078df99be8a213b0beff3a2d03b0af8878f36 SHA512 0812c6c817aff122c8edd70d85ba51dcc8d1a751ce1ad08cdd28ef5954cfb79135a477e2a046a08dcab99ff0ecf06860d79a381ee3706af6170cdb19c9313d36
-EBUILD html5lib-1.1.ebuild 804 BLAKE2B 84fea375413bf97a21bec8f87a0ef9e6451b1cd264eae6383adb44572dad37b1c9980a4c1e78e04b4f2d4e8a68fab102ed4c01be1362d8c73211ea0960741e33 SHA512 2bac2d6bcff7b789f2959c0020d834855613aa40faff2ae7d54eb6b69fe5d36a792e3358afafb327cd5af07aae7ed319a9d61e313d35970fd55ba9548d98265b
+EBUILD html5lib-1.1.ebuild 800 BLAKE2B 053638a656bbda3f7578bd4a7d5ea7d2ae78e0cf633615664fb9f03041cb697afa2ba30c5790dfe3559ed645e39d79c1fca437a95717b8fbf83f3bac36a78204 SHA512 e6d840540e9548a270d5c794cc57d311f5f5cdac18bae47c39d4b8085513954393b5a0cdc654a25f9b3ccb7bbefa07c50f6ef89d79857677291c18176f1b45a4
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index af1b905d587a..939abadef410 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.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"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 299d1804c622..fec1dfedf14d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,10 +11,11 @@ DIST hypothesis-python-5.21.0.tar.gz 9025422 BLAKE2B acd6f3b0f945ae65656af2a718a
 DIST hypothesis-python-5.23.1.tar.gz 9031807 BLAKE2B 00c54296f83bdcd41ac63b36a29dc9e542a236406609b9b800912a209d56c4169f2d4b1c139697ffe38eff6cd886cd4a2491f3b4b5294cc710aedb70f5905436 SHA512 b6da23a586b60b5a094dddccab82f3b863cebcde5103e492807fb9e0b9d047b3e5fe928da24eabf5764298332d9c1e9b434ef167d7cff0a9de8a175d5f9964a5
 DIST hypothesis-python-5.23.3.tar.gz 9032683 BLAKE2B 629a44b3dbfd206c259413df44143e38d045b915d3b85359e199064aae20ec3b6946d856fbb2a9c702c765f5cd69c4418ad009fa79d6cc6eb196c2662e4254bc SHA512 15d4b3b57c234f970bebf7bd98a75a5ac031422b3f70848d25a8ee94852a3f73f8b3e1d69ee850144f1f229d1dbe18fa7959df1930fc42a5768ac7e3d6bb9e7b
 DIST hypothesis-python-5.23.7.tar.gz 9037231 BLAKE2B 0f0e2b700dfaaf4e29b950ec38ef9ba6b1aaf5a90f3266def8f895c35e4a0e8104258c86c30fca49f2239106d032c306a7a520e0b1976a87d4b50b3314c5ff2d SHA512 9e4a52d149f84b895cb72ab955997caf1070f778ae15c3401602ba86ca0cbe7ea2a6603821bd7c0d79ce59bb41adb21e0cb11f22ab179e9657784c2da40685f2
+DIST hypothesis-python-5.23.8.tar.gz 9039621 BLAKE2B 625bc11fdfd29fa7c5e32796e08afcb5210edf9d5445cb9788a4e77581c4bf70afe28af834297db470a180c2a3715c7d6039a238def468882cdc1ee4471e284f SHA512 e430ba8b003f59b88216abe1b99b1eca6ab59a3e13a6ae0a71e5fc2a49e0679ae5b8b71a05d9fdfdfbe94d35fd3b3807c64e07d7e9058f79bd751e402fe376b7
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
 EBUILD hypothesis-4.57.1.ebuild 1841 BLAKE2B 2d50d871872373a60d78548916c7c95fe15d8e5a257ecccf975b4e93f317e4f6f31305974d19f879ea35b161e0cecece6712521ba51634796c52ee98e16c5404 SHA512 7b8ce04428aad8dcf26bb8e4ee1857342b85027d23bdf635b3969b6c530ddf758fe5b1d9719e2293086b08caa10dc1255d3c5d6e6e1155dc02311b46e45f3bcd
 EBUILD hypothesis-5.16.0.ebuild 1599 BLAKE2B cc0e262a3ca947dda3036aa53eea5428fc1c1bdb8d275b10a8e68a8b38135ea93cfd4cf8cc3e0d7f452c18ba0ed314b746aaf3f00bb98f2e57be10dd83373c6a SHA512 472beda63fb05d047a9fa676271228da21b3f8f54af380b46116784b53a400b1cd25772f86545c980e2e297d88734d55eac14953ccea1c14b1b285196d2489b3
-EBUILD hypothesis-5.16.3.ebuild 1603 BLAKE2B b6130363cc010d47f04449358362c2a1e0e8c48bfb93d1e8a9ff9d028bec05c32c70e806ceff949d87fbce534bed7f2790e3d8bb430c295705fd249cd8f15606 SHA512 bdbe4f03e804b3aaedec901a03af923c13d90c238524876f4eecd33f349e183accc575fe56d60d02504c438adb7add0c3fb9b1cef23841a19907ee8709fc712f
+EBUILD hypothesis-5.16.3.ebuild 1602 BLAKE2B 83c9e5440ee1bce54f711197e4205487ad5d0f706d0f86bdfdc1cd1d7c5f4b3ccc3924cd3b89e08e981b53206474d8d58a00a08644bb00437e7e74b22c4eb229 SHA512 081d73be85cdd5fa2498511833de01cb775798200e3f4c7dd972dd296ed37bfab067ced2a8a5be948830988919ee9ee91ae13b5b9744531baeb2f3cc28770637
 EBUILD hypothesis-5.19.0.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.19.1.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.19.2.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
@@ -24,4 +25,5 @@ EBUILD hypothesis-5.21.0.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a2
 EBUILD hypothesis-5.23.1.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.23.3.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.23.7.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
+EBUILD hypothesis-5.23.8.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-5.16.3.ebuild b/dev-python/hypothesis/hypothesis-5.16.3.ebuild
index b906b7dbd37c..1b98fc855819 100644
--- a/dev-python/hypothesis/hypothesis-5.16.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.16.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.23.8.ebuild b/dev-python/hypothesis/hypothesis-5.23.8.ebuild
new file mode 100644
index 000000000000..54efc2972e96
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.23.8.ebuild
@@ -0,0 +1,56 @@
+# 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,9} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${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/imagesize/Manifest b/dev-python/imagesize/Manifest
index 5225b0c0c457..567c879ca225 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-1.1.0.ebuild 519 BLAKE2B 2027568477fd5bf5cfc3c3239642584e69f17a959b07d3985dcdc93742e849fb13b1ee4132eb728460015d634c205194f34adf13323b4b164633c6d9ecca6bd0 SHA512 5c15e60e5579dd7a1506ee25ce03281fdbf1e5682b2bcdb6be92c31bafe0f20148bfb1826762a9e31ee2e5d48164887a3f46bb4ebede9ec19e10d8a40a07c750
+EBUILD imagesize-1.1.0.ebuild 513 BLAKE2B 70d88342c73168874d3463339a0590ee393312a0c79b9c559c0bf6a89ac5533e62940838e6b6d7f6a90a3df8b0cc451fd278e95be0a8dc20f15bb75246502449 SHA512 bea68b0285ccdfd710cf3e0bedcadac49492a8be342aaa8822c634dc46c0f637fcfadeb23975e88fd649386838a39cee73dfd83ae1da56b96e26d11d23c13005
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
index 949c9fdc6f5e..74dfd6ea9b98 100644
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 14b179c0af1f..677050318b26 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,4 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
-EBUILD iniconfig-1.0.0.ebuild 519 BLAKE2B 02803c77bb64eac636ce8124d17f974a7369ba267a09fbd6aafc8eeb126651f7077192b24a09c264c96cb8311524847c65eee5e1b2d4208ddb7109c4744f6044 SHA512 b574629211f5e30442cfc5901043ea27c17317c87f9621cfde38b1864dd8b03461ba6d8ef87ea19e8c37520da895444035d6e523ac4a7137ee4e1a5671b6f274
+EBUILD iniconfig-1.0.0.ebuild 526 BLAKE2B 0494e3d71bf68528c6ce1a86ed9e60ce068ec088a982d969b43a603df61e1fbd9fa5abbdc11a64cf01c5544606092ba272d3f0daacb500374856379efea03777 SHA512 539a33b40aa60281cd2b4ce2997f0b90eb66aca317a0138a99919d88093aeef3329ba010ed4ca9ce2119005e29d64326c5763538afed1104a72436ada7dcffde
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 203452b8049b..72342e75fcd8 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 53c4ea02702e..a86416559054 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
+DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
 EBUILD ipython-7.16.1.ebuild 3649 BLAKE2B 4c8d47050b52f5f2f369dc372e975ef7cb7e4b455a7969fd42a0089217edd5c162ca150809b65f19a2911d2bbcd1c6dea223c361547298b654f6864ccc08fac3 SHA512 e47e4f49fd096ef2031cf62878195c2e45943d448ddd66a0c6aeb455c8066a3353bf0c4afab4075b7a415ce5a9cf6e50403907c84f5ef35b3e38c9bfb8a99906
+EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B 65972fa0122548fa440337d4584af6967a7fa51ccf09aea9027898e4c42c4b78add1bc88e1e59cb978be4a5d50b1e2228dd62005ddb2a5f18f7122c1a06ad284 SHA512 a1a5c4134cccdb45113f7267af59ac116f4e1de2d7d2a0964e80ea84701f0abb4cc123ae69b64b7297ee78aaabc82ebe8950f75e9cd3c31c595d8a0f09e7cc4c
 EBUILD ipython-7.5.0.ebuild 3571 BLAKE2B cc3f3e60012b2f432d94b12d46e51723e31905d7536467efc031ec130afe1460ff17eafa6ae8c601338714ca0a5862437dcc95919c85b54c2cb0892a6cac4dae SHA512 044290fe2202ed785ee10f8809475ab25c4dda5ab3d5de43d345860a809d5a7dc4a90bdd335d2d1ffbc7fb482179cca55d0981d3a63a8e6a567d342f3f151836
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
new file mode 100644
index 000000000000..3ba94560a010
--- /dev/null
+++ b/dev-python/ipython/ipython-7.17.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 09d109f7bdc4..71a167e416c5 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
-EBUILD jaraco-envs-2.0.0.ebuild 1032 BLAKE2B 5c301375cbc1118a713600f941a7004b544a19a7df2b60269fd76feea3172539c6563af58cae4aeba4f697d037e4cc8fd0059a5109ffda130fdbb6ccf421fbef SHA512 51270808066b43de75ab36ea932dcf0e2d94b8d7bd836699f0d6eb1bc064b2b0b3f34e39b1506e95afa1119fecc4b194d1123813b987ffd6037c04448d76f22c
+EBUILD jaraco-envs-2.0.0.ebuild 1031 BLAKE2B 52e2efe76c6328d90b7ebb50db9f3c0ff95b2e8d0fca861340524dce717a9d2dbd6ef0c7c89aab5fab7d4d1f25b82a63b40c65d4c177246c5f40e9ada01a3ae9 SHA512 5b6216b8b4db90a528b9269015220e1e44d22fb9617dae78d646d0cf74b6ebf0094f5af45898c330cb5d63d5208b1dc86b80dcf8f38143e310ac10ffdc189261
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
index f38741d2f8ef..9f373e18842e 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 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"
 
 RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 12fdbda8b2c8..cbbb27bd20bd 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
-EBUILD jaraco-text-3.2.0.ebuild 1493 BLAKE2B 69dfa28cbcbabf287ed69758bd6fb4a550229e0a73ba8b3a427fd4e3ef6e7e6f631bd4148af61155e371a70ff6379fe1177242b47c93e40acc7e4b2b87560ae5 SHA512 1372f5857b5e38930ea0291dbd4a604b16d26c0343427ed57cd650f50c257d95f09d933c1ce9e38dca00493d9b6e925e1aa49e0410187d3b9d8e0c05b69ae238
+EBUILD jaraco-text-3.2.0.ebuild 1483 BLAKE2B ee1a49037beaa9d71d1a000cbed914ba9974991c61485a82789e83212cbd6d689b17d8fb79b00326fb2f0e91e71579e96dae64286c56d9bea6d122c83fb70f39 SHA512 41a91dac99a61b19c01ac2bb075822099ad87e937c971073655a8561982421e508f057c5201560f02c64dfd0cc897f615deaa4d333fe3762a11666876a13c552
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
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 18ebdd270a50..1084d2d49d18 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python{2_7,3_{5,6}})
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 743f89ba98e6..caaf4b2660f1 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,13 +1,11 @@
 AUX jedi-0.17.0-tests.patch 957 BLAKE2B 1ee6b50291131f7acf2a2a35e575c83b22ad08bb38ff7879724f28a4c46290c04b86ef4135ffc8a0363edca0d988fcc58d33faeabbb4a522a33eb3fccb9d4362 SHA512 fe0e4a4cfdecbc029c04e87509ba55c00aabc39f3ed16521d5bc1a5b576c273848a9bc13e9af503d104fa42b6dd45ec533e922c9246eca8c9fee666f290ac9dc
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.2.tar.gz 422520 BLAKE2B f382e4026e1d0388c03b5116ea49fe4abf117c1555ccf0159541557e8d0d344774e15b983fbc66f996f60ae38552bb3b89f3f9cc809ab57f511a01664612f08f SHA512 079d9fc104125d188c72cfc0bd0ccd4de88eb5e7cdfba86e44f840e2427d0ab114bb812dad8e814e502e773d3a59f166547f5f6f287a5eedae64af99e8b5616e
 DIST jedi-0.17.0.tar.gz 462810 BLAKE2B 71eeb3e3fa23786c577fbcb3727a49111d6188c2a5d9e13538123c7c6817b67d457f3bb88423dc9dac6ee09dec89d7281c86166bc771fa0215cd327a4432ebd7 SHA512 562ae25f0c4709cfe36fe4e737d383190d8ad435b3ff580b9fbe966544c8d035cfa29815459ceecfafd704547560a8dc397f841989043e6e18c8f9d639f75399
 DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
 EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
 EBUILD jedi-0.17.0.ebuild 2124 BLAKE2B 8e04d4304d6972bb4f6842b5741212aeb11cf3961f84e29130cd4d0d2d260fe6f93bb1aa437a0720d4a17bc726d8d4242369fb7945b4e14b1cab59f3c9e766c4 SHA512 3f602b89acb956319bc86fa11877ba843ad55d4e5c7adcbf27d73947459eaa9f8fdec032a56f8055cf754a757d0a046e4fa4f20155e0d359529cf2f2f4160f19
 EBUILD jedi-0.17.1-r1.ebuild 2128 BLAKE2B a03cbd1b9d7bda2ad890f5d8835026829e47f4ac801ffb870cce0286702b1156d495801b3933f6dcdc1d811ee6eaf133ce81f0012a7ff47af56b9f30855006e4 SHA512 f5555db9c4347365e6742fa818aed855879f6fcb6e65f5f5d4745fad43e9268cb5f832924d93952fb9a1e71cc644425a30893ac2b8d8e32e86d9c9a086cee2a7
diff --git a/dev-python/jedi/jedi-0.14.1.ebuild b/dev-python/jedi/jedi-0.14.1.ebuild
deleted file mode 100644
index 6f023f45fc8a..000000000000
--- a/dev-python/jedi/jedi-0.14.1.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-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/jeepney/Manifest b/dev-python/jeepney/Manifest
index 03bde9775fbd..df8653c7ecbe 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 804 BLAKE2B c77311a8b69da1f75bbd6a61e52b4f932723628e033f18b2ea18e8aa3f3a39d8b1380b2199f2b0aeffaef4e2ec6e9fe7c13af57ae5aa4d7a10309f11ea0e1337 SHA512 886fad72f864485752cb8c60fd001bc7cb018639dc4e2ce224b41c3580ffaf9ef0153b5850e7af22d91cabc0c441532e87f64bc3bd913c1d6b2cd905910fb10b
+EBUILD jeepney-0.4.3.ebuild 803 BLAKE2B 887f8aab1dec5a23a616f9ca984cfd046d8ac3330e27f0f572c66112d7bf841c6455febbe26fee2094f40c906fc59e24579825ad505dfb79a7223e92565a8c6c SHA512 1d443e321346c6e8eec366dbf079dd718774bfb5deb95c5f286730de6acbcaae030b9e538dfaa9676ed6f9187f4e0690d709aef676f377dfa7fb10591c7ff2fc
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index 3f23fab2fb59..9717da697eaa 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.3.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 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 04eaabe21e3b..00352c414239 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.3.0.tar.gz 53279 BLAKE2B 7dbbdd97491d4fab7a6f086c47458e2e34908ee4377e30138a64a42b81396cba72dc0f8483d21f4f7499715eb49f9503cc12b08cdc270d4cd6fcc05a6888dc8f SHA512 176eea34bb7fb75e192d6792c15581a42a1d2b986bc79ab49f72b16ebf8879e9b11db0d22fbd49ff5a9b85ab7cc45a0a935d06393273233a272537a861282f30
-EBUILD josepy-1.3.0.ebuild 664 BLAKE2B a245bf284cb179f5b766685e5d90312e71dea37b0f455d49da4bc33f8d7f0efa23901a78d3a0df9575fa04e1e67ea44074a7edc48cf66cb844c3f97054b09a12 SHA512 7c357aa5e6c1ea875eaa4bf608931794b043bcb16ac40c886847bad5afea8441c158608dd4af2b6e71760dd2d65590d0ef808e0927de77762e6179bd0508bfbf
+EBUILD josepy-1.3.0.ebuild 654 BLAKE2B 9995d3a757f9213792405a94ec24c239c246c232e9302daa21c05642527c8f5a48cd3f2d1dc696a3aa57c38627da51a5b3d89761385c994ed1281edb12568057 SHA512 f2aa7f2eb94ddd07e9da118931a25be104f752e01372e22cbd76e8377447450eb429be8d84bda44e65038ccdc18fa328f14e327ac42a3a6f80cf457e7f02b8e8
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.3.0.ebuild b/dev-python/josepy/josepy-1.3.0.ebuild
index 34d9145537eb..8f7ce5c780ae 100644
--- a/dev-python/josepy/josepy-1.3.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 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 1e4d2d06cdb8..3a9d9e737502 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 604 BLAKE2B f3e7d7b4e1e6f2841b71a83a51dd4a56004af50393e0d0eda4f9d1b86f7f0fdc5567df6b240457a3044a465e4833a259117080f6b1ce26decabddf03d4a04915 SHA512 d10e60313026be6fb1d2b5d32a6b82dfefc305574c5eea0e8dcfc4d0561465814243f4c54b20de400197dfca917dc6546260368b47767230ee8994b7685c70e4
+EBUILD jsonpointer-2.0-r1.ebuild 598 BLAKE2B 3d4fe2d4feb89108888b733f8df3ac5bb232d84b533fd65ebb89504ed3fdbf8976ed63d317425f1618feccf07b60838a5c70331f0133909704b77168ad0035b4 SHA512 65ff5789537310c6e106cf3c40d23851dfaf5a6090b1e11e0e4f2a3167dd277234f9f272d4bb76ecb7dd0260c196f675e7490fd2b43a9a77e40322a55c0dfe6c
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 5250c3905761..30330a213fc8 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.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..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 105e56ef025b..3f921e1ceeac 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1,4 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-3.2.0.ebuild 1658 BLAKE2B 8aacc721b8ddb2d1bd5fcafd19ad1b8b45f3cf1b70166d12ce50d8635b4ddf4b495fbe9736be1c01d395775cb7f8d44849ccdf1f86177b835e8a60d24ee14b86 SHA512 047db02f01d965da48e4c86320407d348266708dc6bb69c3e4d25a113ced46c37f0e311fc133acbc54f7a04b156314efb2d7c478fad52a8e9c4c3d6726c56659
+EBUILD jsonschema-3.2.0.ebuild 1652 BLAKE2B 57d693be052fca3f6b3b3487df83a3c7438935d37c8d981ffd1ef1c8cb73b4c9769abc9782a7461b19a69a4318ca51ec43c8007d66c92a334a7c7016749f2790 SHA512 b87dfcffc165489b5855eee395cd52d722ffe3f4e469a7497f8d7826bde6ba3b7f7ad050e9268e72c8b64b9c2ae08580374dac6365b6ecb970b25e378494a9d6
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 90740f1c3f79..a12e66484c43 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 9bcc82060ddf..fc06b1a93da2 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,3 @@
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
-EBUILD keyring-21.2.1.ebuild 1268 BLAKE2B 4f8cb7346d6f09120a743c148fb18d9c9f2e7fbd5e397af03f83ded65dec170278c47f2ee31ac5efb5ce35f73263e53e611d3c673c0e73a5dfd9c522b380ad13 SHA512 32afc8867baf6c41e4363bc298312b7fa15156963f94a6bf24c0ec592c243591fbfe28cca2f0783a29c5c98312b3dcc915ff8fdcbe00effefc33daa39a01e701
+EBUILD keyring-21.2.1.ebuild 1267 BLAKE2B f1a95e142caf22676560dedffacecfd0d06d1097916190e8219bcf472b536239f1effd6169b60a1c6564a5e5c0180b8bf935d5ae303ac10d76425fce02d6a064 SHA512 3c174310a9fe8665993891684da99d7a3c304c73a191059d4fc8095117a56ed2623a42b333e8224b9217fe0c698a695804ade899f5c5c17190bdbe248c957d29
 MISC metadata.xml 676 BLAKE2B 147213a7e4221fae52a5add4bea8e41f5ca6f3e5c8e5008679ebacb863c9f9286217212bd910eceeed0bdc01c6a182c1aa8fd655e5ada71765a5ad31e23f388f SHA512 389b65715442d9601149fad087e034400df4f01e698f7d2aca350c41a4efab4574bf01aa322822a2313d5d2af8be4027878b7ec1180e4fb1d60bf5404e3f2331
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index c30b71045d64..63d0699c6485 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 6ffbe9d7993a..d77b4af42ea7 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,10 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 874 BLAKE2B 21bbd6612fcc3160b02fd35ab7a0e290c95bfb61947b9aaa6c2d0a8df4fdf964ba53c317e917080a38e5f9e4182a775679e4b6e7e29fe37f2a96f4556b0a3bf0 SHA512 ec59692645f6a5a4f9ab35bb9ed22961014052e980fe58e22dbe01c7e25a734a3d423bd9075dcc171a80643fc562ca54402db40daa8a2e94f490237ceabfa56d
-EBUILD lit-10.0.1.ebuild 908 BLAKE2B 0d41d15a8ce8f03aa6575718d40d9369132921e3096548206d1a4cd74e45d118f69fc4ceff9d67edc43b963222c2409ddf8c3f38b4c27a5ae31e357112a93649 SHA512 5db9e2f49ebce7a0896e20c023aa4730d9803369d41b157e525d8463e12f97a648583357f0b28da18d0f48c9fdd4816014178219b10135ba80ec1f6b7d9cecde
-EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-11.0.0_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-12.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
-EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
+EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
+EBUILD lit-10.0.1.ebuild 898 BLAKE2B 25734042c465e9ac79acca7b98d487a30def0dc5e9e63cfa4d0519d35b341b08fe9627534a646a2862ccae7c50dd95344d9427e0b6f00920f222a713fa114c1f SHA512 14dc6b5e50ac3e23565791712af64cb34a03b9046db1ccf84d72d05a7111d35543754d9ab62bcd6e75ea588dadba700b059928a136ffaf15bd106bf3a17b75c4
+EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0_rc1.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 4d9cb9965bfe..a61d6f3ca2be 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
@@ -15,7 +15,7 @@ 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 )"
 
diff --git a/dev-python/lit/lit-10.0.1.ebuild b/dev-python/lit/lit-10.0.1.ebuild
index 4afc13780a0b..b49965fce7d7 100644
--- a/dev-python/lit/lit-10.0.1.ebuild
+++ b/dev-python/lit/lit-10.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index b9123ef7bf14..eafbdc683987 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-11.0.0_rc1.ebuild b/dev-python/lit/lit-11.0.0_rc1.ebuild
index b9123ef7bf14..eafbdc683987 100644
--- a/dev-python/lit/lit-11.0.0_rc1.ebuild
+++ b/dev-python/lit/lit-11.0.0_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-12.0.0.9999.ebuild b/dev-python/lit/lit-12.0.0.9999.ebuild
index b9123ef7bf14..eafbdc683987 100644
--- a/dev-python/lit/lit-12.0.0.9999.ebuild
+++ b/dev-python/lit/lit-12.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-9.0.1.ebuild b/dev-python/lit/lit-9.0.1.ebuild
index 65669485c0bc..4ae5cb41cdee 100644
--- a/dev-python/lit/lit-9.0.1.ebuild
+++ b/dev-python/lit/lit-9.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 llvm.org multiprocessing
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 4c6c34755ac9..4b8f6ddb534b 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,4 +1,3 @@
-AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 AUX llvmlite-0.33.0-llvm-10.patch 1140 BLAKE2B 175f1a5596e7ce1f20e7e89978066cea345af361eb0db9413bf105e657128d45fca1c170aa516d74376f4aa4dcff9699d5c48120378f239c61ee59cc29a61713 SHA512 666e2dd798d2598139a72560ae0a63a397dfb643645c3eb3d92f0d2dfbd3030484b7e59e3aec8fa071d314b974f8d54b1a174473c3fbf4534d69492331ebd456
 DIST llvmlite-0.32.1.gh.tar.gz 194191 BLAKE2B 4d35ce0f4903a17285b6f6296f0260787cc102804f1144c1b329815d41ca7471e1942aaecac26f06aa76804cc1b8a77130063de22376c78f30819554e459716f SHA512 00ce075deb8048350f4d4ac23e2e8a629b7c12aefefe3855e430aaf5e2df8170cf97a043001397a84101a7d0065671b30eb327837b24f86dd36b855309c19bfa
 DIST llvmlite-0.33.0.gh.tar.gz 196450 BLAKE2B 3b1842b53eabf5cbc30aa642e12d214bd0cf8473f39873ad2b83de830a251ceac20281e2c8a528fff4623faeebf1583ab539cac74587bcb49ccaac22c922a16f SHA512 50b35db717ccc9d78cb7faa2e0b43cf4a622c5fca662ceb18c14163a26456fb79ed844db9a50e4566a2ea5c26089a419ca130d16b18a2486d4137e8a410ee3b9
diff --git a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch b/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
deleted file mode 100644
index f7cfeae404ad..000000000000
--- a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: use packaged six instead of stripped module
-Author: Daniel Stender <debian@danielstender.com>
-Forwarded: not-needed
-Last-Update: 2016-21-06
-
---- a/llvmlite/binding/ffi.py
-+++ b/llvmlite/binding/ffi.py
-@@ -3,7 +3,7 @@ import os
- 
- from .common import _decode_string, _is_shutting_down
- from ..utils import get_library_name
--from ..six import PY2
-+from six import PY2
- 
- 
- def _make_opaque_ref(name):
---- a/llvmlite/ir/values.py
-+++ b/llvmlite/ir/values.py
-@@ -7,7 +7,7 @@ from __future__ import print_function, absolute_import
- 
- import string
- 
--from .. import six
-+import six
- from . import types, _utils
- from ._utils import _StrCaching, _StringReferenceCaching, _HasMetadata
- 
---- a/llvmlite/tests/customize.py
-+++ b/llvmlite/tests/customize.py
-@@ -12,7 +12,7 @@ import unittest
- import warnings
- from unittest import result, runner, signals
- 
--from ..six import StringIO
-+from six import StringIO
- 
- 
- # "unittest.main" is really the TestProgram class!
---- a/llvmlite/tests/test_binding.py
-+++ b/llvmlite/tests/test_binding.py
-@@ -12,7 +12,8 @@ import subprocess
- import sys
- import unittest
- 
--from llvmlite import six, ir
-+from llvmlite import ir
-+import six
- from llvmlite import binding as llvm
- from llvmlite.binding import ffi
- from . import TestCase
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 94a16bbfc8ed..4b0f4fd39949 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 1089 BLAKE2B e15075182011fe32992dc7bdba2564e651d1bd1c3cc3866dfbba4091fd490ae72adaebf107458a99ad7eb7e008f6e339bac814a124d628385b86a51bb99c947a SHA512 f5ddb0a88d124119d5741630d058ed0a7ab2956702a99d7e79ea4cd8f0f3f4654bcb47d364acaa8b9b09e31318b2c12e56edd517953529045c25011cf3a71843
+EBUILD lockfile-0.12.2-r2.ebuild 1079 BLAKE2B d874afc5b3ac009bf5477d43ea045b393e04fb2436ca2e98532f080b3794e12d4fc57fbd78faa0d1e735e30ddf7b1dbbfc4b37ae6b9064956836d03e4c96719b SHA512 948aa90789c0e932f19c90911fa4e7fb3bd025128a600d1da7468dad423012ee31c8a7c322d1c8fdbb97322dc7068bc41fa75250e6bfcf80413658be8627f29f
 MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 61c5589f1a8e..715cb4795405 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index d457f8753e8e..d4fcb5c24926 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -4,6 +4,6 @@ DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989f
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 EBUILD m2crypto-0.31.0-r2.ebuild 1546 BLAKE2B 537defe2b77238728e33fafae8d8193f77438f9a1c670049367c8a81ea181a6d79591be3a0ad8c760f9c8f2d1913eb7f72a76e08d7527900559da3f0c0924a36 SHA512 eeea893fff1ce693a6d1bbfe753d9a01fe251c84f23f0e124475c9a969b821daff371fcacb7d30e2e9798ee3a93b98a4bbda05e92d6f01835a5fbf4abdfbe98a
-EBUILD m2crypto-0.35.2.ebuild 1436 BLAKE2B e767ca09938147799903cd9dc91827f2960db305f1415c4e7298f1017ae7a416868a2c2534d8ace0ae3434c3fab16a18efb4dfb0f0b153795418888bf811deff SHA512 cec8e185bae80045ee3756a00a14e5b32e94372079341ecf13596d5dab8db64978f5d1403cd07ab6f41aace2366345fc4e52f4dcab831d010c97de7d30a2312f
+EBUILD m2crypto-0.35.2.ebuild 1435 BLAKE2B 762d9c928fb49a929aa098f0dfbd3241242ea98e6dc72531846f00563ee3d604382604e73e28228b0fa400549a85ffa89be4a319361835d745edcc8cb304ad9a SHA512 1173169be6e79710697a91bacf35c652c19cb450511df99680d6b1dbf015e1cf1a2d65189a03b23a2069684011f33daf47371c7ed01a48706668b9285fb2b71c
 EBUILD m2crypto-0.36.0.ebuild 1571 BLAKE2B 651e794d76ee51527518db205d47e281aae244ca4692701c8368f9deec2c00d1a6a86be3e4ba5b7a8c7fb6aa30833c71bd2ccc915a37c90bb019f2287df7545d SHA512 c81c028133b136962ab6837e30f384a110c699e87fcfdef093f98600acb4e1461796ef2b827e0aaf55ba1344e11e9fe81b88b3ce3ba927e8eab813d843734ff4
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index cb0c33f59e67..331b570f2441 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -15,7 +15,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"
 
 RDEPEND="
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
index 9a14784613a0..2977c77fc6be 100644
--- a/dev-python/matplotlib-python2/Manifest
+++ b/dev-python/matplotlib-python2/Manifest
@@ -1,4 +1,4 @@
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
 DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5-r1.ebuild 5003 BLAKE2B dbcd7b83c1300e99e6e92be0f443cb09472c9690cc8ba12a0e22dc2a8a770a6f84b702f38d2a6474855ff66ac122b5d217d2bcaf8ff468dc2824df883b3a0579 SHA512 f58be2c7c23b3eadbc5573d44cc1e3c5177586d4b8b9914bc319872c122ec330e51857f84c8868a0f2738f9057406b65c3ccec206437d075cee838be523587b5
+EBUILD matplotlib-python2-2.2.5-r2.ebuild 4950 BLAKE2B 7565efdc034c6814289e90376321a20f8069de7c7be2f2ab7a4e52a96ba077571f9b2689d9f7878366c446968c47423f3570bd2e7b7b0128ef3da39d5a3e0810 SHA512 c4080465961e67dd52a013186954928a2f6e32acd78b0fda02772a844b9b9acfd281523f66ac397e07d4b21ec77bd98d7e38847b17e6a0c06039ca368b3d817d
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
similarity index 96%
rename from dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
rename to dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
index a4f19edf8a84..4d925d88348f 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
@@ -23,8 +23,8 @@ S=${WORKDIR}/${MY_P}
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
-REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+IUSE="cairo excel gtk3 latex test tk wxwidgets"
+REQUIRED_USE="test? ( cairo gtk3 latex tk wxwidgets )"
 
 RESTRICT="!test? ( test )"
 
@@ -77,8 +77,7 @@ RDEPEND="${COMMON_DEPEND}
 		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.
@@ -157,9 +156,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index fbd4cf000d85..2f60f07901c5 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -11,8 +11,8 @@ DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b40
 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
-EBUILD matplotlib-2.2.2-r1.ebuild 6227 BLAKE2B 32c5311bd4ee746cb0a6df097c9a2a2b34725031cbfcde1273b22929b20cf197597502be6722923ccade763e8a690dde0683f50fdaff313465b4bbfd6f5a52de SHA512 dc4c2387720aff34780d625022ee0a0f5806e4313e27cf1885450e6b2564f923d5a73b99534721c455d777bea2d43637a5b61d45b028aa5a22ee2ef2e5642b48
-EBUILD matplotlib-2.2.4.ebuild 6299 BLAKE2B a4513d93def3dd7fe01ef4e237a1ffa7e5e1d49ebb4a4fa04c4de14d02ac28bcb2017102d44002bfe4e0cdbca8e8a8563b862fafe3d06e01de4ac58d6c154619 SHA512 bd4a7941b7807552078f05c7bcce15dc18e8df1e93291c598a5d96d25a901556c69d31a7130406b7192903e5b1f81eca001af23675a03369c5fc42cfaa2110f1
+EBUILD matplotlib-2.2.2-r1.ebuild 6174 BLAKE2B 01e95b0bed00af586b2c608b79b46128137770a81dcd1152c413f5ceb5dcecb6e3267f8aaaf4b820021a14d4b83c60721335118bd4253ac8e825b7a03aa31a9c SHA512 5bb4c6f3362faedec70ad4c9efba8e0475af1f5556590402ab3da38f56ec62afa39e80c523abae4deac32c913aedbdfd33fea50751132cd609e2783bcc7ff7e2
+EBUILD matplotlib-2.2.4.ebuild 6246 BLAKE2B 4358b1cc39cb132faf166fb0cf1e74e67bf0a3c1cfb63810ffc3be03789e9a21c609cf0b1c52e68fd427185a251db7274d1cd191fb657b79b90c1369f668a1be SHA512 2d3f9d1e431f28276e7446d20c186c2f022ae4cba62bc633e84cb7e8b10b64094aebb30787b4c447695972b7569045e028aadad7900edd0e2105d2013d2be795
 EBUILD matplotlib-3.2.2.ebuild 6531 BLAKE2B bbdb4640bb863ef534d82238fae2b1dc30f7f7ee65a50815a6ec308f51ce6ee1152820867f27c9cbdc6adaabdb9c27321590a995c022aa18bbf6b6c095f31621 SHA512 68e0d31ddaa21162b18248d197fa36f3b818f5c82e8e0079f659aa0b5d27391b9b1717ebad769d1ed2fdb6b380ceee2c2741ba1baceca213daa8bc7f9b450158
 EBUILD matplotlib-3.3.0.ebuild 6654 BLAKE2B 11f6e4fd94f106c8889861df8436613d149f8c17bf8d1581da2760a231df936d6406a09e3a524af75ac73c6f3d064e5efd50c7537183954fbdcdd32e29c00b2e SHA512 6bb20dc1bb983185a97247f4d78a7e547ffb3a8ab2c002996e13cc9feb031036533870e19cb9b25a1b3cf89b5c6683e5efd07823dc217ea3c7a193cb3cb5e3af
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index 9503034ec4c0..6732f35082ae 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 # 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"
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	doc? ( ${PY2_FLAGS} )
 	excel? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+	test? ( cairo gtk3 latex tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -94,8 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 		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.
@@ -172,9 +171,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
index 824ae05fff3f..d7c77f8d78fb 100644
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild
@@ -19,13 +19,13 @@ SLOT="0"
 # 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"
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets"
 RESTRICT="!test? ( test )"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
 REQUIRED_USE="
 	wxwidgets? ( ${PY2_FLAGS} )
-	test? ( cairo gtk3 latex qt5 tk wxwidgets )"
+	test? ( cairo gtk3 latex tk wxwidgets )"
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
@@ -93,8 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 		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.
@@ -174,9 +173,10 @@ python_configure() {
 		pysideagg = False
 		qt4 = False
 		qt4agg = False
+		qt5 = False
+		qt5agg = False
 		$(use_setup cairo)
 		$(use_setup gtk3)
-		$(use_setup qt5)
 		$(use_setup tk)
 	EOF
 
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 8e28be7b9111..f3c776b2e761 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,5 @@
 DIST mongomock-3.19.0.tar.gz 100891 BLAKE2B 3a5f31be32f209527d371a6125f930f2d9e3c9a105554e6c4e34c68e390333179198c7c54b54d4f25a6032152b71b1f62a7c393c3d958e913d222ffc1230a9b6 SHA512 591fb398917850ba4163ebbb58470e4fc51a057f9b1a8c92897fceaba3c8e4b95645dafea6f8e58d182f629ab767923c5b75fc474cf2ac6ea952ada5b9522310
+DIST mongomock-3.20.0.tar.gz 109297 BLAKE2B 9045a74b4478f00ce4959b6890d5e5aedcbfd7dfddbfc8b7f77c60e64bfeef7c2bfc80c5e30a085fce7f5cf1411465c3551e585b0bc521f55597cc5806c977b1 SHA512 37b96634790eccd9874a68e7d74b234576ce928fdbd8705a7b1cf09d7c3dd69af5adab15ff6be5efefccbbf6e994f836e7b18fef5ae7e825fd22117449b6b983
 EBUILD mongomock-3.19.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
+EBUILD mongomock-3.20.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
 MISC metadata.xml 595 BLAKE2B 3014a8c24d47db3840066581d8c88307f4ffbc270700dbeb8cde95b4bda3e29bd7b0833c7c5dd13dab0eb7e9a3bc6b61ff75d4e128b813fd30db1da0b00f4d54 SHA512 c844e1e8ddc89a83dc4a0ee4b41f5d08471fa1320a5e8d1c139ab5803b4a11d28e07326cb2cdeb125d24f4af218adcf15aaca3b3272b54201024d5d7a5a7f059
diff --git a/dev-python/mongomock/mongomock-3.20.0.ebuild b/dev-python/mongomock/mongomock-3.20.0.ebuild
new file mode 100644
index 000000000000..fe73bdcae26a
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.20.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 2ffb7ef4ccfb..6da33449a422 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 474 BLAKE2B 124bda21a1b8b02090b87af3a3f49fc486c1bee6a3bd1a83c73c048fb746f778b50fa19902135d0833b3ce8d57642e9336e5216d2140d63d43e18c0c3a1cc761 SHA512 38aacd67275d52af5f4cf732b9b0e9e5d18b164933e0d4aedb949393b56804362d44a5ce20c226f69e21b1006c89a9ec558b055fe7865607d53167bcd8dd17e5
+EBUILD monotonic-1.5-r1.ebuild 464 BLAKE2B 15ee2febe06bf675ac87b6b07df58caf1d3b80fe99f549ba84e4d046dad36e98ef68598c2cd9aff9a69361685d6b008de6edc94f9c38cce3fe364f23608d5229 SHA512 1acc9cd45bf18c57c397aabead32bf8d1bc6da2cfb4c97d2e634eaea331471a5f6fe1f8761089216b01352fca3f381bca3da6070167e72d85e9297152c6700f3
 MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index f0fb2bda547e..e85560961fcc 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-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,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index adb607ac955c..3b16c004bf1f 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,4 +1,4 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
-EBUILD mpmath-1.1.0.ebuild 992 BLAKE2B 3b3f4e59ecd7934d229275f161931b736b3a6a8eef9e4ebf2dd6c3b026f2a9131a297e75a91c35c912fda3dbabb78d8f9fa85a91a574e5d5df775406edd468ad SHA512 cbd70c1fdf5ff1d05503a0d2c0f195dc5a11c17abf487734ed39cb44a035c8c249f3ce798bb35db1ec860c32570361d831cf3e5058a723d24777d2154f73d6ad
+EBUILD mpmath-1.1.0.ebuild 1035 BLAKE2B f9cc254300298441a3339787b93e117a927283b6a3b71e5f98effc9434246e34e25cdd95bdd934dc320f6fd593a583b17dc00a609be6902c246345206f15c56d SHA512 c787a372ffb0b8c75b88dc629b3ae2a3b05f12e561db3d5760361ee006c0d7b9f56631fafaf2b75b928c54ad795eaaf9270d1cb2e9943ca7e8ed1a81fe890d23
 MISC metadata.xml 534 BLAKE2B 19f996d0a1fd717bf099b05dba1c2313dfea37108b412da6ae4efd37f5d982e924f6134a4ea6a5f9e62af33ce52793d7208b31aa993e34ced42b56e0441c7ef4 SHA512 d791c8fd0722872e136f3c9fc222d55d39c5b1ee5f71f1dab0a475c7e39a164e646274c003e97b52111505f0f1d96f973971fbb51965d713c2e60e27b5b37f92
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
index 83effa8f6031..6c2236b75bc6 100644
--- a/dev-python/mpmath/mpmath-1.1.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
 HOMEPAGE="http://mpmath.org/"
@@ -14,7 +15,6 @@ SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
 IUSE="gmp matplotlib test"
 RESTRICT="!test? ( test )"
 
@@ -27,16 +27,17 @@ DEPEND="${RDEPEND}
 python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}/${PN}-1.0.0.patch"
-		)
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
+	)
 
 	distutils-r1_python_prepare_all
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	pushd ${PN}/tests >/dev/null
-	${EPYTHON} runtests.py -local
+	${EPYTHON} runtests.py -local || die "Tests failed with ${EPYTHON}"
 	popd >/dev/null
 }
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 5772010cd1a8..968497453ae9 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 731 BLAKE2B 3305cb7e792f3b414d4c56318e31c08edd7b57a020155e86da14fa9c76609a448a2e47900417faeab358e2e419ff429640b71d4a8493f03f234549f94d12969e SHA512 ff736006cebc842ea54d664891357bdac6c77787870b8d82ddcddda89aef444f9c6afac054223550ea6494bc9e4c2767e00d0600907e0701f01ed498ca8900f0
+EBUILD munch-2.5.0-r1.ebuild 730 BLAKE2B ca265f58fdb1753c943f603edf034f229cdb2a388f84dc2190d5bcd89301d9f6ed57a103446038c8b31b492bffbcf50e4061cbf010d36e5515cf99204da26872 SHA512 f116b4f1a213f3064f06f53a57e4ca72c860e69ed822f8b46c528fc54cff28146b6ae4b7b78159ea2f22908d1f183527253fbf506c6deb07e975ceb38924f11a
 MISC metadata.xml 375 BLAKE2B 55482baad37c27ba7d0ec36732e880b82a635bbf7358e4219d96d0986e56eab1052c7f09d11a2cae544612643b524ca333c7217f92e569d5dc7cf89e025dd53c SHA512 333c300e6d943df9e1d7f43ccb7fb2b96ff13522dca55f8725ab71cf6e4f740d4c11a6bf136a1f1caec79adbafdaac51ea4ec36e0fb1b456edf4f39682036ada
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 11dd2e3724fc..1f0c3675ecbf 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 59057dc41421..5f5ac594a969 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 953 BLAKE2B 541c16054080a1336600907bd2b3272d2d47bb4b79cc6940817364164c57a3dcafb4f9de4c1ecc6ad4005ed889ec66d089ee04097fd4fe3852b96e98c8cf7418 SHA512 da1d0e816a62d0069785463d8a3724829714a37edfddd33c8b8e343d8a5886140ecb82d09bcf03e4542372709620528be1c5794738df4860a96456fc366ef833
+EBUILD namespace-sphinxcontrib-1.0.ebuild 947 BLAKE2B 93a6c34672c05ddb007159ec10d4874aa678921acf5dd8b5ad0136340d97339aa74146191083eb16968368de0840668677608bf1afc482793cbb3733918da12b SHA512 13c436bca486506c392aa4c6d7048cb3cfb7a8c296bbf9fa57225a1c4e75a8306275538e5613c3490601bcfd80c3a3bdaeecba7e16acab6155cb200e515bd7d0
 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 6eb0c2ebaede..d1895484fb09 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index 3b436023bd47..b542650fa6f9 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 617 BLAKE2B 8a87c455ce8f5a08b1d6482bc2f41b0933da6b3417aa155b598203f92bccbd295bab4b683d7a137cda63712a566d1e8ea53e0abc4fdeeb35c9724a475b8a6f93 SHA512 82c933914d08c53cb1867f049284b46192dee1eb1f3276f7550497d8aa6d73d8507a3386431fe195c3b2a005810a0ae17a4895b10774d3d1d6f9e7de030c9b8c
+EBUILD nose-show-skipped-0.1.ebuild 607 BLAKE2B 182f90666cbeaeab2e7acb44e860135df2cdcab06cdb776edf9018950ed39355856392b92d37b2d6ef4edf5ab240400a8181d3a0655586bbdbc4e6f7f0a752bc SHA512 4eb11d91385bdb1b03ca5ab15badf77235344bf9fdaa7b35a4cabdd525c1c76c9528073b62dbaf213b575effe0c9a9e873bfdf5c6eef029641a49f2e869195c0
 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 bbe6ddbcacb2..51081681b2ab 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
@@ -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/nose/Manifest b/dev-python/nose/Manifest
index d7d1550c1665..b0743105ea93 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,5 +2,5 @@ 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-r5.ebuild 2305 BLAKE2B 2032bd9bb74f89b9e174fda5113056f35de572d19ef8a06b5c117ca5895161c0c3b2ec40f058f5e91683f225d51ada4c7b697c35f163c384e160f76bff5eaee4 SHA512 4f21b7f75088066be536a0d5872b2f3973251dd69436324cc9aa89da1208fe0b73b1a2e0a621f42111c156dc34d8ec351086307c2584b8903330b4476b901767
+EBUILD nose-1.3.7-r5.ebuild 2295 BLAKE2B 4b784950f9d1e23fa439603751ed9f353f16741001fa990577c25442cf6ad2abc9f70165d7858cef941b8324872540e44a464e9460e09edc519db5d908b98178 SHA512 bd596cd6d76260fe5290d2c30f318eec3fa76061076a785413e93068f0c49ae6212c5115c8d33403abc2ae91fa6fa5822cfbef3906ccc7edd1739a5f8e7d79ba
 MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index 5e6c66c4065a..7cd58888bdb7 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 		${COV_DEP}
 		$(python_gen_cond_dep '
 			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
+		' python3_{6,7,8})
 	)"
 
 PATCHES=(
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 84cad984edeb..62508ee3580b 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -4,6 +4,8 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
 AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353b0848b783e786b02549975a56e122ba85dec7ad9dae3963a80c34e8c22c1d8c95b054077cd397607db0c9c15329 SHA512 8e0d0851156935fab5b47fcf13fe0a92f6675914b9c3fac1a36c28e282b4003501572dcddac4d729ba798609c7c49b8241ac72277491907adbeb52b2dd14041f
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
+DIST notebook-6.1.0.tar.gz 13794330 BLAKE2B bba5bde7b40cac4bf6a730d7f37005b74e19665e182ea8f81f748ed6a1f3790a019a9f57d1c232403373fbccbf446277e0bc6617556f4fce4487c2c968d8d6aa SHA512 be584c13e2a285076977cc94601e0cfe10f53e3c112a641d97b2128422bfcb48514d8651928ae703237ff7a956965a85066a363079dcd6a636f6dd6467371499
 EBUILD notebook-5.0.0.ebuild 2212 BLAKE2B 084e83dc0e77c008455afba813e376996fec0b22225c7a0b1e444f90e47922c0401fdfd16829e662d15e066f023239ba768a5c5f74284cbf5d21f7b06ca225a6 SHA512 3c8fcd5f09eea10d10e8726e7c60fb2dc69b6d1da393ea972318202f991e47fd92a4bf2f5e0e0312225670b494e219b269919cb9ec9aa173caa6df4632097cef
 EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4
+EBUILD notebook-6.1.0.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/notebook-6.1.0.ebuild b/dev-python/notebook/notebook-6.1.0.ebuild
new file mode 100644
index 000000000000..aea8ab5d0aa9
--- /dev/null
+++ b/dev-python/notebook/notebook-6.1.0.ebuild
@@ -0,0 +1,93 @@
+# 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..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# network-sandbox?
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_culling:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	sed -i -e "/'bdist_egg':/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index f23fe3b1d0fe..7065a2b267ee 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r1.ebuild 743 BLAKE2B 162a00192344b3ac3455803dcff0b5e3ad8fe0e0dcfcc020fe9dbc7905f64bba6387e5d14d5a388af9d4278d9c3e0f435f090dac460ac87f520f76dfd23626e2 SHA512 731090b79e20c962fee5151d692751290c5773fe7f7b119dfbd5d74ce17ebf0d9d14754fd939c521dd7e2fdbac12ef996bf4bc5e9d1ce8b1d7a7e97d0d5ce63b
+EBUILD notify2-0.3.1-r1.ebuild 739 BLAKE2B 9832fe02bc2d9b5a961e6c5fc0819f86a1f060e82a99a5b6072fdba33aa311b6990e2c66da774613071f7a92746e3a078d5ecde443bf7dd72fed58d2af790072 SHA512 5e1d6d1570c494b204029ee1e87bcd24fc532f82ce79517f8d6e955521ef08a6757c35123df93912e0584de8c41ab8ae9568aa19480df35dde14dbd8d9305702
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index a6cead16420b..e7caf510a82a 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6edbcf76fbaf..dde68171edf2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -12,6 +12,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 EBUILD numpy-1.16.5-r1.ebuild 4364 BLAKE2B f8d83c189cc4dda70593621135607520ed993de72ea3495f3b41bc5a7ce2d39df3e92ac8f60e14a32cba17e062a97c45bc8c975e94c09a4213b4651f9c0d78bc SHA512 cc185d66671c12022ef77ad93117b01035302daad8bc71409e43ba5ed90ff1453b7ae05896aaf085fd94eee7abbd572e476e11996e16106b2fcb265aed274d73
 EBUILD numpy-1.17.4-r3.ebuild 3692 BLAKE2B 3066645644584c6cdeaeddb84da1ea811300e8f7df77efc643e39461253451fb3008d9194998db83f13648e1e79a6b06c85bc063678a1b76b1c3acf051583502 SHA512 622b8faddb286e75b85ca73cad6946ca6fc2fcf78f38bc38095ca0a0e038cdabe104681b51e093f6b1ed27602d5088b2f036494c217045368a0e3bd0ca7156ce
 EBUILD numpy-1.18.5.ebuild 3728 BLAKE2B af5b070caac2883b273067020ec34a9aabad44941d4014da2bec0e9e8cbfc331a8f6aed751b676ab06e3870ebe996bd6dff3c9839ea8909fd816557b3a3ab522 SHA512 f19e2fff4ead001bac712afde08028b08ca271c90aa4c1c2f32f890d76173134f17639382e99c8fa4ff45a0d4fa7081610a3b0fd0265ccc60b0ca2b3e39fc6c5
-EBUILD numpy-1.19.0.ebuild 3731 BLAKE2B ada32716740c9053f6ce7dfed56f33527f1f8b8e4dfc5b527d8aca09a979a8d4633c641d5890dbf98f3d2a1232af72329c22748e1372cf73c9fdbb0a14b4ee23 SHA512 77df51a46bd55eecdc6e989fda75fc63a6ad98f02add240694a1e0b9f043fd28e1c1d2fa3c6f583beb912e6ddfc752660a2080a7c82cc7c55a07c3772ac1948e
+EBUILD numpy-1.19.0.ebuild 3728 BLAKE2B 362a4158ede0dfd199c0d1c8673f4641c9ad455348636523f743154510233a6db0d7e83690b2df2eca046c4dc104b6ed73d5c86e8f21ad158cb4957efe6229dd SHA512 966eee589c4851cd6e3a7d7d312fc77d3d8a6b03db4b6bd092108cf90c9ec1470184428cacd643531e938edc949f400d3c302fab6f157baae8e9601e42aeba1c
 EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 77a3823e986b7cb9fc4f29b8eb29988ad63c73d8d0a5cc40836339519b9d54978c725e4e68f6c191be2e47ef53bf6d53b916a9fb1246355b428ebe0e6e6aa2af SHA512 ec1db0b21abbe07d24267a4d773ed6473efb1b640aaf2eea874526971a75fae4dd263d0f13581756703b4a923c037239093dc266a64ef5d74678cedd3b562100
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
index b57cb4123936..609831bb4b7b 100644
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ b/dev-python/numpy/numpy-1.19.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 44ee4bed6598..684924f16912 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.18.1.ebuild 613 BLAKE2B cee7e2126e322ac84568f63782094214453ff2b511fb010dc3f0eaa4bb49dd0ae5d96b6902d19eff90390d97f1ad3e026a4bcc11e9472b4eba57533205d03586 SHA512 25d195574ed4dd433a58a65485ad75074c6547d6c5ea609687e20148bd79daa82fb573a5cc05c89d21dc5b1f8d8b2000b31c81d24faf4331ea90aa1237fbffa7
+EBUILD openstackdocstheme-1.18.1.ebuild 603 BLAKE2B 69574280b2da073f116dc3f25aa02a7875657e097f3cd21cf14308e82b061a33a0a9c77f5105b6e7084fdf4d1cc5ff5303cf67f66f28883cd3f3da11e11d42c9 SHA512 30d6cac1a1a7fa5de9b49401c806e1fe68a33695af6e351bf3f5ddee58ea4f91d6e9c83282f88793cbf55ba2275aaa8c75347a6eaf1f5f1b672178a5f9af16c8
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 0bf8cdbfde36..d0995244de72 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.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/owslib/Manifest b/dev-python/owslib/Manifest
index 90a1619e975c..bc8c3018cf6f 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,3 @@
 DIST owslib-0.17.1.tar.gz 898961 BLAKE2B e48b10a0bd9dc1e85588b8007261c47f9f754af9eeb7292d4a3fd9ce017309efbe0fc9951a42470a6938194e5903b12ffe286b140d906e1d281f5a2f739540ce SHA512 0772f7698d1d5c6989419a455e8b6d97b0fc9f04a48275b1179f5bcc0fe782620721e840969281941b0f0a3616d8220916090256bb177eff1b2a4df0e02e2caa
-EBUILD owslib-0.17.1-r1.ebuild 974 BLAKE2B 6cbf6cb83499922b1fd6edfd00e024abb06691324a9b69897440dedc426a066e8c52d05aff61a350bb873e1ba7fc247e28d46c9073e9cdf0ed52085fdb6fa490 SHA512 0155c5ea7c6b2ddc4e3a6d4a2e6393deb16509f852db0c58ec47190a86e2f4552136aa64221b6bc71ec75f8b86eb27c20578d749d88d3da4b88a3dc2e7334e9b
+EBUILD owslib-0.17.1-r1.ebuild 921 BLAKE2B 12d28b134d2d7596bfb464e7bb3e268a826028156553aa7ec8adf82ec817f65665bb54dbac99e819b71dffbdcbc7ce846ca63a79645610f69cc45b55c49c2bed SHA512 4b3a4890b46b58559f2dd6c66638871f4f235aac40ca1ec2303729a939d97592b1b37a1564a8a61c3f70dd8ac10aa403a816c7c5c24963cd1a43d59889573a83
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.17.1-r1.ebuild b/dev-python/owslib/owslib-0.17.1-r1.ebuild
index b8195ace184a..139f916e3d47 100644
--- a/dev-python/owslib/owslib-0.17.1-r1.ebuild
+++ b/dev-python/owslib/owslib-0.17.1-r1.ebuild
@@ -20,10 +20,7 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	|| (
-		dev-python/elementtree[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
+	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
index d23aa4dc5917..33d4dd7c5fa6 100644
--- a/dev-python/paver/Manifest
+++ b/dev-python/paver/Manifest
@@ -1,3 +1,3 @@
 DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.3.4-r1.ebuild 1033 BLAKE2B 77255278bb14fff155929209ebda388c5e93774b85fdfdda30af413cd287c6f0bdbb2f403822b3950a6f38df86fbc3b03d6e679568fcf32ab8a2e5f48fea60f7 SHA512 1608fc4db36c647809c1d08aab01d427395bb963bac4cd3a1ef17ee3270d200a938b2c3094ee1ab0ad78a60323d61a4d912a23b5ce93a0165fa5a082c8f7493e
+EBUILD paver-1.3.4-r1.ebuild 1029 BLAKE2B 663d4cb4f532817a23c6ba8c5c7f4e57cd9a9eef46be191b081055aa7d4745852f3202a8a1611d601d57b8554d82de8099da0a7f1aa21c20e64473829e2f8b31 SHA512 6ccf7466cd5810473498e638e14b3f08af8d66482f8b4f3f2677c398f49ec3dbf626c46dbd26650ed04d5349a40b8feba49e710ce627c46a46d78583850da64b
 MISC metadata.xml 396 BLAKE2B 98b898d09add16cea57b4a09ed9789f019280c41c99e48933d23ddb32c79319526c7d7632c882158281a85810a6c3eb820eea10d7acfc8520253ae4c5673ee10 SHA512 2d2c5596ea93c7a16d517e69c0bc8650b16a0f19280b36be8b4ccf394c31d15234d27c0e52ad4c98ab5b964ed70138fc6a962aa70b337ac1f1fbab411580621d
diff --git a/dev-python/paver/paver-1.3.4-r1.ebuild b/dev-python/paver/paver-1.3.4-r1.ebuild
index b885fd9569fe..a751a449de0a 100644
--- a/dev-python/paver/paver-1.3.4-r1.ebuild
+++ b/dev-python/paver/paver-1.3.4-r1.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/peewee/Manifest b/dev-python/peewee/Manifest
index ee033cb7d4bc..a2b8b6f24c8f 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,3 @@
-DIST peewee-3.1.0.tar.gz 705099 BLAKE2B 1dc528082337ae509fc9f91c521d7bf036179ad6b1a5a93e113d594ce819d3a9cdbb7e687b51acacdaf242d542dad138ce2a21f9dcc19483c7361788329a53ed SHA512 628eea27d51017a6ab87aae9ae851d749b0f437fe1806957b23408ad3c97bbb93e5b84c66c5e70bfb7b55c9f29a0c517b84e65adc0f979da450987d670661e84
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
-EBUILD peewee-3.1.0.ebuild 1267 BLAKE2B 76a05179c1e6a643ce481d55f42eed67eede342a713e1f17aaf73651e432920691ef4c7585a1bdd53df6b0bdda0476b8d0e087f3b2f8d19f85d90035d8f389fc SHA512 00b639532ccff586496e8273bae51007ccf3ac9150366e56fbe559cba54247e543b59148246e7e847036409959fdef4a7aba2f52f879c0700a5ee34a038517f6
 EBUILD peewee-3.13.2.ebuild 757 BLAKE2B c9df37e300014ba2926e1e33b6e4e5b8d50b04bb31687ff4dfd21d84da7faa0d7cb843970ccbc817ea52750e97cd8a351ce7c56d6fe0c003312a8a9c53d39004 SHA512 8255962995c158f633702a8d661c80adb7a71e03f630cd39c6297ac863833f2b87649e2fee6a10146e799ced0040fdc9746640d1dc79e8a186c68782f83ef0c6
 MISC metadata.xml 330 BLAKE2B 744abc7ba6933e67a2e85359c870e51ed2e5b39cde3adf64a4e92860805eefc37e8035000b1728a921816e0713c8757f0fbcb40206b72505117b2bead9ed2642 SHA512 a75ad6963c2dd0a763e7f11b42a5f92d536a7b4daf59acea56a91b49c11996d316d3fc27b04fcba9c4e7556305543eb44d87ac909a65f937faaf8fd8c57110b2
diff --git a/dev-python/peewee/peewee-3.1.0.ebuild b/dev-python/peewee/peewee-3.1.0.ebuild
deleted file mode 100644
index 78dda8ee3b05..000000000000
--- a/dev-python/peewee/peewee-3.1.0.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=( python{2_7,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Small python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-# Req'd to ensure a unique tmp.db for each python impl running the testsuite.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i -e "s#test_suite='tests',##g;" ./setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Testsuite run using runtests.py does not require deps listed in previous ebuild
-	"${PYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 476ddef43004..d4e73f2c4141 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,4 +1,3 @@
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.7.1-r1.ebuild 863 BLAKE2B 42d007072b5699c80917287d4e78d26de296d0c99ab9d1202ac382e4259c4fb323896bd7b7d8efb071ff1ff3cb7807794adb6730c9c5536e8e3d96a48be20aa8 SHA512 101d2a1a14952662796bbe30c7802d3222ffc31c956261d027decf0f2654a40177944dc051407f68fe9a11897ffc1e0dfa7356bf658e47b1bdc17818de8f444d
-EBUILD pep8-1.7.1.ebuild 1072 BLAKE2B 58ed1820653b2065e71cbcf0cb2b93471d31ff19eda3135450e9eb4e7773e7e86fe1c475e4d7658bf42d42ba12350cda0c2d68ed717c798410a91d16bbaa6e41 SHA512 10ea17efdb7bdc0082fc9a906d8d9918141322ef981149576ba484cfe693528ff6eb2d0cf4cda5e16f9e31c2ede8b6e18d0ee5d30594ae6c829608d895bd1c5c
+EBUILD pep8-1.7.1.ebuild 857 BLAKE2B 92d49caea55f426384f0ed3ee81cfe5629826e6e82ee2b2e2851fd827b6369ccd9fe0761f7c19e704798367f03ef45cd7bfe111cfaa1bdf3e321368295b25976 SHA512 620d9fa6d68448cde82f658d70454b710e56ada6dcb46e2d2b93b34946162eb0cccf8c28b3c1893a7bc58f30b5f49b14c59eec967d046ef21328cc3597b2e368
 MISC metadata.xml 398 BLAKE2B 36900845777c438858178ad562d5da58efd9e2e39b6ce3a062cb6bdfb48f970dbe6d18e57dce711b4dbf1efa6c65fd4b52329b4a2a293bfc21661670a7c1daf5 SHA512 e700e6ff7cf5fb6e85874a2ef1c07d35b635ae55ba0d9e346b4fa9fe2928691203571a85d2a9f63ddbdb3d51904b4503ec046adf4e732c18e825b005dd7c2125
diff --git a/dev-python/pep8/pep8-1.7.1-r1.ebuild b/dev-python/pep8/pep8-1.7.1-r1.ebuild
deleted file mode 100644
index 66396c091a91..000000000000
--- a/dev-python/pep8/pep8-1.7.1-r1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# AssertionError: 7 is not false : 7 failure(s)
-	sed -i -e 's:test_checkers_testsuite:_&:' \
-		testsuite/test_all.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index f149f5a45665..b8c60182e655 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -15,23 +15,14 @@ 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="doc"
 
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --statistics pep8.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-	esetup.py test
-}
+python_prepare_all() {
+	# AssertionError: 7 is not false : 7 failure(s)
+	sed -i -e 's:test_checkers_testsuite:_&:' \
+		testsuite/test_all.py || die
 
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/picklemagic/Manifest b/dev-python/picklemagic/Manifest
index 1ceca7e19bfd..ce008411a940 100644
--- a/dev-python/picklemagic/Manifest
+++ b/dev-python/picklemagic/Manifest
@@ -1,3 +1,3 @@
 DIST picklemagic-0.0_pre20160415.tar.xz 23364 BLAKE2B 07104393d41c68fabb26d642b6a78b5b5506322edc1322f6a0957c485c2681aafb388488b4d65d920102fb56839ebdeb82cbde909dae3d982311a3d776ca8aca SHA512 0b0866895df5f5f49462d75ad6a435f93796c60eae2442350ea0768872cc1938406b68f5ecb54e1583c245c6ac6d4feada32469184e24186adf78d002adfcd76
-EBUILD picklemagic-0.0_pre20160415.ebuild 691 BLAKE2B bddcc9abc86b0440f5ce1241ba24ed9a2b22baf12e7b77a3f953491705b5193da44bd945013ef82d634274f0fa4f1d59d941fd56ab6ce7c8c78586418c0c9bd9 SHA512 2bb379b51a18e1ce030990847c21a9a03d9c7872a5af684fa78876026283e0d712db6f4bb85fe6fb8e5838abadb658d229a64fc3fd2ea9b5edda5c7a2abc52be
+EBUILD picklemagic-0.0_pre20160415.ebuild 685 BLAKE2B e72bf693228e753d09b9c5e229ae23dbae5630b9e421e27ccfb456820092e9c0c524ccac23755019e59cdc5983eab34e8c6c32ee314d5e8664036013c39df845 SHA512 d69ff13f0f5fd503c188eed3df4444c39e3d8ab9af91822541d2bcee1174cc0535988937f4f0f594992a565b9cafce8ea098ef469387cbb9aaa74edd181ebb61
 MISC metadata.xml 1089 BLAKE2B b649f7de5cb150c5f7e5d81b16d42f20ed9f5b94a4b071d788a7caf9d484c9fa1eef38fd6d0dcdac4b0399b7acd557b779ee263b9d22ec081d8845b5d3ce9d6b SHA512 02633df935ed2172dc10ebbc189bfc4385789520900d2147f7ae3a7ec10951f450cc720e487af93b85236548ad93f9402f4b36470ea1322ed15fab1c4efd3685
diff --git a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
index 66c0a794e6ba..b21a49749ade 100644
--- a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
+++ b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-r1
 
 SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 132957d8c14c..7c9ad273c8ed 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 693 BLAKE2B aaa3c3dcbbb46af8e480b94af36058a80df16145147b3a547376a8b050b5df2b6b90c0325a30c8439144956f77901bd6ce553916e9a879ae2be00efbd0692c37 SHA512 6e08c03ecd9347ef488af721a9e53e1e8810cf3513c0b6b2b9c3d8657bf13c8e5cc944db4e65f128264e271249b6d146b2f0fbd6456da5b94c9b9887b25ae558
+EBUILD pipfile-0.0.2.ebuild 683 BLAKE2B 1351f993994f9be71d81bde4242ae44fd59d7e903cb42a6eb65a8c92bd2cedf2594c340399423023e1bd327411405a2285fcced2067189bcaad1132d17e0f66e SHA512 ebe2077b57c8a2a309f0543f2558913330f890de093adf5a458ac3a026b91ecf341ebc8d6e9feeabf14a0808c6be7f0a28e52b167693e807a059a415e48d6ca6
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 55fa3040ed33..5ce953f15094 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index f371e17ce79c..6d53ac8c450e 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,6 +1,3 @@
-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-r3.ebuild 1210 BLAKE2B 85c3b890735a763a090981843232dcc2b6ddf376628a621974f8c8ed36baf3c11f5c4871bd42305c598025e3f8a75effb2e4ba7ad542f9e2b7dbb030221cf572 SHA512 c53e33accd514d933e1e88b50d88337e6d7aa9cb9057085ca0ba43096f07540d2469ea6de7a9f535d96f87443ccf77d7c6004cf6f1fdf9cfe380c89c47c2c4d9
 EBUILD pmw-2.0.1-r2.ebuild 1084 BLAKE2B 95d8ae7c0aefce0f65c6a984ee898f969c55cb17d62bfade8d2a17594af1e5e95f8ded1917a305c728240ee303f3eafe092d7ed5b3755510f5a3f42cae16f642 SHA512 7417a975f8d3b7fad4acbde672c341facbec812f2ed5e98542b8267220ba448285b1c07b7ac75a989fcea0cb8f727dfec9de702419d1bb239f9ceecbb2c5ea89
 MISC metadata.xml 366 BLAKE2B c2d56d3c744468056b41ca45aaff5263692a9055807ae406644d9c482489f004271d932d56e078a2d66bdca3f17332e0ac03c7f93d7d41890db0eaa90c004002 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7
diff --git a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
deleted file mode 100644
index bbfd0f35f1c4..000000000000
--- a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- src/setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index a5f9039..cfcf8a2 100755
---- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,7 @@ setup(name="Pmw",
- 		'Pmw.Pmw_1_3_3.lib',],
- 
-       package_data={'Pmw': ['Pmw_1_3_3/lib/Pmw.def',
--			    'Pmw_1_3_3/doc/*',
- 	                    'Pmw_1_3_3/contrib/*',
--	                    'Pmw_1_3_3/demos/*',
- 	                    'Pmw_1_3_3/tests/*',
-                             'Pmw_1_3_3/bin/*',
- 			   ]
diff --git a/dev-python/pmw/pmw-1.3.3-r3.ebuild b/dev-python/pmw/pmw-1.3.3-r3.ebuild
deleted file mode 100644
index 882fea57a9a2..000000000000
--- a/dev-python/pmw/pmw-1.3.3-r3.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=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="Pmw.${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
-HOMEPAGE="http://pmw.sourceforge.net/"
-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"
-IUSE="doc examples"
-
-DEPEND="!dev-python/pmw:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/src"
-
-DOCS="Pmw/README"
-# https://sourceforge.net/p/pmw/bugs/39/
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-install-no-docs.patch )
-
-python_test() {
-	cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die
-	PYTHONPATH=PYTHONPATH=tests:../../
-	cp tests/{flagup.bmp,earthris.gif} . || die
-	for test in tests/*_test.py; do
-		echo "running test "$test
-		PYTHONPATH=tests:../../ "${PYTHON}" $test || die
-	done
-}
-
-python_install_all() {
-	local DIR="Pmw/Pmw_1_3_3"
-
-	if use doc; then
-		dodoc -r ${DIR}/doc/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins ${DIR}/demos/*
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index b91a21f37b6d..f72bc90f8a21 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 835 BLAKE2B 25bd425d2dfd2a6a54637a9d964411d8f6f8aa75789125ad1700727b008086b0768c6336c7f5395fde57418b4c3a893d8fb5c241d104656b07dd29a94ec2979c SHA512 a7abbcabf59f2abd3b9bfe9875ad162a329f97bb5823967863babf4f4034ba60d2dcc2827c217f17434cdf1054c926a490add14b074c998a6f5bb149634fa4fb
+EBUILD polib-1.1.0-r1.ebuild 829 BLAKE2B 106e6432c5a43de18da3a4a5d94c18bacf57c2345b66062a3c19bd648af9837610b68fce1b7dd77d59f9ec2680358762e8e527598b6030ae63bf65baf8928440 SHA512 055c20c1faa7f7160a593627a7ffaa6a534970669f81034964e4a84633b147ce2cc4209ff309a44528b2ea9fc361d2561d813a29314e0445b4dccd6b763a5221
 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 213c0a8cf06e..a73f724ff924 100644
--- a/dev-python/polib/polib-1.1.0-r1.ebuild
+++ b/dev-python/polib/polib-1.1.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/prettytable/Manifest b/dev-python/prettytable/Manifest
index f05fcdfafc51..ffab6dc3942e 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,3 +1,3 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-EBUILD prettytable-0.7.2-r1.ebuild 603 BLAKE2B 9e39af9f3948dd40770a721d904a5e6b279db3966e147a6e4724237b4363fe0100710ffeb6ca2d6e5ad9b4ea2c7e51e2ea82d725d47aecc2f87194b069a67290 SHA512 173b0b05cf870890013dbc16bdd749f9b1f7e2db0c89c32689bc02ac87accdf48d18abc6430bd9703dbe2543a06834c4e3b8603229d19ed923d2a4fde2c428ca
+EBUILD prettytable-0.7.2-r1.ebuild 593 BLAKE2B b2dc0968e6362b62e7dc57adaa63ce07f916f2aefcbe9275a69ea92ddb50f8214a20354d9222b6a5b9046cde19f8381ff38e9405bfab57be7528faba74f2755a SHA512 7154946690ed4bb294a84e52a84865c49eb45907c416713292cef9f2f11d2f003c8a26d7883263a34c5c41335a596d09e98653140472a5deda8d220f051c7599
 MISC metadata.xml 495 BLAKE2B 9c3e9523d22d7e5ad09e055282736a197e28df220f1c4cda5cec07e7f2ed05902e295ba20f8b1babb31a2fba802ef59b7e61f40b8b3b5487bc51edbc4730733f SHA512 3f8252016bd7e13eab68e5bbff995607aeeb5b02fdea7ed189026670548370d5d124145034e571ec6f03e30e8947923abf8e9d4546de0f28819ea78ec0cce341
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 007312c8738d..24736c304290 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 9bbd19abf444..4e7f2ef2fc8b 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
-EBUILD process-tests-2.0.2.ebuild 638 BLAKE2B e0b8cfc8997e79f6c45d86a617f6e3c9b8725c070fe2c0d837a5de093bb3892d9f8a4778c3caa74a78d1c142854a71d632b9709684b67c6c7911b7d9651a165f SHA512 ac7ea0b9445637cf77156d8cf30ec4c5470f5b200f22dad869fb1a5d9a1984f7b21a0cb821fe75c8126a51be44e693a5917cbbd1e2275e02ba2d38ded8510f38
-EBUILD process-tests-2.1.1.ebuild 647 BLAKE2B 39c48ddb7d9a6be8e198a2458a25ed66084606401df3eb6e3e4b88d272e84c30b2771935c95d7c1f42a9c82073e01965dd5578952c66e02024d2d4ca0e588f3d SHA512 d3b04fd8480aa2e6be951eec2181dd30486a552c8c2dff62e9c79625ff3e3c0aa663060e70a5f67bb9b60f4e69b7b0fa9f09e2b48dd3cd72e3d60872f7249e81
+EBUILD process-tests-2.0.2.ebuild 628 BLAKE2B 7c365f149c1bc8ca2df6440a9651fd7df2764962289f40a3f7459b2b8774be5398b94cea0a5df633528d3995d7a0f7823c44eb4b9a917a9a0589a34c05c4647f SHA512 5a106c5d5295afe8b283dce39c44222351100cbff55f4696b1e7af3db802170ba84800577360f5bdff262dc11527d4bde545ddd33055c0b14847c34cf755efe9
+EBUILD process-tests-2.1.1.ebuild 637 BLAKE2B 185230ae7c1de695d3d0d00db0632d6ea424594bf1c0ad13e9acdd2515867a894452ad62c8e0718ffdc71184c2b29cb11d532df666dc8a3aafe2e489a60baf38 SHA512 51e9a0e5158116aabb5aed37031a9da8585affce380e90839b748a1b1c3fdbff8c6f3af7c25550421c8863616593d10a5ed373ed8c711dcd1cd3465dd47615ac
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/process-tests-2.0.2.ebuild b/dev-python/process-tests/process-tests-2.0.2.ebuild
index 0a4a499d8299..71d5a7a42405 100644
--- a/dev-python/process-tests/process-tests-2.0.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index 5825fc67ce55..d9912175eee2 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index ca3294f7750b..e907fd941a94 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -5,5 +5,5 @@ DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
 EBUILD psycopg-2.7.7.ebuild 1541 BLAKE2B 6388fff673f66631cdba8911a16e36e3bd575d2a88c85704297ac7fc6ba4a3c351e54625f459e89f287a44171ea9d1c15f456d55c68e29a30b24c4784e2be1d8 SHA512 b420616a1edc69f2a181651d2e11cffa0dd5896bb239d2e5c9e642540fd9eccc70a764c3048d432c0971f751c8b3f29f92ce86358995614af4ea02d371502851
 EBUILD psycopg-2.8.4.ebuild 1823 BLAKE2B 934431e7b9a7f392e5326ff1859f31ace3a116515c477c9798fb3a5d630b19ec6b584176f03dc1a11455ebf7f2432463d24a989efccefb69ea5444889cced617 SHA512 f4b840703a26b012d0a08155bd6a298fc25fb01a9b08f073c4e06fb49c0c7ebc1c40a1ec010bfa83b2bd138165c6a459bc8b91d47e568617f90d9c2b2f9bceb0
-EBUILD psycopg-2.8.5.ebuild 1530 BLAKE2B 158681c1409fd4f9a82613b8a4e81402a887457f5b0913da02ff5050f1f76b00b1f97e9ae4f64454d75934f2777aed1812a40359b213b51a4dd795cc0c824f33 SHA512 a0be8c4bc42caaf4b269cf195ad6e3d89cc70bd51112712e5bbb45f4a2a18ad8249df7a307251abca2ad2e24f65e854fc4e42999e28ee749f606fc8d1011558c
+EBUILD psycopg-2.8.5.ebuild 1527 BLAKE2B 31b6706884fea6f46f1f5359fea321e00aced8d86bd3c1552392390c18fed3a27011826f58154211e9bdfb84cadf2132d6ce9fede7638f790f1adbc99afa5860 SHA512 dccf0fa9577529ade80f56e0d02bbf9503a7ea9fd9725dc48ad508589c4e1aca20f1378da8eb56ad9470faea186e7ca00dff37882655178be3095b73e0c776da
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.5.ebuild b/dev-python/psycopg/psycopg-2.8.5.ebuild
index 6aa831d415f2..4a57c46ea97d 100644
--- a/dev-python/psycopg/psycopg-2.8.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 59bfac753494..d87fed99d1d5 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,5 @@
 DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
 DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
-EBUILD pyatspi-2.34.0.ebuild 1236 BLAKE2B 59ea89970465bce9d551c3aa77ad5ebc88a535a3a00a8d654fa89ba425fdc0d185a46e4e20db8eab761e24612dbf6d1619a9bc8fe764b7f0d675b4065bc8f23f SHA512 fc040baf8ff5a3b86fbc97a0dd6b8d67724048436dae2aa24d79ea655df7844f156dbe577ad385cb20ab7ee252a78999a98489dea1a2967d611d78cabd334be5
-EBUILD pyatspi-2.36.0.ebuild 1239 BLAKE2B df692da1cb826147401e5673fd3b1fdab3ba497ce21444871e0dee54b934bb1ecb1cc0ca3f44ea58cfa3711ff214f4f4b93c7eb434675e4497c9e537a2020b65 SHA512 0022a6e95ddd89bb28126f65d2ce7c9c799bb61ff9ada9c98f357eed7e4bca4ef21974c0a172eede13f7592c3643c7cee347aa377e8ca2d9a3a6b65db1f5b89d
+EBUILD pyatspi-2.34.0.ebuild 1232 BLAKE2B 43516e905b00fbf3686785c5f92c7f6687e8ad7675a81b515a34ef32c4aad5778c8caf28f4eaaaf1b0bbf56eb1c71517ce274254ec574c46d9c4d2e5cf57bec1 SHA512 fac094885ab5740b5dd759cd0fb32e98d412074df535797877ef09d884865e0c58eff5d454144d30fed4a0711d99bbb6d6de918590751ec7c68230654c457bd3
+EBUILD pyatspi-2.36.0.ebuild 1235 BLAKE2B d450c9c77dbfc65e7afa24eddc3c4aae624497d66a64f980678158b4d60b6896cc385a4f1c225dd79ef631e77421c779d47792f7419a85a06c0bbfdffd6bab76 SHA512 fbe5d2417d00005e0b37197b668c7fba51c1d068b93306c992226f788f28954250fbdab372f3626dc14bbb26264224bc7e5c008c376a41aa14bf013a9445aeb5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.34.0.ebuild b/dev-python/pyatspi/pyatspi-2.34.0.ebuild
index 30a72070bd9c..911087e56693 100644
--- a/dev-python/pyatspi/pyatspi-2.34.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.34.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 gnome2 python-r1
 
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 0b7083708f43..3c1b5335abf1 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.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 gnome2 python-r1
 
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index c12ebf944cfc..8579b0f5c8e5 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,3 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6.ebuild 491 BLAKE2B 5c6ad932465542e8f7475fdb400e31be972d10eb3dedc3d15f54d25a7c55c01134843fee997d21f0f58e22fddae032b100c11639e2b9ea1b0a7ef7a1e819109c SHA512 417ef241a053dc4220003d40da47e2ff0796fb8059cbe90abafcc63393477236b7b7315649cf0206aba4190b46643cf137c59acfdc34bb5c0b64381266e3e9e1
+EBUILD pychm-0.8.6.ebuild 485 BLAKE2B cb4ac224b69437c755c9b5ea10be2b7996f3e4bf0624d4923701f98380d62aae88bfb4ef8a8fba37fb5305f6192f19626bda1bd28abd8a24af244e6c222e6759 SHA512 fe6f5f874bf081984594ed8368fe798674c4fee2d9744531ed30c64a1d3a4a40b9aa29775a53f5544b0731948d70ff8b736124d80b10d49ae463d0ad5aa62572
 MISC metadata.xml 981 BLAKE2B 94814a08cf697f65b50efcb43de52d9271f75bda4b058cfc6b5010cf5a159f1d48add1c305ca4318aeb7993c9e689ebe09ad0c1fbc0eb485ad58868fe427428e SHA512 1ff1b79c5b18961a5ed7aefc06c367968d05e14c47e3b4ac898c62ef8b444c75d092b1a10213197523bb107e8d2a5e04fc19c90b1381420a8d40659c6f950ebe
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 0a1ff711e519..7857355b68a8 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-0.8.6.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/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 9e828cc272e2..d204cda8e33c 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,3 @@
-DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
-EBUILD pycodestyle-2.5.0-r1.ebuild 1130 BLAKE2B 130e4b41354b1a24331e91b9406a47752a3c8466973bc90cec38973fee2e235f41d7f9abc86907b723898a72b5676709f1bb204bc6da845f0ce78fb508f21560 SHA512 df471dddd80d5b9a4f63f0e5a0c29167be7956f51448b73d0f88946c690315c0757d09b5ef6c684a366444723a94be9dbd9d66eced6e1ad079a492a5d8a71be4
 EBUILD pycodestyle-2.6.0.ebuild 908 BLAKE2B b576b89f64d10a9ccd97da866076b13c45cae967160fba572812d9b7fa88a53a5d68551828da56415fe9afe3b0a6c7c5bb4caac33dc66b9b668d358e12964ec7 SHA512 1f8db0996c51ef2df5f24b708bdfd7628c7ef73d3b8c135cbbc1933cd69a4d390320c08234759a14b9d4eb837916951f99689372f3fb77099cb223e6b7d736b2
 MISC metadata.xml 360 BLAKE2B f3f8ecb3bc2ed8eab2e2283967a5a7a94a5149302e8651e819204810bfc7fe43689f0b1c35824a737fbffbd5967845ca089a539dcd0b50704b6d5a219e3406a6 SHA512 2364901eb99136d33c8343c14fdd7d0f83e6328c311a5a8395068724a2d15d8dc6c6ade8026336ee92cf105e589d7fc960780f70c938f67f48c797503a956e5a
diff --git a/dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild b/dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
deleted file mode 100644
index 930d7e76b424..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-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="doc"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 2db736ef1287..bcc49ed05a95 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
 DIST pycryptodome-3.9.7.tar.gz 15451558 BLAKE2B dca2cf3500d4011b8c37937c3f844db3e8e4afbec2c421552bcdc08df32ae46d8a2dadfaa2d48aac2356374f30154d439cb9e988e1035c570b0adebc58b259e1 SHA512 2ee8ec1094ca2b3813c25b96c71988db479b23ea2e76937275d0fd6421653efd1ce7a1e279c7a20a9de7edcb59e0927121a42112b85afc052edcd6ab2db74c26
 DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 EBUILD pycryptodome-3.9.7.ebuild 1330 BLAKE2B 97e78373d4e5d2d7065d0ca60fa8374d225c48ccf89b51fd51d8bbd68897d5ed37ba237f346bd9347a6cdb3204b5b7b43a28426fa593e3d039259a4664ac4e60 SHA512 3596bf56db6f47c1e9c0ce9568988566a858541128e2962af886d1260f059a6542ec5588bf651c343db73a42e483b64e44ab8fdafacfdd6aa6f53cd46dc1df4f
-EBUILD pycryptodome-3.9.8.ebuild 1337 BLAKE2B b57d6a0f79dcf3196a6bec0288ed1c0d173f93e8cf3a58b65c211797db4fa1977f7f1247968889c6fd860a8cff7656b281a95fb61922b96812b131103eaa6058 SHA512 5b754cfb4f8d6a38695d471036386994f2306947631d43c385678982153549022b87b2cecad9ea24e76b5078dd3be8627b4f2bc8c7c7de371cea69fc0c757d14
+EBUILD pycryptodome-3.9.8.ebuild 1333 BLAKE2B c457cc51e4ef3a551d8492e69db97260510605588e558956c167ad86361cd8b9e9b859ab68f4713eff08ec439c9cb45d1f909d95f84703c299b070cd4db6bf29 SHA512 f3737486909a95ebf3a90294955ca937eb413ab85d6beb9496f0a6fb2298e3aeb28de98ad1ff6bf2cbef7a488840f176c16c571350aaf7b57d0ce256fb50a225
 MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
index 008df7b3b53f..ce3c21b0228b 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.8.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/pydiff/Manifest b/dev-python/pydiff/Manifest
index 3bed4ae73434..9d62967d7401 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 532 BLAKE2B 1e99b4f14692761c232a2ea23c0204a27fdafea61b3a4ce5c420b10880103db0005de235b6e9eb29b33cc141cfe845d3916df3ef515e0bc3b6928ab721c35e27 SHA512 f2669189edfad5221e016c01c1f4108f453e8b0a3a086047a0f4e7c962a92883f344e9ba842842aa8c374eaa02593feb70f9a6012fb1df958874e3fc1f707544
+EBUILD pydiff-0.2-r1.ebuild 522 BLAKE2B e17edff19ac86c0847aac7772b93489a3f29aa56440aa1fa98939e53c32d81776ba5b69789d10ee1fa2409a4211786beda2f217c4d12c594710a28d3cd7bef9b SHA512 d146669bc0450acd7ca2ab555756286a59275c04627a0fda2d129c42f083f11e12c31a251189e943200f3b658c3b57339985558389006a908efafe865fc62369
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index 32ddd1bc3ffc..9883f81d1deb 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 90bde04450f1..24b66d8f0227 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,3 @@
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
-EBUILD pydocstyle-5.0.2-r1.ebuild 955 BLAKE2B 502baf37756bf949530e39f2ce7f224321752371361b1d32921fd2735ecc5d0b31333b31d9c345fad113de3dd396bad7dda30beeee75f3104f4648842b75dd05 SHA512 b18e9594a8639359770df2f2bbac727cb6623bf9a71bbc507d8d0e6593b1efff1f052405eb613fe4e2d9a421eedf667fbca55b3cd890fe768a2e7e465c2da791
-EBUILD pydocstyle-5.0.2.ebuild 907 BLAKE2B 90267da429cbb2ca73745f1fcef6571f6b7b35cda0c2440acc62a640ad17c2d2a98d03684c28f777a37114b29fe58c77645c0ff89b8fbbe977185bfec300a229 SHA512 acc11f13453bafc2494c3a522a4e11c5d3b973951b67fa23bcd5032bef59a05f3227e2dd4a5e95b973b950b8530124369537123c1bfda586f9694766b6f8f3c0
+EBUILD pydocstyle-5.0.2.ebuild 955 BLAKE2B c2f040156346bcb23a85f42b6b7ff3ed0d8d59321b5da4fb8fb8f5c4ab795b4cea15b9547324ea3e920f3525aeb2f8bbc69653928233e51fcc85cfcabe96c72b SHA512 9f401abfdf48c389747a92b2a84668fced98e6cb624d8dd2fddc472bbbe5c0428e291c43437220adc7630917b81ec6cf109e789e676f89c979f98622a6143792
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild
deleted file mode 100644
index 1887ba0bb246..000000000000
--- a/dev-python/pydocstyle/pydocstyle-5.0.2-r1.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=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/pytest-pep8[${PYTHON_USEDEP}]
-	dev-python/mypy[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-# Requires network to lookup github issues
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
-
-src_prepare() {
-	default
-
-	# These tests call pip.
-	# pip install fails because we are not allowed to do that inside an ebuild.
-	rm "${S}/src/tests/test_integration.py" || die
-}
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
index 5d439c03ab4f..42c63035e5e5 100644
--- a/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -22,15 +22,17 @@ RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 DEPEND="test? (
 	dev-python/pytest-pep8[${PYTHON_USEDEP}]
 	dev-python/mypy[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}] )"
+	dev-python/tox[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
 
 src_prepare() {
 	default
 
 	# These tests call pip.
 	# pip install fails because we are not allowed to do that inside an ebuild.
-	rm ${S}/src/tests/test_integration.py || die
+	rm "${S}/src/tests/test_integration.py" || die
 }
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 9ceea5554023..f16eef3651a5 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
-EBUILD pyenchant-2.0.0.ebuild 928 BLAKE2B f717a3d03275b4bf1ca21da816bf36e2361c57dd2ce4e8f5d643151ff14c46a72a1ebc08e9727b27d585dbcc57896b31579cf7b8bb4b1913970ec0d20cf663bb SHA512 fac06375830e23c7066a18926ef9218fcada08014a4f5b55ac2853c3540ebc98791132db9cc68049bcb503804f0e9816c689aaaff890d09e2dbf770c7e17374d
+EBUILD pyenchant-2.0.0.ebuild 922 BLAKE2B 7aa09eb68e1f592421bfec2c4ccadf58223c3a5629e0e833e0ae5eb5690ebf569e2589b830c24b5de5ad5f0e6526f33fae962208addd0fc08d370041c2f8b132 SHA512 a7923243ffab22f51c5e312d9669d0e3dfabf7ed1d2bc1b7f31a72caa1da699ba14531e9b943a2138738e04e387872062dc4db61bed385d688e05c3fa39f15d3
 EBUILD pyenchant-3.1.0.ebuild 613 BLAKE2B 6ad78ffb9272813073271ec34fe3ee0a621b27cfbc93290447c6516d9d25421f2d401ae0b1724e3741c59badb57c7a572da03db73a609b013931018a1b311797 SHA512 af9225a89df7981b3ef381b4b449daf988890f1c6f0fec452126b0286835abfaacce22d259681249ed94b23019654dba46b700c0e0833b834dac5075f9de2e2f
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
index 3c17fb97e4be..1dde032e861b 100644
--- a/dev-python/pyenchant/pyenchant-2.0.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 488ffd73f09b..be3f50e8654c 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,5 @@
 AUX fltk_wrap.patch 247 BLAKE2B c6f16fb2c87265c7b1b9d869d9b92454eeab50f6cc8830b3946a2cc2949a3a17a9a160ffaff66f60f875674dca51e1a4aa905f15047607e64b2f4791ae027f61 SHA512 4097f9a657f0cb96e37620b939edb35f4cfcb28b2be643b87f85e5dde8ff9a4f316052cbd5403396698de3e2034bafd164c7111c890a5b6d6bcf818185342bcb
 AUX ignore-func.patch 250 BLAKE2B 3d2a979b2580881ee1fa1a6e30b2afd639974d00ec7475c005d8ca967a599ef6858d158d2de95501d7397c1cf8c5e68c0bd0a72da5fbf037bf1fdfd0e8e04600 SHA512 66854b2ce487d1182ada54b437ad79ea5395d87e4b08d89c9ed85b67b21d426609406201c19914e0872ee558d3b3109d3b43a7af036ffb98b781e07731239419
 DIST pyFltk-1.3.3.tar.gz 946763 BLAKE2B 28798578e7a90f2c3b6d0be22241207b384643ed5269ffb4bb5940d5e8776e59ae3c2b740ba7ef61f0230e037d1b3488adf78d9af69338204df9572218ed8cab SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f
-EBUILD pyfltk-1.3.3.ebuild 1088 BLAKE2B 3de42e6c2bdd9314eb2ee6bdf26dc1ac01c2492dbe977536506ad205d999bb5aa453dcbc3d10b8a602a9fb4779470be862f7f0bf6cf05c4a7a801de094d5b920 SHA512 d26d075db5d9a41150438090f05fa9a9f1af2ca9cf0701b7514b5012ee7eeffb887bace443ae2ccbff574478d1c7746805b0b0934ff0c10d1ee26deb6e13b065
+EBUILD pyfltk-1.3.3.ebuild 1078 BLAKE2B 3419f4a40638605ac63592b3c8c7042644b8975d0c01110ff2ff2b03e8064a74babf9e476bda65b95e0f084baa109cc05854e0291f7b32be9872730324e80456 SHA512 2f66d1e7f55f4a3bc3e5bc6385d7e8276917514b9a8f9687f568ff78902fe512126ff239d0df3f8a1eeadc62818c6c933cae36b06d3abd19c52809537baf0a75
 MISC metadata.xml 473 BLAKE2B 0e5625017dc5f5196012da6388fd6f7ef598c005cdf6dcb358a230f7b15014f6e77666772bb351862f2e2ac8690d77132b269e9988ea63662855a85a720b321c SHA512 b6f4d80dd9e608ec2b4b1a8d799c5cf0d238a7d908de0b79d30da2d9b60f6745aa1595256e59867774814114ac0abd5dbaf8456c9f0a17f7fbcddb6d8354b4a6
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index c200006f0e99..5491e5461839 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -5,7 +5,7 @@
 
 EAPI=5
 
-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/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index b8904be4bf83..46e315cc8faa 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r2.ebuild 535 BLAKE2B fae960c24cb94955f392f7831855912617ead0836f81efe3a9b9ed792ae9c18bd0e3d0ed87153511885042bcfd3c6995bc8714b7ec1f4239010e3d410823f7a8 SHA512 87c8d3d11c4b88d3fdfe072409e60cafdc04149f9a7b6eb3e7728e13e399887cf18f135a1e0b7d70214f26138fb1b306cff82e0dc64c743937e8f1691fa75f53
+EBUILD pygpgme-0.3-r2.ebuild 531 BLAKE2B a59443b7ec04bb558e9391f5eb7c9949c925cd04ade0da00118eb641720d6dd156c2921772182de78cabf33b8242c18384cbfc65970b32ec48e868763fc3e5d1 SHA512 9219b539befa434ae9f32113f687d4ebf39c2baba95b1558281653407299d02da10b7a49ffeb26a5f3539f1498ed3fd2d9ea6b7c697161dbff2033755c5338b5
 MISC metadata.xml 550 BLAKE2B 93d93ed6170da174718a86d4f2afbe0f1b39d51fe49393ed45b0956ef4c55ee7b74d2376612dd3dd3fd839692bf80e6006cfc87cf68ccf155dea5b6e62cf744b SHA512 aa2f009654855d7bd18be6f2d7f7228bf4b7b532fded48d03173324d26394a1342f0392a373680364387c403210871675763c06e9bbc76e9837f620434dd4030
diff --git a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild b/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
index 35ee8e0e45e4..b4c69ce17e94 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r2.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 flag-o-matic
 
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 546c76e0eaaf..9af01747e4ff 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,4 +1,4 @@
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
-EBUILD pygraphviz-1.5.ebuild 1131 BLAKE2B 54bd69a9ccb8f9cbc2f7d0c262f3a7da648af7cc02938e4d069f3db96ef733b410202dbb18be23d265688df0bf1687bfe5bb8464c9674c40ba7270fa60535f16 SHA512 4960f83a25284816548f9a335458aaf29eff0b49e9cba147b0ecc616605c4208d7243ad6f45f267febae997abe08b5ad66a4efc24cae22821ae6f477144cd700
+EBUILD pygraphviz-1.5.ebuild 1132 BLAKE2B bd4637b862c91e0d90b75200f86fe8ed49e3679b30d88b85b44d95dce8e543e7dfecd683d430808f0ee14baa9a861c92d9588e18199b4204f1240ea38761b032 SHA512 5beacad53135411ebaad0e5410dec4783c39203f08b8d9adb2eb16fedeae6dace0c6d2be80b2b604fdb87d0b66549d92934118576e749f742cfdb7e09f87ff64
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index 12c591bb1580..27d4b325bab7 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://pygraphviz.github.io/"
+HOMEPAGE="https://pygraphviz.github.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 0dcaebcf3388..bfe6806151eb 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,3 +1,7 @@
+AUX pygresql-5.1-CFLAGS.patch 330 BLAKE2B b6b1a6ba3c1bb733a9e267d318d117575a0d9fa92ad9da701324878c6e15812d37d604b22f6d4b1f6fa22d6be243bbe4443fe0c731dd4d5e5a6c4d3331456d33 SHA512 d4ac50accbdb0cd9a65e6f01b8bf3494cc517e6527fb9595a96402e6dd8c481a1458e4689194c28f29dd83bdc891b68fe5113cb1374a347de10391b42fcff879
+AUX pygresql-5.2-CFLAGS.patch 333 BLAKE2B caa18ab6ba4da14437637faf6cea4d27e829c4f547f9c08e33a452b1e5912a24235af823c9ea385bbd1516c0c80a08d3225e373ad64ad4d13873ff4dc5155695 SHA512 ddafaadb4ebfb68af71727f840f36800d3dd78323f8ab0324a16b50498206c8ac33c76a80f24fff7984195ed5ac0fc383bdcacb9ea334f4b47e5046864728cd0
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
+DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
 EBUILD pygresql-5.1.ebuild 734 BLAKE2B a8b5d6dc5cccb8992a4aff2ea413df7e4a03a5a89d6e21128ad91cecdacb3f57ad1e7767f77dbc2879fca76a1f5aca03cf8239d5efe1c1a3cef8436749f47364 SHA512 165adb69cdb63860252552d15d6d0ed5b05a6826f2d9a2ba9d9ea77cfe727235c29d1fdea5ece9990a00254ed39bd57c2aab7ebbc32aefed3f981ef03a635d62
+EBUILD pygresql-5.2.ebuild 719 BLAKE2B d521f3ad487c1b6d07385746ff3f8f3d9febbb32b8f95dcbe1f67facaec1a4eec26b3a40e281fa08682ad8a3d124b5f4e48038d74a1378ff1de9d93d3c49582d SHA512 27965b13f17276d7a2d031fe252bad47f090cfbed7400a00987257d48f1b2b2e0f0f23ef4517c987ea3c3969800fd3aaca2d3a2fdbcfb827eae36642795cad43
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch b/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch
new file mode 100644
index 000000000000..480d0a3dc4c1
--- /dev/null
+++ b/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -101,7 +101,7 @@
+ library_dirs = [get_python_lib(), pg_config('libdir')]
+ define_macros = [('PYGRESQL_VERSION', version)]
+ undef_macros = []
+-extra_compile_args = ['-O2', '-funsigned-char', '-Wall', '-Werror']
++extra_compile_args = ['-funsigned-char', '-Wall']
+ 
+ 
+ class build_pg_ext(build_ext):
diff --git a/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
new file mode 100644
index 000000000000..24b9da21d165
--- /dev/null
+++ b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,7 @@
+ library_dirs = [get_python_lib(), pg_config('libdir')]
+ define_macros = [('PYGRESQL_VERSION', version)]
+ undef_macros = []
+-extra_compile_args = ['-O2', '-funsigned-char', '-Wall', '-Wconversion']
++extra_compile_args = ['-funsigned-char', '-Wall']
+ 
+ 
+ class build_pg_ext(build_ext):
diff --git a/dev-python/pygresql/pygresql-5.2.ebuild b/dev-python/pygresql/pygresql-5.2.ebuild
new file mode 100644
index 000000000000..849038866a69
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index c8d16084e861..248b8e1f3f09 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -4,5 +4,5 @@ AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.pa
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 EBUILD pyilmbase-2.3.0-r2.ebuild 1563 BLAKE2B e13ceefe8eaf32d75d8ea61372cebc26f057dad652f76660300d149016aa7c6820a51e64a3b01d688d973f41631d1e18641e82edf045b1573320546e2dfa8aee SHA512 2c2e81c0530ceef420aa1aa7f0ca8cd3a0ffff251a47b12d9b141111339fa8a4894478b0650acc056bc016220e14392e59309b18155361a38b533e0ec9b1d3ec
-EBUILD pyilmbase-2.5.2.ebuild 1874 BLAKE2B bdfbbb6ea06caecc35a17d1599b5653ece44223b0272fc9bad9b9d9d7a0e38f057354b19a1fd06ff6cfe2599e309750e58da008c97425a28e5fec4978a170865 SHA512 f5163f9bf33690c53cfe58751ed3d3d3545206cdf68c8868223c61e5cd483c15df8def4c51ada7e75f26fcb19e83cefd1950d87e75e3d8b2365e6c635de9daa6
+EBUILD pyilmbase-2.5.2-r1.ebuild 1485 BLAKE2B 5ac454b23bb36d88e653203116f87986e7717cb0108090b0db12867c586a1400ece959aba587832a0f679bb1993d6889d779ee39c2bcab5fc3142df9038f3c40 SHA512 2e98ca133e040161d4ac166147e39e8516a34b4fcb19b6ad61793964128499fd1ae64d7ca207c17370dc366924a1d6b9b607fec0931cde570c3ea1f35df4f938
 MISC metadata.xml 747 BLAKE2B ab28da77947c2bc358815f40f597f5a9973a97be33f5b29910bcd395ed6b722d383dac53ba3083d75077cc1899286d6b9505eb6b0d574035d38b357697926ffd SHA512 a2c785799d3ca82acd3a3d8e8296f09fd63108a318fb64a95ef58a60d7f63a8b6dbaea2793451b47a94400a66d9f491ebe39893ede68f0c896a47dc199d86ff8
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..861ffa45e7c7
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# boost is lacking py39 support as of 20200605
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch"
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.2.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.2.ebuild
deleted file mode 100644
index 0411b0530d8d..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# boost is lacking py39 support as of 20200605
-PYTHON_COMPAT=( python3_{6,7,8} )
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="~amd64 ~x86"
-IUSE="exceptions +numpy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/boost-1.62.0-r1:=[python,${MULTILIB_USEDEP},${PYTHON_USEDEP}]
-	~media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch"
-)
-
-DOCS=( README.md )
-
-multilib_src_prepare() {
-	cmake_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	python_configure() {
-		local mycmakeargs=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-			-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-			-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-			-DPython3_EXECUTABLE="${PYTHON}"
-			-DPython3_INCLUDE_DIR=$(python_get_includedir)
-			-DPython3_LIBRARY=$(python_get_library_path)
-		)
-		cmake_src_configure
-	}
-	python_foreach_impl python_configure
-}
-
-multilib_src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-multilib_src_install() {
-	python_install() {
-		cmake_src_install
-		if use numpy; then
-			python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
-			chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
-		fi
-	}
-	python_foreach_impl python_install
-}
-
-multilib_src_test() {
-	python_foreach_impl cmake_src_test
-}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 7328b33eea83..2b3c092cc77d 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,3 @@
-DIST pylast-1.9.0.tar.gz 42584 BLAKE2B b479fe5b780f6dbd30f20c0e183205ffe87703f26fe8ff04170c7f906705bfe737e965c2a7ebc562943c96a8f9bf7710e84999656d1ff22820254e4f4573f0e2 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
-EBUILD pylast-1.9.0.ebuild 601 BLAKE2B cfc5c3b25a62a2ed1842ebd0f0b62047d75b4c9b2b94b1dc2ecbaa6488a89f34f12a6d584b32d6b7dc037daded5acb184f294a563da0a00b7cf5a636c74eba1b SHA512 caca82e19581396e4f666542458c79a42a536ae3d97cb12fbe082fbc57ff96e7a99ac86ae99e4f22f0ad114afa85ee7547ff863854a3930c8679d575cd952fd7
 EBUILD pylast-3.2.1.ebuild 862 BLAKE2B 4c07d4609a4030d54b93beb3ec6845846a5405af154813bb09186c739204e7dff02466cb8d5eb7abad51791c781392928bb89b5b57e6e61aacdd9b61a11f1475 SHA512 9ff138e601d565c19a101240a1bc5492c4ef68c56c270532cf521b38bb52f1c8465b48c3af263ddfd361483ac26036f9b59f574bd3581e712b44f583ef025567
 MISC metadata.xml 838 BLAKE2B 6e7565ee2b6821052c09371d7cd6dd33964010c15ef8cb7b7a4a4570628683ed16510385f2a54c084ee605c590132a4bb4926510b9805ac7fd7238bb8d571537 SHA512 e0ed92b884e1a5be485ce44bf08fcb6c38068134e083423bde3e4a2f2180d0cb14f76bf9f154f69247a8008e5a952021925110cf1d0985a7a7d15f082150fad0
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
deleted file mode 100644
index e253a50464de..000000000000
--- a/dev-python/pylast/pylast-1.9.0.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="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 7a5b51267af5..995e30eb28a0 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,5 +1,5 @@
 AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-2.1.3.ebuild 1091 BLAKE2B 00fd70adfe26046eb057c8e0ef8cebddc0f2f6a734dde458bdf16cbde5aa1dfc5c76e38d93eb9a9326945f683dd305c3e1cf19d189ca6dd23827c8ac84bfa7e1 SHA512 b84bd95cbc802fdcd5be854032ed8274956bbaee09e7ee66ef8bd6071f82e8b3542c7448c1b205d278ecceedc97e3331ea7bea50247e4e7930040eae35a388b8
+EBUILD pymssql-2.1.3.ebuild 1081 BLAKE2B 16cd75e938c7979ea847d9d62d5143be08f310e34b11ff2108e9b189f55466a950e6f28d0f34a674d99446976737e0f3de87faf5d74ee60fbd336a09e234dc83 SHA512 888ce0adeb628130a2dbf2eac7386cdbb4151adf267bc4313590d919799d50be821cd3d00e4b0517f05c64c25e849f83b2ec3877c85ea37df956ef29d394c75d
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
index 12bc9a3b73da..a7756b26df62 100644
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.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/pynacl/Manifest b/dev-python/pynacl/Manifest
index ba15f64b5ede..33d5691184fc 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -4,5 +4,5 @@ DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb839
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
 EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 00a0f5cb11a1e542bebb1cb0a0257902afaa91108c061aaf06b49482c838e94688ccc1dc9f477acfb6490208a562c9740e90fb6bd8ca351665e3bba6750cd797 SHA512 43ce2fbd3fcaba0e8607d454d1196e840528899670b90fdb8ffe6405a1abc508648bbeaa6ddfc5b92ea9b9e8fc4c88ebb9d52359cf90742dd6f3f88c30314af5
 EBUILD pynacl-1.3.0.ebuild 975 BLAKE2B f1466ee9c913c90b85b02055fb4d8d36e12529cf1399fb774161be152be82890736c920ba54ba3cb14d10f3bc192d1e5c28b396cd8c1be20454b6134105b26b2 SHA512 5b8a64705801c43e89100e04922f8cc1aa554428f1f17cd71ab7567c837fc9a04494d091069d26785e440a58684ba87ca3cf8aa86fa6442c89bb886b7a3850fd
-EBUILD pynacl-1.4.0.ebuild 971 BLAKE2B 7fe80c1616f82a5314e63e8cad91892e296de0de56020f6bed462b7149ac03cd29de3e103570d9dbe0444d7401a1e75ef6443f2beaa0e3babafaf535ef4a7f6e SHA512 36f16556f003698756d1eee9426df8d3308cb168981de0efcc2fe3a55485184b7481e057f5f5a4823c41204f235bc45c6cc76aa7075f261a886ac754582ab347
+EBUILD pynacl-1.4.0.ebuild 968 BLAKE2B b3f3c32694627c1b1616dad7f1aa64e8fefd4389699f37d6a38bbb9a89b5a8563c94a3fbb95c81446ca9877786761da85c78425a4afc04c1eebefa140d03ac3a SHA512 88e1c85535a35ba056e621de55c05719fa416020b86fe256b0bf200c42016583efeb2ec68a15c891a4bf5a5c35321869cd3938b9e6836ae0bac712d673d9b7e9
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index d36d9917133c..521793fab9d3 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 7a7cc6d22219..4d8f38abb5f5 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
 EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
-EBUILD pyopengl-3.1.5.ebuild 1221 BLAKE2B df7a8611a9758e307c314014219cc9fec52dec3bbb74e37a1eec4083d2ed63c766df847d588eaa46de8ab3a3fef70b826dd44a5e223f89011f1f288c802c512a SHA512 da716e362f6d4c31c4c7b886fdd5b6756fc9ff6192525e99b0e92b2a0577bbee2f209d7f2a82c59022d4f280aba33dc1b6bcdb3c05be613dfcd41d62b8ff73c1
+EBUILD pyopengl-3.1.5.ebuild 1226 BLAKE2B 7ef51cf00e69a3ec5e8efb3c2fc68d8e67f27b3938521c8466f718b9714facc8633d8104de37253b1ed9620e9acc30b98865c687691b92e622b8f6cb46650e13 SHA512 60aecaf18be31b82bf6547034ccefd5f1991e3443cafa6623950ec75a946914a46014a13016c1a171f15d51bc5f5a871d831c7f978f0ff6475f25b057d4d772c
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.5.ebuild b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
index 42512ec77ac5..11b1332d0c87 100644
--- a/dev-python/pyopengl/pyopengl-3.1.5.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 virtualx
 
@@ -14,12 +14,13 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 #	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test tk"
+IUSE="tk"
 
 RDEPEND="
 	media-libs/freeglut
@@ -46,8 +47,8 @@ BDEPEND="
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
+distutils_enable_tests pytest
 
-python_test() {
-	run_in_build_dir virtx pytest -vv "${S}"/tests
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 0cd5884209a0..6e949161caba 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
 DIST pyopengl-3.1.5.gh.tar.gz 3287132 BLAKE2B a1d683715f4a57c0374cac827e7bd9c93ca303ac578f50a71edff983c6bf3c32858be454bf6ac00f757c52a0adc3b7df7f03181abf69304ed3621d168f2166d8 SHA512 66a6e07b4cee4d80d5b01cd6a506b54995e499611979f8a02fef76d95d6178fe9644fa4ad794812599be0aad293424be980f4a9d47480983503e09887250560d
 EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 725 BLAKE2B c49fdfd3c6865a898bb3cf3e3054ae64276f0543cb4080a7972db2cf69a0f867f46504691e9f02cbb672fdf11dc4df536f343392b52006cbc64898dc4293c2a6 SHA512 266622db995831b00d9cbc47d4ed8b1bc8b6f46766ce73377042e6dc5727103ddbec82fcee350a1588488e98b6b31ea81d0d3feb4a7f78b30b5e5ea10eb22788
-EBUILD pyopengl_accelerate-3.1.5.ebuild 817 BLAKE2B c46499868e7fd8319de33466160167ba085c48acfdc59883e048696f43bfeb44abe7fafa569def8a3ce962e4e8e756689d65773d439c4457b1aafd00a4207eda SHA512 e8bfb0dcef3448dc93669ea406d4680ef7d516bb4bf6b7a1580c940d6533086bc1078873c6788181d75ada10eefaec2fb238c73eac82013e3b53803ec098159e
+EBUILD pyopengl_accelerate-3.1.5.ebuild 817 BLAKE2B 75cf8c0e829a4bbf8c505703f0bc035f58d6090154063954c54f7edd0fddb277594e9e95c21056f6f4730c31d30c5dcb14a8fb9ab774abaa3161cc278ebf2cac SHA512 e2525c077c0f76781a438c3228770431322d9dbed9c0a9f1bd100608f0ca174e50d307b4827dc962827d2c9eb01e032b07f5ad5e413ce9bd24cc53b4f4d377bb
 MISC metadata.xml 375 BLAKE2B 91123ef3cc783612271173e626b10dbe2a0e4095d0d4d18d6ce506ab1986f41c6db068734187223e1a4f412396e2d7f5d17f3138d2c75066e7d6d869e0d7f774 SHA512 9e5aa22c4fe794cbd2df7dad59135ebf36deeb609b294db54339daa5791765c06bb8c8e99bfc8d85b7104a05ab98370c93fcfe81ea2e0257e20001be0240d967
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
index 2f5bcacd5318..fc62ee831c9f 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index d86417b89115..f1ceadb33b28 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,6 +1,4 @@
 AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
-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 639 BLAKE2B 950a102de841fd8b94f9feae7d5dd0630de289dbda78210c01175ead24a45ad66c9a7a10420c6d3ef65e4a0ae3ab0fda23f8e1121bc331daadf22e5f3acb4b39 SHA512 48d1c73cb76d1029ccae18255f733efbaa009a17866b7a88b31f2b5b3cd9f11080932779520d9191416615b1ecc8fca923694b1bbe1d2761d0c099dbc9b1de5a
 EBUILD pyperclip-1.7.0.ebuild 1223 BLAKE2B 299fede05e15289a8cbe50859862e5a6cc1e10114e554cb184c554416107a91bbfe100797f7f4bb0558c9b0a0049c317741c2a387d49e39680db47eece5d0385 SHA512 d94bac216d464a6f886444d325eaf3e88d0369036c389938228f9db2893d2ebf381fb97d547306465e0c378be65f6b1c7258275cc2ecaed5e5a7f895531d379c
 MISC metadata.xml 357 BLAKE2B 05722f76dcf8c454fb3eb76c2b98cccfb7f2a3d67a72a7e5d79a5444dc89e042261a711d89ddfed8c3cd705bc266b1a17a5372bf59207090c8f856998c2a267f SHA512 1fb9193b49c08c22fed7e498d31551d5f8afcb0551bf63bb9ed605a6b39e5e059276739170b39765ae56ee4faa42fbda892fd54363955a35f3dd874968cceae3
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
deleted file mode 100644
index f1298bc162c6..000000000000
--- a/dev-python/pyperclip/pyperclip-1.5.27.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..8} )
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	|| (
-		x11-misc/xclip
-		x11-misc/xsel
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_copy_paste.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 550c99a4f79a..ff7d3b131bf6 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
-EBUILD pyproject2setuppy-7.ebuild 672 BLAKE2B 7d6b549d6201d7b981c0db9054384f57153c2e86678c691c03946b36e102351de01705d6c814a62e29a608d22e532a8ea7cb44e3bf4a4f208608836adcdb8bd6 SHA512 b743e46083b4581c9d73eaa595c5bbc70529f67f12fb792787c82213bc3730ade1084816cc3acb2a5d996e8fcd6fefacbf8f17786773afdfa5b326e5ef17899d
+EBUILD pyproject2setuppy-7.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
 MISC metadata.xml 350 BLAKE2B 6308462418044a7972e38f09900037e4557be4e76a371b358a2000784e2f44f2f9ed5ce56be11ffc198003c3acbfb29a268372a33618c3453d3e01b33a83dbe0 SHA512 ca89ff54a01f7de3850201545f1964d19d4b909a9d0867178d9f39b180aa159d4f6aa5cc3483aef9358eff116d577d0c0a1c15f74d51f2253cf96e991d40e43d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
index daa6fc4ea0bc..c406e09e27ae 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 21408b9a2d7c..3e48cb218a6f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,10 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-AUX 7.3.1-gentoo-path.patch 1569 BLAKE2B a4dace1ba796c984b57c50c2103649a10ca4c3e18065a5fed2851746dbef410f8b401e0c759c69199a64d087524ca9e74921711e46ea155c18eacfbe9540eb9c SHA512 8b7c7e70896305a13ae26143bfe7a46880b708b70b65338d252ee06093da0d0cca10976cf01c6d819e0e0981cf450213e09927efb602c5a60fc0336e2ccc7afd
+AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 EBUILD pypy-7.3.0.ebuild 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c
-EBUILD pypy-7.3.1-r1.ebuild 5682 BLAKE2B 741c6d99f26fc870a1d07f5b6d0328367e83e5cab4ea98e67166b6edb93fd545cb5960660d4971dc2507d398d11edf1b849447b1f3ca3f7fb3db0b3552a4ca56 SHA512 cdc7777ffcb59cbb5dd6fe28a1e3a070fe90135c4926e789c10becfd66a0623da7ad06798045c447046986fd1b8094d40c8a769b94a25392a7e5abb4bd664b0d
+EBUILD pypy-7.3.1-r2.ebuild 5682 BLAKE2B 741c6d99f26fc870a1d07f5b6d0328367e83e5cab4ea98e67166b6edb93fd545cb5960660d4971dc2507d398d11edf1b849447b1f3ca3f7fb3db0b3552a4ca56 SHA512 cdc7777ffcb59cbb5dd6fe28a1e3a070fe90135c4926e789c10becfd66a0623da7ad06798045c447046986fd1b8094d40c8a769b94a25392a7e5abb4bd664b0d
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch
index 5281781865ae..74ca86a84ac9 100644
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644
          if (hasattr(sys, 'pypy_version_info') and
                  not name.endswith(('_user', '_home'))):
 -            if os.name == 'nt':
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            elif os.name == 'nt':
diff --git a/dev-python/pypy/pypy-7.3.1-r1.ebuild b/dev-python/pypy/pypy-7.3.1-r2.ebuild
similarity index 100%
rename from dev-python/pypy/pypy-7.3.1-r1.ebuild
rename to dev-python/pypy/pypy-7.3.1-r2.ebuild
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 647893dc23ee..e591eb4b3288 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,10 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
-AUX 7.3.1-gentoo-path.patch 1559 BLAKE2B 1c2fc14aa2b0ac65db0931b4e197ecaa4d9985e7b9fcc840858204d5b3711691493cd45120b05ab598664ebbceb52f303d0c98af5fdb5d1a0f7e6409d298784d SHA512 62043704d36b489ab99adf4ace31d12329835d15d8181d4ee2e2b69a0e53fa78019a6b78a11f4badff7f51d310fee09a116120eefd30a0e1e6d4149e77c44c69
+AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecdafc17c76dde4d23169ecbde86ec6ca3e5a9646a719ea91ada57b8a7bf151ee3d63420730aae0a6003136551f7 SHA512 ce8258ac5c87b9c978ce780120c31848306a652d9b87ece90ba17ebbaee545806fc62e6f63538fc0cdf557c6b98eec8c0978fe4fbe3b24ea8e2ab9617c99b1ef
 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
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 EBUILD pypy3-7.3.0.ebuild 7358 BLAKE2B bef55c6f65e06d4b49199c394edbd5485262294d9d634853fb6d216c4353d7dda427512905bf4838518f70b4b1949ad214f9fd04c942dc88e8512d657d2860d1 SHA512 18e43cd8a90a6046aa638bb3fa157342255b23e33dcb186de4f482dda9f328aad099ebe3be4967903170a58c28d7054906de1acd73a9a7581c78e5679cf0a11f
-EBUILD pypy3-7.3.1-r1.ebuild 6881 BLAKE2B 62979b0d96d7c36744b53ac4324317dca1ed319891307a9163bc4e1fb69021d7fab4b14d39d3fc6c36bf9f34d920c12243c0209db1596703502677279f632bde SHA512 9d66b9bb635f000e369b249c2e03592f26db3f611beeb34f5296090d413d2ddefb56130d94b925af009d164af190090226fd9868edd207561fb016c6e8c4845c
+EBUILD pypy3-7.3.1-r2.ebuild 6881 BLAKE2B 62979b0d96d7c36744b53ac4324317dca1ed319891307a9163bc4e1fb69021d7fab4b14d39d3fc6c36bf9f34d920c12243c0209db1596703502677279f632bde SHA512 9d66b9bb635f000e369b249c2e03592f26db3f611beeb34f5296090d413d2ddefb56130d94b925af009d164af190090226fd9868edd207561fb016c6e8c4845c
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
index c9809f89b880..fba00b9fcac3 100644
--- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
@@ -30,7 +30,7 @@ index 6fe62be..a4e9f0d 100644
          if (hasattr(sys, 'pypy_version_info') and
                  not name.endswith(('_user', '_home'))):
 -            if os.name == 'nt':
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++            if self.install_base.startswith(os.path.normpath('@EPREFIX@/usr/lib/pypy')):
 +                # override paths for system-wide install
 +                name = 'gentoo'
 +            elif os.name == 'nt':
diff --git a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
similarity index 100%
rename from dev-python/pypy3/pypy3-7.3.1-r1.ebuild
rename to dev-python/pypy3/pypy3-7.3.1-r2.ebuild
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 9d21e59a8949..0d8b2f3699db 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,3 +1,3 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 596 BLAKE2B efaf81688bf28b374aa01c37c5f371c8ea0573701e00093ff7c333d86f1c76106f6df2fd28be79c1a8ed98122703ac61744b1b0dfd1195ec52acbb95a5912259 SHA512 f22a862f5854dd2541d492ef9eebb26597f1eed0d586c324576f882ac6526f7e4cbc071d3d35dc1434ad18077c4ea06b821b2369491e6b65752dd30438c7297b
+EBUILD pysendfile-2.0.1-r1.ebuild 590 BLAKE2B b1e8743c3e1d4dc9c95ac98781444debddc0b1e7ae2ff4f7362af23658b0452a4d1e4b1489654172199aa22bab8ae6e5a8a9013616f3fa7ee99a3cdb3d31d25c SHA512 0862253aae36053540be77a6a94429f78ddc90de99d90b3aa0883907c0d05664a5cc505d40a6056f137212bb43121930c531bfc76feaf9cb5c6cadf1af64435c
 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 4d916f5de6db..5d6541382f8f 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
index 6fc77650c2cb..7b5ff50de26d 100644
--- a/dev-python/pytest-cache/Manifest
+++ b/dev-python/pytest-cache/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
-EBUILD pytest-cache-1.0-r2.ebuild 860 BLAKE2B 216b73f1199fcaf51c682132f9acdd50e73098315ed0a7154a5d5c4589ab4c312740174f5f4a79a805b4dff8bbf686b1defaf52173fc39459cd6b3e52eebe82e SHA512 2dd9b128e2693951ad9c81cbd3adab0f8e19aa694f137e77aaaf5ef53a54196a7894fb86dfdd76b28ff65e11fbb678af5cc050f6d38944b00140b87212f2cc64
-EBUILD pytest-cache-1.0-r3.ebuild 857 BLAKE2B f8d731cc55345396e27e7467c5e7c2c47c4b75d3adb7c0efe9401c4e207c13671732fe2911c7b84cf928ec526f1d210284fa90e5d21afd7b2a3dbd9bf932639f SHA512 04af9a1ba401552b492ab4af0adaf2ad6444e6e5fc15ce90cb71d21723fa50bbf0a84b38bf8e8ebc849f89292178dd8278c3edf791ac877a7837059d6f5b0726
+EBUILD pytest-cache-1.0-r2.ebuild 854 BLAKE2B 9f25a6205c19e007513c182a224b2b17be935f90b3cc37d313d002e2819540081822fd2ec91cc6bcd98f51447f79adab57b686731281b3456eedd80f385d9b4d SHA512 e9e300d93182535ab4b128d09bfceb84aeb5a8564fb96cf276720f3cbdaf142814d2793f3cb3abb7634bb8b65854835f7bb3f1678ac78f99f0d78b6b9b85e74e
 MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
index 69bf0b434579..375ed19f4645 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
deleted file mode 100644
index 32f786371d38..000000000000
--- a/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="mechanisms for caching across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-cache/
-	https://bitbucket.org/hpk42/pytest-cache/
-	https://pythonhosted.org/pytest-cache/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-# https://bitbucket.org/hpk42/pytest-cache/issues/12
-RESTRICT=test
-
-python_test() {
-	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
-}
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index ccf9fa96840b..2d53cdb31a08 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
-EBUILD pytest-catchlog-1.2.2.ebuild 806 BLAKE2B f79d3fa1732018eb15e15271e76f6c671dae98bd154ba5f26b7e9eb41456fd64a3bad5209c4f0412d0578d54a9790b6af759c90cd14c1f6ba5e4864d469dd9b5 SHA512 5a39dd98369241e919106de3dcf3e8f320c6077853e0ef6b3bfada47fe1101ada7ea2a2d996f6836b111a61f713a0d8b1092577ccbe688bd8174e9d8bc29a8fe
+EBUILD pytest-catchlog-1.2.2.ebuild 796 BLAKE2B 79e00c511c1cdbabb67f4de085f82f393839d91552b4330d5668cdf2bdc29c9ace6943577b2c419e1b1c6781fc7b9fd784890a32ae3b1baadc1ef27982d4369b SHA512 8f65a32e1dfa5ab23f4a47add3b62d19ebc9987a23999b2f8cb7e8166618c15606ab4697765eebda75cbdb297ebc5021f70127c1c6220d31e865cfa95832f71c
 MISC metadata.xml 384 BLAKE2B 0dff6cbe91087adee6e5fba8d8d1e38ad51f94d97808c62d7e68844f5eb9097ce4fa22bd7a2e19456836721880fdf4e54d4abab42fc9c1285d6fdf5bc761a27c SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index cd8bb7dd4e0d..846c148487f2 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.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/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 732f813d0e97..4938ed52328b 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,5 +2,5 @@ AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619
 AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
 AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.8.1.ebuild 1385 BLAKE2B 5b812da49639f40f71f5968050ecccaa3c3e154b4ce96a129e0b46404bb13c84c0f8dcbd41a80a28060b80fea128fed29c2e562c7b800ac8e109bb4080c64d8c SHA512 dca4399dad56456a3154ffb13f3a969d7d14ed57a61ed3b481189f6128636697672a44190c6cb74f2c96a9c94ec9ccf4df23e87b2a8b04642c90669911cfec65
+EBUILD pytest-cov-2.8.1.ebuild 1379 BLAKE2B af9d3b41059044fb681a5cc95a2cc54ff154e254fa45c41404572fbd5ce7583d7a9e94bfd8e8b9a916dffad18a4cf4dd69a86ee36a0c21c47ab84403800693d6 SHA512 1d4c068babaf0c6b34d755e4de2eaf55b3e933c2f2e417874b4653cd72f6793966b28b0df9e3bfff8f0d7ffd45ab0f82b2580b74f2d65eeff0897833c272f4b5
 MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
index 9bf837927521..974fb87fee81 100644
--- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index a9aae90a95cf..80710d812ceb 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 652 BLAKE2B 195fff64fb525b20ae8978e4af5b5b90bcb27ec8d44f2380194d0a03b665ee10cbf18cda7e881b87c103f1a4ae17861522a92ced03645672fb5bdbefec2f75e4 SHA512 9d91a687001a7fb6ea5aa12a1d1943dae14d47c8b22b548d3a8e3982a152fdd8eb6f1741f56d0278bc8d85a3dd36c7d2c9efa0cad8ff15e07b0388379f1e2173
+EBUILD pytest-expect-1.1.0-r1.ebuild 646 BLAKE2B 2c19e380454c57f0dd9022a41b18650fee3c8af32b6b56bbe0af85e5b564c31f9c924e97401eee4696914f7a091aa07ed0080c3dbefbc8d1ceb810ff7059f1ba SHA512 064f79933aa0367060aaacadb37fe253f9a7d9b6f1fc4835ab8a22b5cb0a4b6a99d908eeb9905d3ad8685cf68b4b604628a7680cc1fb3c2f6e080acdee5bbe55
 MISC metadata.xml 458 BLAKE2B b8e23df2621be3f2cf2818753ab7a18102fd3e1ff32e80aa425c50b36f9f7ea736a1e9eb9030920c2882e65bdb2372afb0ece371ee13dbb45b3be3144d73f8fa SHA512 a366c816a1513376742bf1d43bb4cc60df9923b3e191d169ae56ee9706f60cbf8edbe35a195f41fd214bdc4cc10fc35c106d798845b3d45ac6b878f16718eeae
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index 33a5f2566e03..87a8f34bb03a 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.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,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 3330601b3eb7..16d84818200d 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,5 +1,4 @@
 AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6-r1.ebuild 693 BLAKE2B d55f9cc32e4a4c615a52dbeeacc691f7a5de136597b620cb0afebc8ed9f9711c3a2e430020eb6eed010be16b2c1bda50c64f3049a8b8f1734668759318552d41 SHA512 f9bc0090b948c6b3a6b90717f8b2e53c31af7fd6695fac1a1fefbb72994ac2046ef3eb2a7b70944364b48de3a7aaf73628bb9c789eed36274b89fcf58112d720
-EBUILD pytest-pep8-1.0.6-r2.ebuild 679 BLAKE2B 0c43a5b9200a9112e3d6623acb207cfde7730622cb64a8f48bb6f66244171a764de407a0d7f66724240c76aeddedfe242c13a5218682e75bce9afc1afed0ef3e SHA512 a4f79a8b49f1b36b8c23d17e77d94fcbec3e72447cecbdfc925813d4337b37fa496fbf5983299b6bc1cbdf88dc05adc22623206ee3ec4b0e333235d0f4984e95
+EBUILD pytest-pep8-1.0.6-r1.ebuild 687 BLAKE2B 21014cce12554e47aa9e0b07d2170c863a9056d0fc89b5aa7d838384f489dd2f82ba3f19918dc9acea476a00bae02851d5b20ece85708cef2283577c93a40442 SHA512 f2e99a161a9b3d3971bf44bd8ae314544e12975e9ef44d4b8d98d16806425482fdb1af8f61459c3ba3780b1852a0b5a576647ab5e9ca164ff9fdfb5bba11d5c6
 MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
index c772b5287435..f531e8650ff7 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check PEP8 requirements"
@@ -17,7 +18,6 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
 	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
 	dev-python/pytest-cache[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
deleted file mode 100644
index 141399f020e7..000000000000
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check PEP8 requirements"
-HOMEPAGE="https://pypi.org/project/pytest-pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.6-MANIFEST.patch
-)
-
-python_test() {
-	${EPYTHON} test_pep8.py || die
-}
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index a634f8de29ec..24913b983d9f 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
-EBUILD pytest-rerunfailures-8.0.ebuild 680 BLAKE2B 55e83fb37dfd9504c28ba3adafa8b01165ced8ad0a0193e51d32c96fdd9ebcafb2ecdf925411249e4865e17d7549e39ddb4d901a648634862539deb8f0dc870f SHA512 6ac1b59f4c70301421b0a34acd5019a52e132763726345614f216f70bf57903ad3e17de262bdd5cfbe30d21ae45f5f7960363b42439fca4d4199552fb9729e8b
+EBUILD pytest-rerunfailures-8.0.ebuild 514 BLAKE2B 9cd5d3da05110a5555f3c047b36bd5f6e5278a4df69d806384a7dacb7454b1cdf49ebc77499ec61bc3f943c411c996b4797ab0b60f55dd07abd770a8fb588b1f SHA512 10e19071d5a0dbf68c6c377391aa867781b2dde21df0f13efded5baf2e48b5b5f25abd9f30bf557f51176e91f4fe8ae1ad0223e861219643fed106bb0cebf0f3
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
index bacf8d476eb3..0962c178654c 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,13 +15,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MPL-2.0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 48fafd6816df..7868cbd88270 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,7 +1,8 @@
+AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
 DIST pytest-timeout-1.4.1.tar.gz 13804 BLAKE2B 45e9bdf6eb39e706cac2c9484cd34a9f16096d71d0146251bef9591c35c269043c95e641bed40b25e3d2076fe29a5782363bf9130b331eb04c4e867b1e8f646b SHA512 b62b090365c1cfe1a4d544b5645f828e451ec5229313c50a26ce04ba6cb203ff9ab487c61fb000af342f3d499e11f67aff5f84ff5b00328a129f1f39d4aabf28
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
 EBUILD pytest-timeout-1.3.4.ebuild 752 BLAKE2B 059b1014e51bccdddbad59eac0ad718b5523073b6b032838458ddc365897027eccac6ada911142b41d72443cbca27b9b81a248fb0d8b400bf03bcf695fb2b4b4 SHA512 0fc9cf5951d8faa9c6790ca875aa97653c6e6fdf08c73314b5c31589e891bada76e22a08da66ffdcf80b3bee2fabf706c8f7708ccf023cec0183cba33c495c94
-EBUILD pytest-timeout-1.4.1-r1.ebuild 838 BLAKE2B 9b9e4d996627e0e98d20dd9a2d9aad09aaa2998ddfe3237ac05dbcc79df982c9bf98b31f001a136c37dc6ed3d79ba34b736885dd03cc13edb932a3cdbf6f01a6 SHA512 f98cb57629c3d6a4c96cd960ab100a7799f5dc52dc8a486d4df1b43f5ebe57a8401d45f79543dfbf674f9018d7ac55d7910f05a4293bd099d0cc53bb875ca0af
-EBUILD pytest-timeout-1.4.2.ebuild 838 BLAKE2B 9b9e4d996627e0e98d20dd9a2d9aad09aaa2998ddfe3237ac05dbcc79df982c9bf98b31f001a136c37dc6ed3d79ba34b736885dd03cc13edb932a3cdbf6f01a6 SHA512 f98cb57629c3d6a4c96cd960ab100a7799f5dc52dc8a486d4df1b43f5ebe57a8401d45f79543dfbf674f9018d7ac55d7910f05a4293bd099d0cc53bb875ca0af
+EBUILD pytest-timeout-1.4.1-r1.ebuild 941 BLAKE2B 02338bfdcab14553372cf19dd990cf0cae211fa0c2f3a33b8dd8bfce2db713f8ddb11606b88005f15cbf803c607a9815aa47e0d0170881a9e2e796314af932bb SHA512 023668bf37770a54966a20bf6d1ffa44f3b87e93fdf906cb26072fe8a045c91c1f311a7a0e57199d331312061c4bcda63903d5dee4e30664091bd0ad8eb6d66b
+EBUILD pytest-timeout-1.4.2.ebuild 941 BLAKE2B 02338bfdcab14553372cf19dd990cf0cae211fa0c2f3a33b8dd8bfce2db713f8ddb11606b88005f15cbf803c607a9815aa47e0d0170881a9e2e796314af932bb SHA512 023668bf37770a54966a20bf6d1ffa44f3b87e93fdf906cb26072fe8a045c91c1f311a7a0e57199d331312061c4bcda63903d5dee4e30664091bd0ad8eb6d66b
 MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
new file mode 100644
index 000000000000..424cfa6c57d4
--- /dev/null
+++ b/dev-python/pytest-timeout/files/pytest-timeout-1.4.2-optional-cov.patch
@@ -0,0 +1,27 @@
+From 65a79fe8ceb52d7ae978f4a2ecc47a1fd34fda2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 2 Aug 2020 00:11:53 +0200
+Subject: [PATCH] Skip test_cov if pytest-cov is not installed
+
+Skip test_cov gracefully if pytest_cov module can't be imported.
+This would help us since we're removing py2 support from pytest-cov
+but still need it for pytest-timeout.
+---
+ test_pytest_timeout.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+index 16302d7..69707b4 100644
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -77,6 +77,7 @@ def test_thread(testdir):
+ )
+ def test_cov(testdir):
+     # This test requires pytest-cov
++    pytest.importorskip("pytest_cov")
+     testdir.makepyfile(
+         """
+         import time
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
index 516df2f00d54..2821063d3083 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
@@ -21,11 +21,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~a
 BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
index 516df2f00d54..2821063d3083 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
@@ -21,11 +21,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~a
 BDEPEND="
 	test? (
 		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+		' -3)
 	)"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 026e2f7c8098..36646651cb71 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,13 +1,16 @@
 AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
 AUX pytest-xdist-1.32.0-timeout.patch 1864 BLAKE2B dcecdd06bc1e41a1206f5bf08cd19b5bbb35fb5bbf8e81aa188a75e43c648c68b052e3eb6e9041d1f92337a271e278cc60d4e9a7cbdaa43c0f155f5425373cdf SHA512 71520b9da47c272799c91f1856979bb087f7dda73bebb38f6288c2c688953853ce474e92608d84dc17316d22cd7cb78027144269662ce4cc6f62b923acf620ba
+AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
 DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
 DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
+DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
 EBUILD pytest-xdist-1.28.0.ebuild 992 BLAKE2B 1e550a1cb605b0d0df688f89271ea05ceddcd33b8079fe9dfe239cfe66d7c856cc45f81237bca814ad1c44e605b2f111b7fd2e45ed80b5e4a95335ece97b3b90 SHA512 0b894d560dbdfa1deb8f8580d21958af57b1f2107caae0849353202ec622d5c0ab0055f803357c9c11169edf7e85e1914546e0f7e4b82c1d11d5ea1666aee3f4
 EBUILD pytest-xdist-1.31.0.ebuild 951 BLAKE2B f19b0849f99675e4f6b151f5bc2d7364d10f399e7bd14f0200592ba8e1a75ec91a7cd74632140c3ad1f490b32af940bcf6963d4f9aca0b0521075eb050edefb0 SHA512 cd6524fcd8d023928e6d64f8d89828158841463f5fdf528905b88a2aa022609a33553d3721792939bcfcc8e85eb3b281637bc4f494b262229d1b2e092cdd4e50
 EBUILD pytest-xdist-1.32.0.ebuild 1020 BLAKE2B 2c5f03fd87469d54e96a9a051132542ca0779ca1bf0812fe0c85b482446111babfb4060434ce92c64e0bbdc3166ad84dcf69b9254abebba03713109cff4c442d SHA512 5bdb87b6a743db0bff2f99446b1e5ec33e4085ef43fb3e6c7b58f68f8870141c6976da62e873cfad85c925777c1e0b1201dac6ed6de69c0387a75b84a26d4b43
 EBUILD pytest-xdist-1.33.0.ebuild 1064 BLAKE2B c2209689e9a5147d2111d9d1754f871e0c4044d53ca7684c104078cdc5d4672c93c18783aec483beea6eaf1ea36cc312f339e065e8239be4d693b36ed065be84 SHA512 cbbe9f46c7140c4be97d55452473c6976dc552fa02853dbaa49f606e450be9ef158e0f88e5da57a1311f4e681ffd65ebdb03e02108e2a01cf2e5623b015ef1dd
+EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
new file mode 100644
index 000000000000..8595480c01f0
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
@@ -0,0 +1,50 @@
+From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 31 Jul 2020 20:13:24 +0200
+Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
+
+Fix test_config_initialization to be correctly skipped on pytest<5,
+by explicitly checking pytest version (idea copied from
+test_looponfail_removed_test).  The current conditions are insufficient
+-- the outer check wrongly assumes pytest>=5 will always be used
+on Python 3 (which is not true if you need the same version to support
+both Python 2 and Python 3), and the inner condition apparently
+wrongly assuming that invocation_params attribute is not present
+in pytest-4.
+---
+ testing/acceptance_test.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 7f9a551..29c5d9a 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -2,6 +2,7 @@ import os
+ import re
+ import sys
+ import textwrap
++from pkg_resources import parse_version
+ 
+ import py
+ import pytest
+@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
+ 
+ 
+ @pytest.mark.skipif(
+-    sys.version_info[:2] == (2, 7),
+-    reason="Only available in pytest 5.0+ (Python 3 only)",
++    parse_version(pytest.__version__) < parse_version("5"),
++    reason="Only available in pytest 5.0+",
+ )
+ def test_config_initialization(testdir, monkeypatch, pytestconfig):
+     """Ensure workers and master are initialized consistently. Integration test for #445"""
+-    if not hasattr(pytestconfig, "invocation_params"):
+-        pytest.skip(
+-            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
+-        )
+     testdir.makepyfile(
+         **{
+             "dir_a/test_foo.py": """
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
new file mode 100644
index 000000000000..2cc790bff706
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@@ -0,0 +1,44 @@
+# 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,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest4.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 0147c88e77cf..587e38d7c7f0 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -5,9 +5,9 @@ DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c1
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
-EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
-EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
-EBUILD pytest-4.6.11.ebuild 2484 BLAKE2B 4380105bd0be0cfff863b4e609a78d27fdd3b5626b5aa1eae8aff876d3b7a3a165bdc49a2e001fce90321d284bc59b0e72b0c99010de5df7e3d84fa0e748d052 SHA512 dcf008c2ed9cb5144e1691e1ec8231520ca227fabbd991b3eab12424e1742bac615a47aa39a20c6e9cc9aeea80f44b430886470bf8b2cfa3b8949602eed8d719
+EBUILD pytest-3.10.1.ebuild 2367 BLAKE2B c93b94821c7e12da52059066a5116c25c8c3e0869f6fa01fc24420b625950ee267775ee56d2c4760550230418b2867b2b526f833ad9c6bc867a2b8556b895e4e SHA512 b8095d2dea17868bbea94f5037e045a959d0779c93ea97c70aa264fd251e1dfb33e84291d52cc70f0538f357ebb6eb10b740506ed337b452450fe3942404f683
+EBUILD pytest-4.5.0.ebuild 2083 BLAKE2B 7f54fe15251ab1ba8726c326d263a7161370c19d25fb4e802113198874309be85013f2fc86b347dec3a700f1bb582a5599a83b249509dd291962648f2c1d93f7 SHA512 59b9e20af3ad0cc8d40e87230b1d66b80fe3e82b5db6b0bdb7c4dc5fe2a4b37a9653a3cd5f081411fc635189b37c626310dd410c5348ad6ce61cb87eeb2b48d6
+EBUILD pytest-4.6.11.ebuild 2485 BLAKE2B d0c031420fc75604904a84d1220f254a0e45eeb8a5fa9f5072afde63af896e84ab8c2091bc07c824cd4b8e8e5cc5090582021593498a43890fb705b3532c9edb SHA512 7033873c1b1bc533bd894b03103a2e2ddf6714f70d626850dd36162747e1bc87a47fd3c11030bdade9bc03464e4b16f8abbb321abfafb58b82826b3456daa0f9
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.0.1.ebuild 1600 BLAKE2B 8f6e668f808ef7f51067d583234dec08955202fc27c1563adf1bd097b999cbac6da4bd593d49fe7d615b0d77224e713e1432eb6720d5a582697736909797ae6f SHA512 35a9f47973f7007081a98d1fbf0664a203c5e2b2246a3b31e0508d5ec1946719bb0b08834b3249a3dc535a4d5b23bee229e798b98260d9fa4486ab720fad726b
+EBUILD pytest-6.0.1.ebuild 1607 BLAKE2B c525c4db32bbf5cc54f14fe236f4c790da987c2f497b5b34f52ca99bfef53cd3542086bae7b449c1fd6e508742d1aedf961fe4970f500deb47be92a1d0651063 SHA512 be963bedf3aa45f153edefef259041e532205f7866c38cd304684cab8ec4d84a4bc500936a4548832b0644b40628f068c2df15e3e3765167c177664089936866
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 58d5ac51c856..d6514cfaade9 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
+HOMEPAGE="https://pytest.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index a83f1311e0a9..b7645ac3a2c7 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
+HOMEPAGE="https://pytest.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index b3224122e356..54d5e917b2ce 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
+HOMEPAGE="https://pytest.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index af72824c17a8..ac33d51ea1f1 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 7ea1a7d98796..9ff55c7f9af0 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -2,6 +2,6 @@ AUX python-distutils-extra-2.44-skip-build.patch 2560 BLAKE2B 2c027fe6875b1b0b94
 AUX python-distutils-extra-2.44-test.patch 1020 BLAKE2B 5818c26d89980d5f1608a9d0ed59f4ebedecc942d5eee599a78b77ff331244b4969d265390c9e6b6dddd3a0886f2a39eaf7f4e7f631ab6dab9fcdd5dfc02cdc5 SHA512 3381a8ca6cd87635a260f37d349204cb5112718f7a2aa13b384d1c3622fa3e61685c2e4bdbd15e7f8421d2d8554a13cabbfd490e17975d5aa7084c293b161c55
 DIST python-distutils-extra-2.44.tar.bz2 37687 BLAKE2B 3d7e3ad277440bfb6fbade8b890b95aad37589700b69a26ec9a5c30e97491871bc8c8f82b540131859d2ce82cebd3758f29ca510abe28046ffcaa0e7240fad3e SHA512 517222b4e34efba730db53ffeee8b8c8d96bd9d1b6044e6ca84c0f2c1d5c0e044240b899d460c50295615c94c513f7e57db3e34e5db6588a01ec92a73999f822
 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
-EBUILD python-distutils-extra-2.44-r1.ebuild 1082 BLAKE2B e466ccbb2ca635c9d090ecc6a9e80181558ee4918bf1d6ca2a04df7b67775d0c00d9b6bd2a35fef3d9e6983054f9182dba0129cee05df61351210f239c7f41ec SHA512 17fdf960c10b6654bd19c2fac3d72497d3254fb44db577488a0e84221a968cf16665b3c6e059e1d0fc7016c8d0d1e79e3a755b54c8770dd1534ae9728ff299e0
-EBUILD python-distutils-extra-2.45.ebuild 920 BLAKE2B aa6eff79bbacae0546157626555ba8b46de2d7d12439fd0b761b87d649621e12f48a103842993a173794d7acb7f1a303afaa3bdc1d50dde0d4d7e35904406ac6 SHA512 689820557953e0e5dc7ef162ba8c35184a3cea23d33215445c8b6126c7cd47b86bba4f5129646a4f42dd1eed50986f3b55b07a07a8a06e406ff083f5205ddd91
+EBUILD python-distutils-extra-2.44-r1.ebuild 1078 BLAKE2B bddc3c0ac3d30ac47390a6e45ba2ab06cdece280ae3690353646bc61598175082f1d391805e1a0f95a209e1384cfecc887d74557fa1c68e5bfa6f6a43e67564a SHA512 4c2295027f53fbbbcf7a6aed92497badbf44a21b273945afb98631edba4ccd3d4e40b8c992cbca233d054972d1fe1b91fbe8622b23554099c9e042663b1efc6c
+EBUILD python-distutils-extra-2.45.ebuild 909 BLAKE2B 6f04b552636549a03d5517f5d98085afc72e107a80c41c75c284d45b7e146af51187d6c0cca08ed718b76bf20d50e5c8d9596f4a5cc032b2ec14af90abdedb75 SHA512 9bcf2b2a9100ebba20123f01e3baeaee58abf554f01e8b7710e070ca3f27eef891c6f1a4a6c193ea566b22c6e5d210423f3588232adb1322d31ba14891745f35
 MISC metadata.xml 339 BLAKE2B c7a822f45ad521df2cf6837bdc46e1e8473d8fac77428f80561dfd518b84b47353a37064bd0b9ad1e77441e7f376f0f005755d9c07c67e742c38b7dda02e7348 SHA512 2b8f9ffa8823ba2e9f1811782e17e8a6b3011c2096454b3dfa9373d085b4404f6a0afd1d8d9346adedaa01e09f4410c0d154ca74a00d770b8ad5da33a1a151a0
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
index a53af5d7f0fd..be925cb1c86a 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
-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/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
index 426f03e80fb7..c77a8ea00a24 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 9eb1d80a5902..b8f275dcfedd 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,3 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.4.ebuild 512 BLAKE2B e1e648fdcd210f049b0a845ac9f7d44e19bc269dafb7c9ae123c99a1a635b44bcb9859d8516a00a3751835c8b9712d2dd768259d4caea2bb4cdb377475ae91f4 SHA512 d6edd3c6814afa05d9f25fb7c374ba936b723ab7f87a7539173c080787cc8b0bad71f492e4e27e4b1021877c2a051530a915f51a2eaa2814c9a4dce5ae977b96
+EBUILD python-editor-1.0.4.ebuild 502 BLAKE2B 315a68f24c927d2df72ec4a99da799743411aa996f01744bd51ba7c26920ca8b2205de492d8cac3636c393f72b0f78c912732bfdbb36e1b90316fe5d08fc9c26 SHA512 b4572bd64774904d46503f28d402daf8e9ede3c1d5ea4e07d1a49cdb66702fc480a1dbe8d8b0b21bae84eb941bd309e4395c45bb16779d44bf6f2d3a1fddb054
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-1.0.4.ebuild b/dev-python/python-editor/python-editor-1.0.4.ebuild
index f1f26e7feea9..a0cfe0c0d027 100644
--- a/dev-python/python-editor/python-editor-1.0.4.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4.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="Programmatically open an editor, capture the result."
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 30d4d5952ab1..802c1d09d877 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,3 +1,3 @@
 DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-EBUILD python-gammu-2.11.ebuild 786 BLAKE2B b59d9751b4f730e9c5dc5ec7147813b1de8d059cb23a6f0128504eb98b6f52a3a5f247d3a34eb916b3f75a4282065d1b79146789b79861cca308492226da885f SHA512 af045a3dab5a22a175316da7ad09f7030827c508f26cdc0f3519c56a29c1b7b31c29ccfa2131d2c406bbe893451b035502d3e1a6cd4fb8da737c26ecb36f8995
+EBUILD python-gammu-2.11.ebuild 780 BLAKE2B a95b3e68be9aa0417c49fbe1f3df876ac5005b2df076f5b0c4fd499a0df2ffe686dc743a45773a907ec8d53b09e83d4f3776f01b785ea75d620e09296f260c35 SHA512 5f10d748b9f5571e263b8e000733960e9e717af3968cd04c012a032947695549b9985f1e4720a7618cfc26c04418d1f716348af4c7266ce238540897dc127d5f
 MISC metadata.xml 298 BLAKE2B 4943c4978a37d9a4df5d7629dfc523c9c112c4138e0c4580688e7021f764772aa4f4f9478e2c7872481ca0c13c6159511c79ba32d34f2d9df4ba087a7de22326 SHA512 421fd8797b7e76ce73a181e3403f39275594bfec21e9a260ec8740d80e3fa71161a78d6ad23d3b6f6998351348f4901f3b01632a7f086158420484f21c8aa8aa
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
index f29f1e89dae2..20bc74316514 100644
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ b/dev-python/python-gammu/python-gammu-2.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,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 224456cedf3a..924d73e07839 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r1.ebuild 852 BLAKE2B bff1637027d8af42849e142ec4052331766ec49def48b0f8ea9e540f36ea09358d72d0228f988836291a7ca73f09bc5b63e82ac24bae5bc7ca6f50f7963e7c93 SHA512 d41597b6f6e97315311df14778db479947f3e4b7e89a2e3a5200afb9901af835745dd1290a2fc9e80bd9df03198ec8571dc249fad0618137307666a14fb5d609
+EBUILD python-gflags-3.1.2-r1.ebuild 846 BLAKE2B 59bb7f01095993596e59b32962d843fd9ec5746cf7c187a417009345c7e27a261928c32e38d4172b81ef07ac6993797f0bb27f5e7217492fca9e3f9c5645d7dd SHA512 d3cb20129e1f78a28ab23962660fc97377ab3f88707516f4b5614077a1eae872e0227cf36bd136d66d149f7fce6ccdf722a1916a9b08d0d55bcc0ce6b6c45876
 MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 9a25317e4632..97610d54c1da 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 097dd2aea096..0bb1f01a92f5 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,4 @@
 DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
-EBUILD python-ldap-3.2.0.ebuild 2187 BLAKE2B bf7e8c35e39bb472a863384ff5f12ba19ca5f171cfc351e863471d483eabab1f660a0087576957eddf954861b2356caa1ac0f8bccd7c63f1c63ab0df0ffaf300 SHA512 39ba1aa7bf77dcdcccc293bd6725cfa79f1ae794daf397d82876e227d30e23d14af69443ab650acb6f5ad35be3862d59d33e5d278baed2a03d29212419568dde
-EBUILD python-ldap-9999.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
+EBUILD python-ldap-3.2.0.ebuild 2181 BLAKE2B f4ee7fc8f4abbcf8c29bd8a767d4223c119fe308082c4f1b589c9499aa44176d40a7d2554b7a923954c5fde83e47a6a9b8c75f4eeed9fd545d7fac76b405410f SHA512 41b71c123d8784501b8eaa9c915d5c37254fb08c1aa16bd6032db128f5ba75b94296e27b57b55488383fb8b90a1be07b7fbe722481e8c175e55d68a74930d212
+EBUILD python-ldap-9999.ebuild 2186 BLAKE2B ad8f36282fc0a641689c5b09e26bd9d1bf7200776b4324eecf30da32424e6e4c31674c8258fba6a7bd73921912b7544d829643bd868ef6a68a6545f83528a003 SHA512 accda7608fbaaff9fc277f4ae71fcdf5cea9717f87fcbe3e99eb7208371941c41be493703ae5b6345a62c5beecbcfa941d8390520bdb0f49ae12e485689f49e2
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-3.2.0.ebuild b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
index be94a062dea5..b72354b393af 100644
--- a/dev-python/python-ldap/python-ldap-3.2.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.2.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,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 108ef92cab3a..7d0e119b94bd 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.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,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 522ea008fe3c..8b98dbd0481d 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,3 @@
 DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
-EBUILD python-magic-0.4.18.ebuild 753 BLAKE2B 6df466105ad2b68f5896042beacc9fb3b45b676a189d386bae5a44af58eb8160ce43f927d6b9c1739740bb80c53ac71841ad91c836ef5cd113787812ef01ff15 SHA512 c113a5e5f3ae7d759f828fc8f30fbc4f5e193b9ead79f89f0bf262ec052174bafd6f8af1eb080ff0a135caf34d9d0194ca6f18aab805ef6a7962cc62ad9f5ac9
+EBUILD python-magic-0.4.18.ebuild 747 BLAKE2B a1f9decbf29900b1a33b5d1c03374b391a5fbac2660ebe441648304ffff901fb82da1dc4d14f9e19d4f068e7c4aa48e7916264b5d6da1ca048000bad5fede7eb SHA512 7d937b866c98c3838c509c9a989a7508d0c85a02ec60c2a45b7a4280576acd88a3457503a597dcc266f08ee40a908e197655155b96ab96b86f4f5352a7dfe51d
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index 0577931aee79..cba012d735ce 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 69a06d40ad56..afe10ab8307e 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B fa137e728ecb5fa61eef8d593500efcf9c6dc9e642ce9988fb37f2faa3741b95e21d26709501374b75a6a00c6aba7230931ce87bd298e75bb226cbcde77e712e SHA512 427d09e8949304e5a95d03fcb89ab3a606b579fc08bbaf95028b261665c807442158f1acefca6fe7c331883720c7d528c7d41955375603b913c5e44fedb4974a
+EBUILD python-slip-0.6.5.ebuild 1192 BLAKE2B 740c203672153606d68e63e5ff7439394c94b4e9b6cfddcde295d660914760661620fb093067881c1f75f9ec84819640474653fc7c3a0cff9d3b2b42ca492c17 SHA512 ccd5096b62bc5c0bf4a955c8b8a2a23169bb2a6ad790239615854092cac168ed09f91cbf3198216e69de9ef9e4fb6ea0d74b2dffcde28c7f4524b48709b9532a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index 7d6d12a009de..943f8fd32ff2 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index c0bd58579d05..dc50a4c533ab 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,3 @@
 DIST python-xlib-0.27.tar.bz2 207119 BLAKE2B f34f5df34a64557d66f216bd03fb79b22364faab86e82761f43bf7c7cc0af744f6fa9a10b7a39fa42072c8ee0f25cebe3a8324471ecbb41dc3f33ed339875942 SHA512 6a25e796a2c522185e4df027bce8f423432dcbb5c4f74b96eb56e3d0e6e3a5be7570a872e479bbd556ef07b437043f7d97cdb2c21a0bb408e1cded44d2d9fa8f
-EBUILD python-xlib-0.27.ebuild 872 BLAKE2B b0f89b9e907a4c1063d7b050a96eb2add4edaf84715872c4e7e43a9717d4b589d77c7fb825301b847441eeeb7545c96137f562eec91c86b622321159762946ee SHA512 42b5f01ab1c4d6a2cf74c04baa2ed90282202d2398d4e241d107cda6a309a70ca4d6c354b6cdc3d3bf78659a068f020fda4dc386a4262f0b66c0a4d878024738
+EBUILD python-xlib-0.27.ebuild 862 BLAKE2B e462cebfb5134e25582bab8895a1579061bcddb619a437b57dd0dfb9d90cef0f8389002429f3f377fbf49b6050541d815cf9a5158e0095bd5c66b16e9e7b0ff1 SHA512 4183021f26bc65425b22655ac1a16bb3b9f6e2aa3a2aff083b5aa419ed81e2e5cae7ad7ed6e4240a6733a0ca3a51f3e4836326f9017b423c533c4c82383a0d13
 MISC metadata.xml 384 BLAKE2B 625028de31c0d62262d9b7bfda98f2978ee17e9c52890086e6d68bfe23810f8729e03814666d3ffc2a8118813740a94bdef706a391ab908444f1475723a3c319 SHA512 43a2e7161edf8d2a527f35cbc8e590655df487f699e570dc542ab0b3f25b4c577599fa43a09efb4f8f3f67bd6a964acc8b446aa810ffbb2ea7f6dc9ab0f2ebd4
diff --git a/dev-python/python-xlib/python-xlib-0.27.ebuild b/dev-python/python-xlib/python-xlib-0.27.ebuild
index 65044eed3df5..4eee6b607df0 100644
--- a/dev-python/python-xlib/python-xlib-0.27.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index 903f4a1245ea..2eb17b1fc2dc 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -1,4 +1,4 @@
 DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
 DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
-EBUILD pytoml-0.1.20.ebuild 783 BLAKE2B 14781d83f07f7d89cc739a339ba2094b6743aec6d63e0237fd2427b2d78c4d3f07109429555c62151384908d15dd55de90517d1b9095f88f7608bedf4dbec806 SHA512 ed33762453a55f87b41ff7cdac10424d6212421bc11817bb251fa9b12c32d5061321c4aee904313b93dab9c1dba5c8fd0f6ea9126930cb8d514eaf9fd45dd4d0
+EBUILD pytoml-0.1.20.ebuild 773 BLAKE2B ed6e21d5d5d7386279c4353ac1b403023e9149404487e91a21c0530d129dc9afcb506788c0e5e14d140a6c3685fc9a99b91ebf4e02a520723eaed6e6c43ec0c2 SHA512 fb3dbb999a67b2eb689cc25e4ebc026ab595833ee886cfc50a9d6c5ff866cd42780c4f0640911c402606dc63f581ae46e41628a367fd21fe001cbd97a7aa2ac3
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
index a8d4997fd98e..9894d88cc6a2 100644
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ b/dev-python/pytoml/pytoml-0.1.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index d7528f55b158..d23fb625afd4 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,3 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
-EBUILD pywavelets-0.5.2-r1.ebuild 1140 BLAKE2B 47d15bbc93512302743ec001aa4a98c21d91490cb805ed66649cd3fa6f18bd36c8bb3dfc5e04a7a60267aad65eede430c5b9ab9936127a48c378eae5ae7b944b SHA512 c14be9bc138dfadcbebcb2a28c3323881344915933441f51dafeb0b8247bb55c9f04a212662afb74f201a9c8b31ee0a2a32d3e370cfb41e2d617910efa110a8b
+EBUILD pywavelets-0.5.2-r1.ebuild 1130 BLAKE2B 49aea3fd048f82deccbdcbe47e9174b0850d60f89fb9ca0cf2097a1272df78caf4fa97a0b41f40a48dea7585758401fef009e2c216c57aae04fc6f7112622033 SHA512 fdc45941068f9428cedaa479acc186c069eb2696ccd64f22748e1821e679f60a2d9f6db0525c9eb7cf64340dd0daae271432898d5197590bbc11d3db3253572d
 MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
diff --git a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
index f5b815f20181..81caeeed13af 100644
--- a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
+++ b/dev-python/pywavelets/pywavelets-0.5.2-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/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 0275466b6532..d52b2730fd95 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
-EBUILD qdarkstyle-2.8.1.ebuild 1380 BLAKE2B c0c7908feec638ad73404e1fde7b31b4f9dc264ecc127d7a9cfa6af51d5276d1a2202713e526e32263cdcae50878ccbda5ad04a575dcaec0a1a8b6323188fab7 SHA512 0a9f95414cb8dbfb7add285fd75d8df747bdca310207b293c98ed70c2d2eccf7258e78dd64b172a6593ceea6823228faddd3997e88afae82600b8eb501a0e004
+EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B 99bd0d347ea0ce028e897fbde9c0b11fce98416f3de517ea80efea83f894783f6cff71ec28df403d0295ef84d1ac4b6ea58cc0d0858de6e874b67381c191bf92 SHA512 f47628b0d4a16e38de6ba1a75d4dcc1c7d6ff2b1d841370f14f39a2323616457fc226c4bab2ccb4578369a0ec2c72ab85d9bcc486e4ac71b11e57bd4353dcd97
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index 2e031c10132c..fd2c520e477f 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -21,10 +21,15 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="examples"
 
-RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/qtsass[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index ecab29801727..19862681110c 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla-2.11.4.tar.gz 3007719 BLAKE2B b0f88a15a3636a0056d3bdac6e5d5bb05a065461c7de7fe0d5ad1740e87ca78a47bc1fd1af90a8751b553e8e326c830088a4cb38c9ebcad6be8bf9ebdb49bad0 SHA512 90fc2427121ca9ae55e34cf636460099bbdadd844318d9ef05f86790a36e25fb64528264bb7bb99e46b7add96378eff0cc69bb692940c6a1bddfadf86a9abdbd
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
-EBUILD qscintilla-python-2.11.4.ebuild 1782 BLAKE2B 2484322cc56bd746192300cc954f2c5af3041b2b48db25f1c0f952357bb0b037c398727c5161a7ab9aea63586207fb1989c87b599160c0e2e088341ba8356da2 SHA512 26836958cb815c272ffeeaabb858f296f586af6d49f98202dcb975fc83706f964b43cd40f607d1586c0294bea9af35032a562c4c982d72d53cd974518ab32a20
-EBUILD qscintilla-python-2.11.5.ebuild 1788 BLAKE2B 1b82c0af7b35ad9f7d4e343ae772a87c4a6784ef51de5d9155f9d8381976be63025b551dcd1769ed0da349d6adecd341b053cbeb4d1fd5553dce345592ea6b99 SHA512 e5a95258bec3adfbee11ff0b2e97c63a8948e471912edf19869722c4628bf4b2c62340616268f26ac6612d6cffbad7327bff72b427139e79fc0446235d88feef
+EBUILD qscintilla-python-2.11.4.ebuild 1772 BLAKE2B 072599706066b5f1aef1f46c66ab400a6eb031bbd22be331135a09e71b90e4e93fd18d39c845d2d8999d512a431d564026b25fff130eca59e6fbc451bd020153 SHA512 04aed92849ee38c7cfd56179b7631f7a5b570de53793287cd4574ee13c174620075963f4b3237870535a3d0ef8342ecfde4b9daee752f380d8fc8f0791bf274f
+EBUILD qscintilla-python-2.11.5.ebuild 1778 BLAKE2B 78991544dc462dfdad804ad5f30ebeb6ed7e895af06787bc048b83915bbc058f1d474954d8664018aa174c1e4a7d76b0dac5d0e17108e94683f3bc42cb10e653 SHA512 27584d74d0d593e7bdfbb5bd0bdf54ae84e03bbe7de720ce66dd32d21d0eaa1ece24fcc100eeb18bd6f3a07b708f304c91c1c9af2e943f1b053d13a062ffa629
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
index 27a43b25eec9..69449c9b92f1 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
index 45a5ed0c4c68..1ee81a725d37 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QScintilla"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 0d3efd215d75..81ad3aa7186b 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,7 @@
 DIST qtconsole-4.3.1.tar.gz 416931 BLAKE2B ec47c2ae8527d7aee55d6cb8d2ebea39ab1bfd3a268c46306613b67f72c27904db1de52682a47d075d804dad9cd7c124296163b39532936fb1a497ae606b7ffc SHA512 f0f84d95143b4513c3d12af4712c6a5724143bf8c44e7a3fbc06d7a94e665b8d12072dd13eafb09476a3aa829155f4c75eb517ffb2bd6e8bd3c00af3c764e48f
 DIST qtconsole-4.7.4.tar.gz 424884 BLAKE2B 79380a1619498a28eaf7e741a3408a63b58705fe7c0672108b57c5cd9bb7c35d77569ce59a3cdb8dc21b3e403cc41845a534c55838ecf2e82038677132e90fbb SHA512 4564c0ee15b1feaff235ae35a22bfb719497e5f74416ea0ab471018c4d68e13dd05cc4d0180b69151f81817180d4985589340698067b5a2166764a39147255fa
 DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
-EBUILD qtconsole-4.3.1.ebuild 1680 BLAKE2B 249564f33745d57c14439acd6cec7af71829d3d31e4982ee5c57ce71ba469053cf5d5932f4480d1f30f3f0556b27bf2d57a59de54556673568f282011612fbb0 SHA512 ae28aef823f50eebce4ec374704bc83ba3accd1bd1a9df72709dbc3c46c8a45a74f5e33667360fc8b64a349210368ae4d5151ae73cb7d13f70b839f168d9b3ae
-EBUILD qtconsole-4.7.4.ebuild 1234 BLAKE2B 083d8d77ae7db892bcc4991386f63d1091541ae307c3f1baa871cdb7d495da1078d77328108db34386088e945b3054f91542da745f1b09484d113b758b088471 SHA512 18929d14e783fc2eb98962d57127c6e5d3ab0c086b882fe752e5374155fc1042a945619e8f7a6433fd7c4cf1150ac21a71777b3a8d13d992dd2711b6ce893bf7
+EBUILD qtconsole-4.3.1.ebuild 1694 BLAKE2B 162d3af84f4a593ddaf413bf7e0539deb2124a9751412613393ec8adb7f42b535a28292f5206dc97d49f55b2a27165f6f3fb3dd62a6783889bb7dbf43a956f9a SHA512 6da630c1153e3633e3fc1db6f940f42e500cb8829def36c48fb3082965542d24319af5097b982b3756c7bdff2f3bb49a7651a3f2749f9857c64af10bf4ffde51
+EBUILD qtconsole-4.7.4.ebuild 1248 BLAKE2B fbd4cc0ad396ce6af8f8cac95ce74a00682a40df5d4458d0b5ae1a280a0ba9d49db04ada2bfa1431bdfee9e765bbc580542b2e726845be5ccb779420d8a6232d SHA512 241e2b77a9c6503bb0cf13449764dde042f23a250fa404e1d5a8203a7ede10548ee080ecf4d813209ce2000042d63551daeaa59118c7794d013e1eccd991cefe
 EBUILD qtconsole-4.7.5.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
 MISC metadata.xml 664 BLAKE2B 33ad7b3510f6778cf805068f3edd12fcb235980ceb60d06a94e977be60372f1bb8119545a47ba04fbb636a6cb9c072ae1e2581cbe71d3b7d598cf54c5c99ea83 SHA512 fdb5f97ebbd75a451b1247fa015fea8ded2b428453be34140bd5151d2c0a9cba74cd91258903826dd1e419bf8b818c37f3df74ab2b573119628b9b918f80f69b
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index 6ac296b425dd..7e9a961abd2b 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://qtconsole.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/qtconsole/qtconsole-4.7.4.ebuild b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
index a9b413df2619..e8699311b506 100644
--- a/dev-python/qtconsole/qtconsole-4.7.4.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="http://jupyter.org"
+HOMEPAGE="https://qtconsole.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index a149ee249901..7b316d6d71b5 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,3 +1,3 @@
 DIST rebulk-2.0.1.tar.gz 258115 BLAKE2B d19210911cf89cb7c371819e384da95c2159eb92abf9f027cbdf1803a18054c556e73364ae10c5bb0b5007cbdb2156b2118d22d6e278b6a02055bacbcbdbc322 SHA512 7d453b7ba952994dec3258aa95a3f6090e6f8afb5a674c1b5e54e036f41022b887d3d65d21f2023ae6e2596cce3baf52d33fc23708498a4f0aef26d3594c8289
-EBUILD rebulk-2.0.1.ebuild 751 BLAKE2B 7bde43813a7465eeb62e3a0657dc85ac75ebcee3955896544b02cd7b73a29a75cfe50dca64d1e4f24c04b15f875c06d179dcf59a17bd2f605443b6d1f301f106 SHA512 df3c12228b0ebbb875b0f11d826945e7e7b7db8a6343de3efb3130101ee36e15d84dcb4da1d576be8bde44d276e595ae290a3204ecf0a901bab80175918fe2b2
-MISC metadata.xml 362 BLAKE2B 92728c5fc622b180019e7b663a6a76b79031bd5e3c66d67c3c22123175ac40eed5891719550e26b0737444f8fff3013e1b1407dffbf14bc268022e039039c524 SHA512 792ebcf8764e7810b1670b8281ee6d774aa78a918336320b61ed8ab1cd4e114bec2badf0506a4b53ddb262dab20a77606cfde0ae5807b479df09e00f3f458116
+EBUILD rebulk-2.0.1.ebuild 753 BLAKE2B 54cbf88b574153c4b0f2923a02b3797f9b568a157e7fc2363985cb3664967c72c9ecf41c4828a1f79ba31b1d2e7eae5c537633dd252d46719e8c664212b0b610 SHA512 4afadd7c0ac54156c6c7003829f733a2ba1f8f6ff3ad2b899e6888d7690b1995fdcdb72dcf9b04f607f427dd29310b72348b89ef57ef952d8e1467dbb4f2c614
+MISC metadata.xml 386 BLAKE2B 5b6b41af4bf557a88768e8e34a371a52dd7df94a7b31eb627bffe04965664a7b7ab41d3c9ee646b178a1dc447d2364e1ec223164a84b6a04c8cef910d19ab9dd SHA512 b5f8a25a3dc3e6fa49203f824372b951bb551b792df25b580ee531a61bc1c6dbab6291c1ccd9ab0faf70a2f557814273d580834dd93fa9066493ddf6d11cc2db
diff --git a/dev-python/rebulk/metadata.xml b/dev-python/rebulk/metadata.xml
index a513aaa33dae..42103a2395ff 100644
--- a/dev-python/rebulk/metadata.xml
+++ b/dev-python/rebulk/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Toilal/rebulk</remote-id>
 		<remote-id type="pypi">rebulk</remote-id>
diff --git a/dev-python/rebulk/rebulk-2.0.1.ebuild b/dev-python/rebulk/rebulk-2.0.1.ebuild
index 780383afe8d9..2d0556cbf7f9 100644
--- a/dev-python/rebulk/rebulk-2.0.1.ebuild
+++ b/dev-python/rebulk/rebulk-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index e2d317d628a8..01f76ca3633e 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,5 @@
 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.3.ebuild 665 BLAKE2B d4702b195018ffe1b3466cc655991360b8fda1dac2a900d9592cb30484aa3a00677f69146b823fb42d5f45494265bec590e669760c7ab385000015576735bd17 SHA512 06571c596ff4a51f9cef99fd0fe74a0486855926ade0fc0b06c64c8a6ac158fb0b5b33443234806308d65953c23a27f73bf10f8ec8e5a02a7fc753d3444f8ee1
-EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
+EBUILD reno-2.11.3.ebuild 655 BLAKE2B 851ad74f1e1ec2e8853a5a6f78acdbb0f6efb5cd0d44993db535fa314aaad5d6fbdb29ff19393426d93d4ae2b68fe44e2011eaa1ec12bc39a1e49e8006a8ae2e SHA512 91f71a1d1fcdcd835cb2e280057df556416ef472625e79e2365c59d53731c7f09d601eb4c53e22622d5041b007e5b85bfa6cf2e47bf7a025ef302d0089e1aca0
+EBUILD reno-2.7.0.ebuild 696 BLAKE2B 2efbf5787b2d017007961244e3bc121ce27f2227c873d192e698f22f72e3ec96af44b52b3ab91f039290ae868b7280678e09df6b9da8f59e84bc90ac909a95b1 SHA512 8ed5329c3ccfeafb6d56007c06186e2f98cbdec50570ac8792f8a975f441f0b70712d60ff8c1f256c9e0f04df354ee3c9ea515ce8dd68cf55f645f6e9445b807
 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
index 67a2d6e5d14c..0ec706bfa07e 100644
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ b/dev-python/reno/reno-2.11.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,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index a23ec8d58ca8..44eff81e2fd0 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.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/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 081209884489..0b00e3deaf03 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
-EBUILD requests-unixsocket-0.2.0.ebuild 719 BLAKE2B 675856e3f7d16a3a2fefb1064166a6bb089634cbde8841511bb95da90f575686f5450c5c131e0775341908b0d8483f8cf87d1a5792f91ea249adee492d372e4d SHA512 da610653908310171ca7673e17f6a147806a0ced1b5792ba3be1636693990e2c472bef7706bce4edbccd658996e1cd0c3c5195889c9729d87a0b969b7486c057
+EBUILD requests-unixsocket-0.2.0.ebuild 718 BLAKE2B a334af3bd1591500f017080336a5ef34a3ca15259ca99903616afe8b6faa2ea47ccd706b12d6ee257d2587660e9e4453fa22875ea167b11de99b8282605fbb8a SHA512 4359eb328c440cafa1387d2e05ac50e13e6574f65b8e855cc7d547377482bb3fe410e6a5541bb8781ec0a613612b19573517b3f68217740c6eb849e1d697d348
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
index f72734192fb7..e00a47da530d 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index a6d595702d42..cf052681ed91 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 737 BLAKE2B 3d9339dc54af42737e3944e6ed1d40bd15c44e4d5db2c8ec24e255869b51ba62b4fe9cf48777c789d205e317453d2366045b4f29a0b21b9b22f0f53624b44bb6 SHA512 fb0f55aaccabd16a1e1f141032156d8b80e246ebb71013a2fe91e52003bb0a3c9ec74eb89078e31f419bdf9b36652385548426bcddb82aced4fe32baab08f22b
+EBUILD rfc3339-validator-0.1.2.ebuild 731 BLAKE2B 2734336a498eb036e56664dbd6062bac83ea1fea7a295809e9f70f037ced43b42f06c93ec26cea922732320950dadaadb01dc54a3a88faf511ef94536ef3f641 SHA512 51ecc4a843bb41a961a82838cd4e2f67f929057808644b52de58ea3f1b395b1b4b194256db77c642e5ac0b8f6b8ec035c8f7114563a0b940ed9012e4533f01b7
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 9032aefde556..bdaa367e8500 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pure python RFC3339 validator"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 4ffd19f2f65b..37628f4b6f40 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 919 BLAKE2B d9d855517c51dfea8b75d6849682ec0d3e52f1463628cc401cc1578fde3250040dc54b7a865d2e6a2f82844e2f21cbeb73824422a20ed65051ee22d6d4c56f6f SHA512 3c05d4fe0584d438f8232e187658e566ad1548044062689e2b84fdd58114c7c7b0bb25e31467e70c5f290146cdd53b56ffa57438d5b92067b595e3a3f7411c7a
+EBUILD rfc3986-validator-0.1.1.ebuild 913 BLAKE2B e5c865e5c1827a4e055cee2ec0e2a9ca8970d1261f33eade628d4bf5a4ee6378a5f1b5cfcd3f8f589812eb2a2ddd3a92e429ee7d013c74bf6f41cf439f69c76c SHA512 834becfe9920ed2783801d1b31d3fca6fe71d1a34e028cbc680d0f4b8a090eeb44eecc7ce99a7bc929925cff37ca75bc8292e4f2576b471e84cf004d015cae62
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index e8f5dce4a832..c49fb089fec6 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.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..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index d2de026ed050..08196bab5a45 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,5 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
-EBUILD rfc3986-1.2.0.ebuild 705 BLAKE2B ece20ae0f22fbf2613a84c3850ff059729fb5f7303ef889b550d6af4d0ad3fec096d3ccef91080bf9a7e5343e12682bd1043be238d5b93d9adf3b9e5ee5f5fc7 SHA512 73dfda5986bcdc5f1dbb55e5e3b31bd5a9446921929b74b04dc4c7257fc1a0dbb0d9f0966f8e6b93ecbeb54a449b564919d18f5e05e3084c0155089c4eb66024
-EBUILD rfc3986-1.4.0.ebuild 677 BLAKE2B 5bbcbeec57994e85bd8682b84a792bc9f4a36ad63717048e4fa08d49c075e282228ea5c168275d34a9b75120bfef37a3e8ee9a49d9e8dbaaff68923ae129fd5e SHA512 ddb8cfa5a3c574c3e5927606e896563fefacd0db09b266819c4ab96b62fda6c7eba29dd3ec3c3cf42fe29cc5cbe8988b8682f9431dca36640d1e324354ea99d9
+EBUILD rfc3986-1.2.0.ebuild 695 BLAKE2B 95fe3ea442f935fece537c2f9f734505da65d160b86760fea67632660831b0d270d65b23987ffcae61df03e7ece9f172ae1a10e0b1279b7db2886332f909696d SHA512 3a2f6f515b046b9a22d83ccc33ff7aa6f5c6dd004931f938d26d902b9d3368cdb7ad7679e58c340cd4a104ed260e81d7669e76267b99e0e355b38bf8d5bf2b0f
+EBUILD rfc3986-1.4.0.ebuild 666 BLAKE2B 64e5a81df7d6ba6fa5fc5c7add12c4427391a078fcafcf5634c6ec4801ec62d177333787a7b5e69324dae4d7cabfeb70b85d7a4c96ccc7d8bed9b30b986332d0 SHA512 0898d752e55ffc867e775e0382889d4cff0a5620b50fc9857dcd352bba91f5ba8ff4d048ea364551b8f66f60a029622b5aab93bda5af0877e873cf1a0c9f2707
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 7473707fed29..48477afdb570 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.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} pypy3)
+PYTHON_COMPAT=( python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
index 8357a6cf00ff..0c700a7a936f 100644
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.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..9} pypy3)
+PYTHON_COMPAT=( python3_{6..9} pypy3)
 
 inherit distutils-r1
 
@@ -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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 8b1725e12868..43004722b3f7 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 663 BLAKE2B 26febfa435d075da3d85e7c182579f9d75424db572538e09c6b59da2118bc66f6a54e00fa00368944e26dfec3be4cb57a35a176eb0b2bcd14aa782d085796f79 SHA512 fe637a1c985ec586a65bdf0de7224d628a1f32be71e9a6818937496df0663db0addf769935ec35a6283ecad8d55a947bd803b770a03b13ca8a7d930576d3ac2d
+EBUILD rfc3987-1.3.8-r1.ebuild 657 BLAKE2B 702f1be94f1a22fe549c323a5b0b3362e9aa61e53dd1ea617ec49219b70f9cd224d11cce9c068aa03a88c8634f1ac5218a3d780263f5249a1cebe97b810a6a7f SHA512 c98a1c3bdc00c3f3c5d6125e1dc3154c29e3a7e73d93d15c461999e369c6aa993b8b7039f238325381b73566b7c2551acf60adf0dcd553b0044e40226018613b
 MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 2dc8f162d241..13c0c19af804 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 7822fd2bc0c8..2c570923cfe8 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,3 +1,3 @@
 DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260
-EBUILD ryu-4.26-r1.ebuild 576 BLAKE2B 31e23e06517f1d4015b8581da8053a99f29ed821d3b166c87f260312dffbf57eb9c70210aba1a67ed72a9d69e1d4e872060ad5ff3ef169d4bf7d32f53ee06fc0 SHA512 7489227069352aee509c4ee410b1b294117e0fe3ecfb6f7ac921b49c971732d128c0032b5c14aba4dbf4359e4a7a5694c8bdce24f8572aaabff941c2630c12f1
+EBUILD ryu-4.26-r1.ebuild 570 BLAKE2B a9e0e2890d8e73ffb71608313d05ef9056232cb0d9ab599688f5e5f7445e34be11e4cc8b2d5ed34fcb34aeb0fa157af9337f29f1ae4463c55d7013a07edd2df9 SHA512 ebfa4625c704c9a4857e77dfd7e1f8c1a37add2797aede530bdb7a8e6525dc9137d6d549d6b06c0920e52ed6e20ff3ba7b9a03cb4286ff26278edd1a3afa74ae
 MISC metadata.xml 320 BLAKE2B 53cf3eb4dc8485edcfb30a28d51e9191a4c24a3770fe376e3df73534e0ebf7481b5eac783a3bf8d8ffcb6f963c5ec22ca49a568f66c983a6d619b8505d2289c2 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
index 8c8d1c0a7f7f..2db1d6e99e72 100644
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ b/dev-python/ryu/ryu-4.26-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="http://osrg.github.io/ryu/"
+HOMEPAGE="https://ryu-sdn.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index a33cd0164614..e55ab7f1347a 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,3 +1,3 @@
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
-EBUILD secretstorage-3.1.2.ebuild 1140 BLAKE2B 470c2302f451b1dd2d8e2c9b27857b126cda108345d7c5534d91d2c7baf778790f68734ef345deb8ca96cba7f0cbef54813c295098f8fae2632c5e43e853e5cc SHA512 372d1c6ed142f6e3cdb3d574f9643ce8b7f589017f4108326bf8b9912ae3b75b11843a525fa0381f6a2500a8eddd06cd8cfbeb13939082bce901d149e8716c90
+EBUILD secretstorage-3.1.2.ebuild 1139 BLAKE2B 0fd6c169a3424b00178eb6e6b941bfb76cd1cbd02f1803b8500832599ac2ac8a97fb852ec730032bd40558ad7ec65c4c43204c2a26c9e980ea68fc32cd7b69f2 SHA512 7ffd826f02305c3d95628f0ea7badd21135f7720b085469ebc2cdc9b5eb7add5cd8b51aefcb1b1f39213f721400af333887316446b2caeafae0c5aed7dbb69f7
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index 2d2d47a97a81..88740afaaf2b 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 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"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index 2abbd3d9eef8..0958e1cd9cf1 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,3 +1,3 @@
 DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
-EBUILD simpy-3.0.13.ebuild 848 BLAKE2B 258deaa9bc9e725a5f31c3784504e005bc1dff0834904d11fffa270364657f282df1cab17fb4eff123f994e23f564479018a5ce9c57d45ebbf12021931842a48 SHA512 9f0112868381887b9ff5201f818320d787aac0d6c95d58d3aec755ae1e688abc32414461e8175359d9dc1f78b9cc787d0821bb208fafcb8a9890c6203abc52c8
+EBUILD simpy-3.0.13.ebuild 838 BLAKE2B 558e15ab90d8b720df95dad32459e1f443c07b05636adb468067ab3d74650fcffcb79398f5d611af1433c4dfcc879b06451b722bcfdfedf3a5671db97e494f19 SHA512 1e1681c20765ccdbe78fa339e027bfee49ea56b7aca036dddd29025906374b54ab779d945311c519cf325f16c05d84819ad51f385348138fb94c03c58e2deb02
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
index c3151ab6865f..a0f8108c456a 100644
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ b/dev-python/simpy/simpy-3.0.13.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_P="${P/simpy/SimPy}"
 
 DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="http://simpy.readthedocs.org/en/latest/"
+HOMEPAGE="https://simpy.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3e9f08829860..9dddfa2b291b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.22.tar.gz 1050805 BLAKE2B 7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc SHA512 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
 DIST sip-4.19.23.tar.gz 1053640 BLAKE2B 316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74 SHA512 a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
-EBUILD sip-4.19.22.ebuild 2381 BLAKE2B 814fd23dd089d9e9abd815bf5305ca0d3c95acf9445304d6dc945f6ac916ef44c5f1fd7a7ff00f68e9a779b0a6a76af8920d621fff11a45f9984242b2c5fb47f SHA512 e230257d2a8d13f36946dc04a77f163c4e90ceadff7f320ffd05cdbe85049bf5e9f26c99139e21f6ee1bd748661a073554d0190d18513d6fd1613310a8b4a10a
-EBUILD sip-4.19.23.ebuild 2387 BLAKE2B 13c52156cf2cc477403fbbcb2c75998b6b67ef1ee4920110938c3c5917483ac9ee223ae646fb868795f01d62180326ba49f94e48a7a937287d7090f590af9d23 SHA512 049b482664ed679713f0f734f18a47eff2173f2894a41150b577c5fb7d8687d98b6000934ff357fe93d6788ecabe22e3ac1f365a484e333a81f82fe287c51f9b
+EBUILD sip-4.19.22-r1.ebuild 2285 BLAKE2B 2b15308bce64f79811922bcde1a6832ea45a77c19a5def285c8b7daca845391a35970f39a57e9a571219d096c2780b27ddd5b3ae297d83015c87f414f6daed68 SHA512 95c13cfa036323147ca7e84d1943b1c4d30304078465d5a77199d2098d84e6347844cb05044d0816f59a7b76efc4a6d9d0e07c9fc0285c0f1b85ad9a1931e9b6
+EBUILD sip-4.19.23-r1.ebuild 2291 BLAKE2B 11269d98172e1c857441c75939a83226fe82939b28e25de3f36616ba64ea299facd984f9ac3d2591dadf7fc203aac2c35d09237bd28bdf0dca8150ba68654619 SHA512 347ca0d131bec899a29aeb0762304028650d92914d6478db6d5ead81d4c528f7bd2d5c9456f4f2e7d9dacb3b7a39350b4ea40f056162f749266415e1c3624cd0
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.22.ebuild b/dev-python/sip/sip-4.19.22-r1.ebuild
similarity index 94%
rename from dev-python/sip/sip-4.19.22.ebuild
rename to dev-python/sip/sip-4.19.22-r1.ebuild
index 6dfdf1956711..0990210585d5 100644
--- a/dev-python/sip/sip-4.19.22.ebuild
+++ b/dev-python/sip/sip-4.19.22-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
diff --git a/dev-python/sip/sip-4.19.23.ebuild b/dev-python/sip/sip-4.19.23-r1.ebuild
similarity index 94%
rename from dev-python/sip/sip-4.19.23.ebuild
rename to dev-python/sip/sip-4.19.23-r1.ebuild
index 1bb8cb20eabd..81dde8c08811 100644
--- a/dev-python/sip/sip-4.19.23.ebuild
+++ b/dev-python/sip/sip-4.19.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
@@ -50,10 +50,6 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
 		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index c65f4f4a2c9e..f08c6847fa54 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
-EBUILD snowballstemmer-2.0.0.ebuild 545 BLAKE2B 1e0055980f751bb439ded4f79cdf460cc21de8ae69dec2c7cbfb958012eb20b7d308e810c3326eb7754cfa87720f97ba6a3b7a187de68fcaeb9c7b2011c02f23 SHA512 743bcaa604a6bc29d25cd12830d3fc8c04d0160daa9f1ac77914eca791c370977a6a00dafaf334f9498e7a07e9257cca2e9a2261d66a354efdbca5c43242ad26
+EBUILD snowballstemmer-2.0.0.ebuild 535 BLAKE2B 78e1373cf44cc024c126175cce8d7dc416e69c56e1c8d698cf91bc3589e94d98094b4a17bd976f93357f83cf03061524be6c11af2b6f3ef9df559af58eb3c0ec SHA512 8c0991a35da0f9e12b28cac0a16e150ebd41c5430659aeb4b1d4c3dbd97bf8d05dd7bf6a3bce26b6f9a8d9b807e3a017c46e47cdfa4e3adf553c5060ddd0338a
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index 00ccfbaeb113..a6f633ad3dd4 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index ae8650a878df..dff09307ae9d 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 546 BLAKE2B bc53794aca0969eb6e57c5573797af6a0169df139bac0617d5c1e3abd1f4ff0f2a15207c067becaa371c2de8b4fe608e3a4c656734774b73d5af6ffa073246c6 SHA512 724ead9515f3ea558b8f9cfb13e1729eb265d278904950885610d3897da0e219aae61ae660e90a7f19e45a3167f06e2423dc371ebc8634545838b62e63ec2517
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 540 BLAKE2B 054a89f55c2bd1e35f5d08eb123690e2cebeafd7e050aaf4333dea70d781af059e059a918ed35c2df6397cf04f5fca24c269cd05f23d8a80cf1b203499b39235 SHA512 15e81acf82758d508a22619585d134239aa362d0501560c47a69e30e68d4c3a378b239239d0d006fc9fc2b5600841b6aa9c7810f837e71e63bc2d987c57626de
 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 efce491f868c..43b367986633 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
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 92d3eb968cbe..137c2633079a 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 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 561 BLAKE2B 0a57a865e3e7845098647f55574cb05617c7016a73c197cdc89b8356cc325761f80655d89d3fc59cc75e69a30e4c87a03e28e26cc74614d455e18379ba2e509c SHA512 81d93118606b6d72c0861de0381f14e6bc524b6f2e3c4aaa37b9915721226883d8bb4bc4d004f7059d05151d0a8d9a35bdb2c3c369a2a8e174f06c2171946356
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 551 BLAKE2B d6ab7419239e139a4b44a6f019b7ac5a253767534c076714f7b3b4ac32ac9147f1046a2c3973193ce8a4503d739394ae295b1a0c63df382dceb19e8c649b548f SHA512 84a91583bbbdbde755b275866c5a5ab0d6ddd3e5f4a65869150a76205ba8a78c6e38aa4071cd583bf586f06277c118f8017dd719b82aa616a235b2f4bc8d75e6
 MISC metadata.xml 539 BLAKE2B ff83809c3ed8818080adfb13e16a4f97964a1c4a3f455fadd22a374ddaf01dd5a55d13110aee9b44e14c784eecdf4bbfdfe44992990a3f41ab2558c188c4d741 SHA512 7880c83b91cf5d2760157ab1dba1f869084670ff0fe51a477545801dbaa1bd70861ea90860953e9eb3ee9b526acfe33eae931915b7ad990213db05c4d829ad54
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index cdcf29a265df..b49feb99203b 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 18c7b208efd3..210be3e6b30a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,8 +3,8 @@ DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.0.4.tar.gz 5909229 BLAKE2B 892b435642be2a6334f93d9f230ec1aeeff8cf7b374570aae66eb341614d4318125920ef0c5593e7eee64e0b8781f035635af71aac34e9c2c6eb20a07ed68d48 SHA512 ec0c2487f098f774452b58d4fb67be7850b4a54b80f2b01dcee990298f59bfede3ca43b28fa992181cdceb07f261abce186862afd75c889c6682338049db6288
 DIST Sphinx-3.1.2.tar.gz 5934433 BLAKE2B 4ed04dcff4db412ea1f749c0b90d0c38197bbc95607bcc719522f0690d6fd58aa59b87a053c036e9b3c982e9c0f6fa9b6b67f903cb7d9e6fea3a13d99b7be297 SHA512 d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9
-EBUILD sphinx-1.7.5-r2.ebuild 3204 BLAKE2B 1e8afb47c778cb73de4c7346ac577fc9188c68a0020161ecc693478730a00199fa53f55498514d7c31c3685283ec782182751f4d72311f8169b2b9540345c041 SHA512 5585a7946a431b36ab126a67e2486c9ee67168452fa52d9c547e2df31c20494e0bf79c2c39f6e9930006e066f3e5582b865c57ab9c597549476769fe18f39d8d
-EBUILD sphinx-2.0.1-r1.ebuild 3448 BLAKE2B 4c5ccdb0c64bfdfaf758d462196746fbf3e3537148ff11d88e323297128cfa6643929465b9ee0874f744934e62aca5b22abf5029ab8435efb37578f5c949a861 SHA512 d68634bfeb6c5f1961d1e55eb7e463ab458a0fb155fcbdcd961386fcfbec789bcfa60611566f30a9d803cb3aeb5ae36d68101838f1e582c86cb54f2bd4573613
+EBUILD sphinx-1.7.5-r2.ebuild 3205 BLAKE2B fe248ceb64d48701ab290a1bd284833ad3fcb30844046998c409ae8d0087c0016ac842acf7064e1fc4367a1727ce4e64cb689df69ab26d8b35ec506598ac89fa SHA512 e0f9560bc8222db5732bcceb9fa13334c9ddd74d754df2b224ebb5dc400e520e01a11125a9ee016a6dc92276ab111138fe8caa49ec6056b9234f493d89b44c94
+EBUILD sphinx-2.0.1-r1.ebuild 3449 BLAKE2B 2111f0525ba29ef2e6c0fb7001ca49b52e645f1a8f884391a85418d040fb4a90a4a1df2a1896d7eeacb86304aded025bb043afd748fe8e0fae349d7d80bc8970 SHA512 17051761d94c11eb95cc1e3e4b946407432b895ebe1b2fccf1cf9187fb859e5edd525bd52c79347747b0a8dd93c0d32e3c9fcaf1577118fc3c97ad71118445aa
 EBUILD sphinx-2.4.4.ebuild 3647 BLAKE2B 827407c970ee827b569ab6f1bf7df1e39363c673e0b83c130869bae04a6a6f8d97dc1cbe18146b8127c4a9496812ea5505a7153047ceb753added94fd613913e SHA512 b699382de2e3c998ae1ffafb8093b4bbd523015011fd945aa4ec3568591703fc184ee689256e79d07beade29a9a4fd4173d58828abba0467088ad9eb94397e58
 EBUILD sphinx-3.0.4.ebuild 3951 BLAKE2B 7c977ecf5c628381b4312f2ee8f66031ca4d84f3496be715f6cba19294f11f58b8236ebb71a05d38fac1964359ccb4de46099b13aaa01d30a57214592d834cad SHA512 b9e225477f624617ed99112d3bbd5e62d216c7d5df7d2cab205a93cf7f3a7889fc333aff0df2d6bd5f5364292a29a73852e62f7affced3fdef2403d1cf2a6acf
 EBUILD sphinx-3.1.2.ebuild 4775 BLAKE2B 29587fdcea2941967b086fcaef708e74c599c216a45df08cd33fa3fc87912f8b129806c1bfe07db450d2d99864fa78ce9d315a063b1a5db8f61db19bb7f49339 SHA512 f77036ecaad0798063ae2853394a639d53d7b238978cf878ebf0daa1764b8342964a96f1332e9bd0816b2369376ee9b1d1bd282936d17235631250455583d13c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
index 22a4885f32ae..927ce2b8cf9b 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
+HOMEPAGE="https://www.sphinx-doc.org/"
 SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index d8b720cf8cba..4d651f7dfe62 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
+HOMEPAGE="https://www.sphinx-doc.org/"
 SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 3694aa3c680e..a2510bcee16e 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 DIST sphinxcontrib-websupport-1.2.2.gh.tar.gz 599606 BLAKE2B d7e5754491d0f4e4b508bb5ed58f41d6f57c8785ce2d658cd4beb658b9a01a453bd791e73deab703ebf17d18ddf0a3adc7c72a49e80c33475daca41666da694d SHA512 39d7d688515440fcf7a0df9cff60402499956da4c4d5de4e7b38982ff23ed837e7851a3c747135b9298d0df59f3055a8f588be78f10d98110ab50b8ab434db34
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1164 BLAKE2B 3cfeb8d7d29d06666b8b1ca54f3ef06a500b50d7c7a4d738dbe3c53e0eb19f5aac896e1e261590fb4c309e946fe3642fc5686057cbb9c3c4d9706936f27ab68e SHA512 cc1e5a731274a7c93c58b233c3b5972913ff400fc2118a601cbf97374863db66f3d07c0e9fa166db8a1e0aef31fee02bb0f0a31532a10116751d1668c08c72d4
 EBUILD sphinxcontrib-websupport-1.2.2.ebuild 1225 BLAKE2B 4cd54828fe4766891268d4e1130bfaa2ad3299484dde71f5d585e2885f164d4b90590e58e65f6fd6e3e37d75ef9c76eb850cfd26b610ead1be3de9ebea0a4fe0 SHA512 5f585408436608543bfc1d8655aeacf20eb99d89d13196d9112f780744e7fa56b7946a7aa65dd3703c8710d83a49fcb041163e48f5c337d29d1b5b84dedfbfbf
 MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
deleted file mode 100644
index c8c8565357ed..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.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=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="http://www.sphinx-doc.org"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 59ddd26e5393..c0969683f882 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,6 @@
 AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ede490749ee7774c8719238b9291dfdd1e0fd591f278baaa47b7b61b4729b9aa1017bebd2b2d6dee4d15a47b2ad6d1f3829ca0e SHA512 709c0f80bfef99a1ef42446cad94a9518535b07697de21a7b4a83ce22a2fd30df495747e8ce31dfed21291f8ffc56867ccc0b0eff4b38de41ef26c99685a46d1
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
-EBUILD sqlalchemy-1.3.11.ebuild 1598 BLAKE2B 6fe7989cee639c1299f36553fb1af8c2b94968622db2ce909d3a7af2443fe9ee8875dd5ea2c0fd862a62a42e58e18425c7ce3f7b7db74e3244f6f2cec85edc80 SHA512 c18a8f06666afd03c7852e5bbd5ea380ac28684f26af01b656cdbe8589754cf0ad6dbd57a2a059616a0bc55c02dad0130afdc265ed86d7ec41b3c7e37e1791fb
-EBUILD sqlalchemy-1.3.17.ebuild 1474 BLAKE2B d33b6480d43e2e1f0e4f10395bba3306c2473bf42eed17a4ac48a2356663cd594e1930260ae90a49c2441bcd82ccbbbea7f050f76802b984e998a5ac3a687e79 SHA512 d0fd048a60fde48ee469221c4833c43f2aaa199b2ecb99630ecda4e82277efb2e3b52bea5807fcd06873eff3827fab7a930d6745d5a1a6ade6a1f18681784c8f
+EBUILD sqlalchemy-1.3.11.ebuild 1588 BLAKE2B e1165a050cf6e2f08135698679c94e1ab14b20c6b3160326349350b21fd97fa1d88b8c2aebddf984030236ca4b879cc822bc16f12e8842ff288cefdb0d314b0a SHA512 affca1b12188fcb6ff6b2919ce93c05413661e50b2b68aa6b7980ab5a416e0e82d1fcdca3621fb2202d12772df24edaf38a40e783059eb0c567bc44cf63242cc
+EBUILD sqlalchemy-1.3.17.ebuild 1463 BLAKE2B 46a4a523d014fe7b948f04b2d4fff22ea68dedbe54230fa721e2a1eaf4f6b25dc91158016c2b450b095597a383451162c0b18e4be0fd69dd7431789b67ccb2aa SHA512 560b879d1eb17684e7a5d53d93a2c771b7839868e7fc5fe7cca903898d44d675384b97375ee4b54569d4ece9c768e1c7a269ed8ef22cd72d984864b17b899f0c
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
index d2b10bbb28f3..0e10b45ac3d4 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 5bd22ecd4782..3e4038cfff5f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 28bfcac5bfe6..65020d11ee90 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.7-r1.ebuild 703 BLAKE2B 69bba38d044622aa0f4cf31792d6d7c6f8d2262c70e66ad0b8e2ea2cc1e86ae7085082a21a4a34f661ef88cd00b347d6ff12a3ecabc7235e61a46ae6ad95569f SHA512 5895fdb660dd26d55ae2292742c14723ff2f387158644504a13707d4c296eebfb242fd05f5168b099dd996c2b6d10a570f88e12f5a0cfb0abdc4bc62c697bb98
+EBUILD strict-rfc3339-0.7-r1.ebuild 697 BLAKE2B 441a1ee5ed3568c1514b1a398ffb94273dcfc52f62f03ac940f80b2eebecfa62ab5ef7955dfc502383cf75cda89f6c01930bde41f06e7a7640426323542806eb SHA512 78240e39e0fe5f91390c8bd74d254bfbbf39150a635fade4471e1ce887e0e75f8ea5b0b889a107762f017acb2848d3a99959f47aa64d59ae76406fc27e9e96f2
 MISC metadata.xml 409 BLAKE2B a83170ceb11e9949cd533ebdd75312b3944ff17f263d6ade09a67bfddaa8c51b86b64c36f29ce3f940d165b968f60ff61d198e9b1035210f6e0ea07fb286725c SHA512 cebb7901b80fa821caa7d7421f1701664176a16e4f3c78c0a3ab6d71d3c248720cd7f2c6aa9412e3770ca62a3a7f22a09f085093decf301b94d9c22aa9938a1a
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 c12a006c9b36..a62e52e2432b 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
index 031f23fa4458..4ba69b1ddbee 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,3 +1,3 @@
 DIST subvertpy-0.10.1.tar.gz 116661 BLAKE2B 81fdc21352f168c1a8d31398be21ad83ed72adc824dbbca7764fb1836cba4a7d7f03e4a96636ab29f4804682658ce834eea3fd433b5f161e61a702dfc6790e22 SHA512 083174ca6516541c48474673e6d601ff3098f19d204f311101f4de81bcd70d73bdb1e73dffe43fc584f35d286020cab1381dc1c44b514442735a139d2a9cd356
-EBUILD subvertpy-0.10.1.ebuild 696 BLAKE2B cfc7cd380872bbf22ce69afd8ee89f50d7477a18420d96ae132aad76e5ba79abaf370cd32d2f4b0e0e13d18e968e16a3d79560c770280da63bdc6c6c9bf35c44 SHA512 a167f4c79c1d648c25f26da6fe2c340867fe076e6d670c2c8fe7eb574df8cf6d27719a7a94e05ac96fb9c6bc77457023c5096ac64b0803f00340482191d45376
+EBUILD subvertpy-0.10.1.ebuild 690 BLAKE2B 2ac7ed4b2037f94d1707b8c88ecda5e9e85fac03f7969438a39413f474cd9575c07761ca42b392c4b7242ece993fd482e7992c831e42ae2423defcf9cc09ab8f SHA512 16dfb991e677b52482df45379eda103e660ff5fbcb552119eb90c219631f48db4db4d0cd449965b9f40edbae3d29d653802bcce8f7a5a926b88958e1214a750a
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index 40de035a89c5..f5e3b86695a8 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 6ee61ff62f37..b6309e11c0a2 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.4.11.ebuild 712 BLAKE2B 9914c21e8ded178b412739366df0fc1337deec6571a29abbc7d13f4e4b1ab0466343d5141c86b84ae353bb65ce6d40ea5f528e4696ed90a9314f945ce17c5704 SHA512 600b5439902479353668d771ad7812c02bfa36851e61fb315d021608e1789508009326a59b7ce779a9895bab6e46e6d2a86c3b645f4ef6865e8ad303424ef035
+EBUILD sure-1.4.11.ebuild 702 BLAKE2B ea70941faceeed975bfd36c08d9fab9fb81e25352994ccb8c9ff891ddbbb858876264cae36f1f7c03b714088d54fc85090a4bb9a4c2671a9cb13185b1741982c SHA512 444949d5413ae1f874033740b3845a9f97c898a3150c42ceb56289ff56b2948d6d684f85649f50ed8f03c2f7afb942a62fa3bbaa4ee075aca59d3e68d50dbdbc
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index de31c2696273..b8406781cc24 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index a08ab6089fa8..140f71eb4ee6 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,3 @@
 DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
 EBUILD symengine-0.5.1-r1.ebuild 1032 BLAKE2B 0f0b252a6086209b2984348b014ea124de628280206653b9e88cceba01d8e745a778d83ade77c0fb74290e866d8ec009b0985e29d5eb5ff63c7225d044ef7e0a SHA512 11cab6c58220cd636aa2ca27b4ceae17ea1ee6ccb7fe43fdef941480ace25fc1391e38a2425781b81cfe6359a804e2ef24c82c6fa9767f79be365b97aafba7c9
-MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
+MISC metadata.xml 366 BLAKE2B bbf2f9c38d569a0575af808f60add4a61f2065fbc28d9bdd44fbc85a7e24fe63a4cd3d7f3abbc4b68cca8007d9cb742cce1249a6d0f8c9eef8f9446f29dd2121 SHA512 a7ee1b2afe1c934cd83e57e0a1b09d53e73b5a060f342f020ae4785c08808da9762a58f08c04020bb4c61f9d5d925dc7f212afc16d7412ee52a0188b3adfeafd
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index a7413ed86c45..202e3195339e 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -5,11 +5,7 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <longdescription>
-    Python wrappers to the C++ library SymEngine, a fast C++ symbolic
-    manipulation library.
-  </longdescription>
   <upstream>
-    <remote-id type="github">sympy/symengine.py</remote-id>
+    <remote-id type="github">symengine/symengine.py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 6a961a0cd7f9..ecb5c430a700 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,3 @@
 DIST tenacity-6.1.0.tar.gz 33438 BLAKE2B e3f7c0ef19f98c0ac5b2a9a1be53241292d895547e5c10810ff94c27f34e8bbca7ef3aea79ce6e4042c84109e209b4be2913e6231233a3b050c18ed52f8af087 SHA512 a8f52f77e066a35c4a35cdd80fe01922613d9f4ca07975aece4a35bc743475f7540bf419e5095eacf94cb248ce33bdd89b46c5e3c5bd5a93bd99a601cf580732
-EBUILD tenacity-6.1.0.ebuild 692 BLAKE2B ee28707560df4915d4b7ff53d8071ece067c640c36c20a32acd3ac61539a6fcb62bd6b783401dc5b890418b6e6d861fddfb83d3f623b42dafd2633123da48fc8 SHA512 a7ec969ebb4d44f679841a6e39de773d0317419d2dcf2e605ebc24d98751d3b9115f5d6eaf0dfac15b3b51d08fc4992160616b0aaa0540344970afe17cbedc87
+EBUILD tenacity-6.1.0-r1.ebuild 608 BLAKE2B 7a3c9672d856039254946a764852fc70cb17e2a44fd499d801cbd3ac948bcc1c39f1f8bf96ff9978a0a956e1e7ea3af5fc104d4fb662aa6e29f30924251e3c13 SHA512 47c15546d862e77b94082364219e9e32dfb391351be9965e7c7b6f4bda719c6e79da006bfa43177da0fdb0d88f714d890733cc39f262caba5daa94be93d74b81
 MISC metadata.xml 730 BLAKE2B 11af1697135e424eec2e9a719f67a747e3888cf9e501fc65b99ef1eff28a153b47dc5e827792197dc9a19d1ff16c03a8c0b95ce44c177135ce44452ae3e097e1 SHA512 0b355562b481aebb7daf0940cc5548dc33e8252ae39e8bbd811f957f6253aa481c0fd02fefb7b30672392af50d5aa69731767915d47cbf83b71788cf8f5a6144
diff --git a/dev-python/tenacity/tenacity-6.1.0.ebuild b/dev-python/tenacity/tenacity-6.1.0-r1.ebuild
similarity index 87%
rename from dev-python/tenacity/tenacity-6.1.0.ebuild
rename to dev-python/tenacity/tenacity-6.1.0-r1.ebuild
index 05b617276645..bbe88755047f 100644
--- a/dev-python/tenacity/tenacity-6.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-6.1.0-r1.ebuild
@@ -18,12 +18,10 @@ IUSE=""
 
 DEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index c601ac01f42c..01d83c3104df 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r2.ebuild 515 BLAKE2B 868c8e447477b48bb8fa480450cdbee0d15ea15b37ed586668260c93dcdf81e27168e3a3ef0248a9fc6b4b6a8e4642c1643214c39068c8694933d5289b4460a4 SHA512 a170e6bd2bae67672f056d3b7556a1866507ad549562fd61a9516fcd56158bf193d5beed92634e660aa4de1f686a98f0fad836c3cdce8c9c35f98e0b09f479ae
+EBUILD termcolor-1.1.0-r2.ebuild 509 BLAKE2B 3db78941eca246283dd46b0f29d15689ac81292a678a56c1a9cbdd3eef9ed9c8630e46134bfd53ba63674fa65a534c1bcbeee98342a40a5b8e7d28952adb7742 SHA512 3bf02798961849b74edb57ffe44f09979f51c8823c26b08ce77436685615e32aae0c44a62c66938583f855bc9432f2baafb4e802e5ae636f7909e3c9ac5fee03
 MISC metadata.xml 443 BLAKE2B d66fa2b33b0f2a854f6293896d9f94905112f9b10cb7bf5f7c5e5d5b2e5523a86523ce83078f1f386f5781ce6cd5ab183e6f8241d72c88dd389760a1b126cde5 SHA512 029e70f455d0ccd6aabe54c2b96cb3c0857fac49d23ea28e0885ca30fff829d2de2f93345de7e1fd14b46eb065b278d8b3f7047156b52feedd7a07df2d162864
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 71e78fb0b3ca..4c24fabb7620 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index f57b142df6dd..06196e0effd2 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,3 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
-EBUILD testpath-0.4.4-r1.ebuild 714 BLAKE2B 02844934f13dbff64c268d852690fcb895e392aeeb6b10baec9030f6e911b748eb13cc9bcfd103e5d49fa78f0687a41af9e2dacfe009471ea84e96704859850b SHA512 81bb5924eec6bd855b89301278435d8d9b59531da5b9c97e17cff4a3c4cc9bb6dc94012e3158a2456c6ccd1a0cee648d823a13a2f3f26396a31b0fb083e31c24
+EBUILD testpath-0.4.4-r1.ebuild 713 BLAKE2B 2c081d018ce1ea566b99d0f174b1f71370c8175c4b3e2641504e55d41d15256cdeee3f491eb0fce067334be42d7c15f561c755dadd2ccfc0b5a3229f6c344d9b SHA512 006c51a27608acbb7a386b8b77d25b9bcf37e178470b1f24c41d14cceff60cf0721821ddd4f5f85f5a1abe5b3430aeed2adf8476126b8708961500204e9fd8d7
 MISC metadata.xml 720 BLAKE2B 93bbf7d182fd5b9bacaf1da0044d0e145c14708a33dfc25aea2dd4c711e89848e0f2165acb98afb4ee383c01f8ff8d04233815169331047c0b8d7eedf25a244a SHA512 f4efcf08f277225e352339bb48104fdb33326bbd43c8dfea6f77f57d51f48e4e2b0657099fde91ae5f12e0ad661d10a6ac480b6e7dfce38c8d161dc88c163916
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
index f0875306b13b..58fd14108670 100644
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${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"
 
 DEPEND="
 	test? (
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 8d326e987086..96af7e9c8b04 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,3 +1,3 @@
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.4.ebuild 799 BLAKE2B 4e758854409c2b7788672e182e4da8251974f1c24005fbefe1c3d65806ca63ec5137a94f06b3f94d59940fec5311e40ee02269c6828b7035440e7f46678ba102 SHA512 22f7f6764fa537b5f49726d5a851ecc7c59631f09b09c60ea04bc551502d46d2035509f2b8bc39dc91fce92a06fe1eeb6a01dc0724368645997aee4d0771db74
+EBUILD tinycss-0.4.ebuild 793 BLAKE2B 797d34171ea408d492755b672d2c99905ccf2d5e88cdc616d6105f9a8facc070d602ca32eed86486a1e749f64c50ec192b91c1e83f29fdfc1a5ef75b0633dd83 SHA512 4f7c290d040c7e5c05d6ab2a808b61677469f19cc52012ee985daa85c4b23c85dec8bdb41816ba51f63aa878fd5a28526fc7f9f0cf2905e953649e6443baa7ae
 MISC metadata.xml 380 BLAKE2B f32bbbd80838a147ab80701c03462b8949aa987f47fc7bb8cb2127720937888f484b7f1ceb9cb490901d07782c2c0c261e42277b55e39d78c44a05173391282a SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index f69dee9435d3..2ff8a8f05347 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index fa6d77b47fe4..4eeea67895ad 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -5,5 +5,5 @@ DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
 EBUILD twine-1.15.0.ebuild 1224 BLAKE2B 26ed3c59f0e1a4215ba1b8a9c63d22c227a18d9a5ddba92a109bfe3461cd13f4391017bfa56ea86cbf94f1bd90c2d95c22ef0be59774ff862c612075c9b24a0b SHA512 73cc966d65ca3fa0265235cdc8ab4e2177712541f77fb788f69f72f10e3d06be92a1590a6e7aeeb877cd3a599c883420aca6a21614bbd63430baa040e9b19092
 EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
-EBUILD twine-3.2.0.ebuild 1995 BLAKE2B a3ef8dc2f4538b04901f8d5ca695bea91efdf7e7f324ab5484556680b10e40ba4b271c08063bf47223bb4fd755f1f8df39f47eddfbead02bf8e185930969ad1d SHA512 793ea32b1418b03f7f427a4947a10cfa0e1d52b866bc25cf69a32a8244fd8e5ff80c271b4e7c71ec4ac150b9c3c3d0aa51d06cbcc3540b8dfc3d3a2d25cd5e48
+EBUILD twine-3.2.0.ebuild 1994 BLAKE2B c5b41281d0cc519a3520a9ca9e2122bc1671e4a19264d33732bc63de39cd23b286b64c9fcd0366be062d9afbe204143170ab2d8c0c96420800c7c2391b92680f SHA512 73db48d2caee8da04d9caa713ffd687f5d82ba1c032118c2377c5cf397396e7b4aefc76e3b328e4bf991c8d2f86f35e75a3875cc1464f7f1ee06015570a8ffd3
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.2.0.ebuild b/dev-python/twine/twine-3.2.0.ebuild
index 8a25eb209d9e..49f51f7098f5 100644
--- a/dev-python/twine/twine-3.2.0.ebuild
+++ b/dev-python/twine/twine-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 4e1b58b78c10..0c6dd9b0ab4e 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,3 +1,5 @@
 DIST u-msgpack-2.6.0.tar.gz 19911 BLAKE2B a6599a85fcb386f91dce4d11fd8d10c6be75c1fe4e80756c58058bcb7c2934c2174afe65bc0b88e11c5c9e3f66b46c956c9209bb6faf74ab5c382bd665c412fc SHA512 b0f2fa677001705a8a1e96e590fd334d0561065e0617a56a31abd506907dc2446c93f8c4429e65e86c87f6d2cf3e19a921fa0aaccad5cdaf1acd1ae0a1235688
-EBUILD u-msgpack-2.6.0.ebuild 658 BLAKE2B 2050f42c8a8b9c011da96dc51277281c69fee78c671ab7bcd26e85515c04a37f2251d28c7b9a87ab600411d624a611783eff0f8ca78b899690cb5d455c9f28dd SHA512 06ae2f885861b707eb94d18ebf0c2cd13ae853462430ec3df541dc820c17a09d101fb0b74dd99f77bc0e2759a9dfc01c0e66560f8fc96bfbdce819c3c98ea5e2
+DIST u-msgpack-2.7.0.tar.gz 20427 BLAKE2B f4e4447635fc20ef5246bbc90ee9cc0b93eaa9d13a0384423145531bb8bbb21dc9d1ddadc075a4a5e456dd8cc758fed3add4b2b43f83c0115c78a0095030ff70 SHA512 b5a6676aa3eea878e3f1cc6ca1351f59ae0fdffdfe4d68c43303a1c5d257449bdcd08bef0fc75117b238544366e42b43c6444bb93ba63d1633aadd0c32061c8b
+EBUILD u-msgpack-2.6.0.ebuild 652 BLAKE2B 582c36afb53b81c72a67d948f66724f298a9c4d788fbd5c15d2afbcc9dee9d508322648892d983dbece9215fc243e40705e23aedeead0682472b7541ecb6087a SHA512 9400b141650b85d7484abe6d54d2143ea5ac0c48a6d915d85227df61ee4f033364c4e5666d2371c537d51be20b43dc225d56d0004a79b6c23ac519a9004f3046
+EBUILD u-msgpack-2.7.0.ebuild 661 BLAKE2B fb05633914823142a0d518b18acaac085e144eb150da4ee01084d647f2272398ac5658318795f8cec18aedf2a1d888cd93bc3aba76feb66f5cb1eeed9bd4792b SHA512 7d0c6e623abc1f0346980de4634b69248b865db28278411dcb056ccd05047263adcb272901dc3f559e36860a677085bd5191897ae0960f464c2b98e840dee268
 MISC metadata.xml 931 BLAKE2B 14f05bd4d72f2d6d09096f581e720fba96e533781ad16d0ded28ad62f3aef92eeff0fdece705b6b1d8735f0756cf73f338ce26b92bc6380e7679aee7fac6970b SHA512 642b3a1e3f70a4a6d49f87f61e2a197f93ef47238dbd7f1d591cffdd4857299e3110a9cb01cfd430aca328ceb533e3c6080d765bc2fc0fa7fc133456e2ec1de4
diff --git a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
index 74629fa79f8d..f0ad14a9d10c 100644
--- a/dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.6.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,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild b/dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
new file mode 100644
index 000000000000..30dea55f9b99
--- /dev/null
+++ b/dev-python/u-msgpack/u-msgpack-2.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,9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
+HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 4ee2cc518cb4..5a6042b1a5c1 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -7,6 +7,8 @@ AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f
 AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e6093043d2f847ee68287b2f3fc497ee0bd98fb3974cae86e8bf9b0af69d088250b90871b5597bf046cb803ceeb5a64d6f60a SHA512 d59021415229142e673059bd18d313ac3886b70f39dc9e53bf592d4b796ceedd096468adb5c5aeaadf99c2cad2d2d6188ebdbe5b32aeeb83ba9cd1890327226b
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
+DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61799dff257f139510e4e97e9bba5c4742e1ed1f0b0e78dfcde0589f0b255c92fc5f3059b6cdd86279aabfe141 SHA512 c40953a4b5b55e894e42fccded618a9f2ed771904e1d1e90a28f4691a53fbd8b2fab3dc98a36b6e0637d2ef40ac87ebf9f2d8fce33cd3bc4e68bf7c18c7a33c3
 EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
 EBUILD ujson-3.0.0.ebuild 631 BLAKE2B 88b9cbbced507463e6aee7342f0d76b5468edabf2f009d7852cf153025b6749679cc339812f32465a34879df11428f7f3aeb3ab6baf2aa78a57798e015055ed5 SHA512 390ec9c2d42d22f229463fcf3659e96bc025cd0eb6dde344e4e45c85a9fd9828adb07903a98d6b20fdf9c4a834b13cbbc4c9b991da7958e30eb9eb8defa89450
+EBUILD ujson-3.1.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-3.1.0.ebuild b/dev-python/ujson/ujson-3.1.0.ebuild
new file mode 100644
index 000000000000..18e434f25cf1
--- /dev/null
+++ b/dev-python/ujson/ujson-3.1.0.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..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="https://pypi.org/project/ujson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytz[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index c118f9468b88..a6010febdd3b 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 649 BLAKE2B a328cd996028dcf8a5fbc3706e5c31645994f45a8c5ad4280e52c4f14a6908c99adecc817e80b27b86bc51b1b2951e67d2cca5143d3c372305a944cc068dec38 SHA512 bc2df62fbf420cd5a9ddbee9a942667c3a427872fe721fe9b8c241bb8226fc4a0ce2d624aea1c362a8c564d0d074d31920e0e0f5c2f09476ad711f87c1c99f4a
+EBUILD unicodecsv-0.14.1-r1.ebuild 643 BLAKE2B 15ae8014583c85c16e8be8f9cfff7841dfe47834de6daed133ea27d0e75c2046460b4e0e38bde81cb7a4435e0cf8b111694d71fdcc96e5fe7a8baf8b63561f0e SHA512 6ce5480859006a7980930fa4ca521a82827103e5cf6e32c1311f203677cafe29fe8f29d2c0360e889959813f15fbc3dab1ea80c9d064c3b4f4473a549f919994
 MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index 1b726c42c610..50fd55ae79ed 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index b41363f331fe..edacae8d64da 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,3 @@
 DIST urwid-2.1.0.tar.gz 630226 BLAKE2B 62e36080419cd4acf8c3415ce6393483244f44ffa881730ceebea71ae5535da04a7f45bd5e23fa0808a88a192c8d9d21fa2b1cf7dc3fb20485ee3280c2eeda99 SHA512 c121c0e49ab9531f67bff8740d29fc716fb8c9203e1b2ddb7257f01095e0bf976f3f2131a3b1f95a3b5368ddeea6a09b9c867ab459b91e3e9be6cba4f18ec654
-EBUILD urwid-2.1.0.ebuild 995 BLAKE2B 7bff9a6384aa4b023435fe2b4f990e7cd5550fad6ee70b904f59352aaca405db45217c4c76def3c0f2d806bade01761e9bda77f1662abdaacb3fe0232e46c50b SHA512 164cb4a14f51d2a2de09f88071a95e6ee5203e04559ac882b16c72f3555b3e9be1d77bab9c2aed6c2956728cafd35887b922ed10e9e123e97c49061254dd8aea
+EBUILD urwid-2.1.0.ebuild 985 BLAKE2B 33914c61c857f995ffa096a08e27bce1ba5137130b8d1aabf6c4cce08b3eeb1d2a7795bf1fe1593adb23774d394b9022e62ebf8a8500ae6f42f7597885638a6f SHA512 23acfc9e34aaacbb8ca3f929934989dfd992405ea460adab19173d570704bf99291a2352eb78bb5d731b93ffe82703a095410df79180821059b3c6a21318954a
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.1.0.ebuild b/dev-python/urwid/urwid-2.1.0.ebuild
index abcbe910f5ec..497c42bd4a56 100644
--- a/dev-python/urwid/urwid-2.1.0.ebuild
+++ b/dev-python/urwid/urwid-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 0f1e36e68c4f..ce7bd592bf49 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,5 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
+DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
 EBUILD vcrpy-4.0.2.ebuild 1389 BLAKE2B 84a6c873cb48a40c6f7b7e133863d58bef6ae00edca2faa3a9739bccdbf141f5f45aa413170508abb27fd70a039685eeab9dd0abe6b51e622fca5bc8ed1eb78d SHA512 2f56198bb62bc2844b37e99dcbdf2ec909188ec16db101ffde5f03fe799aca29f7b73262d347f38521fb3859a1bc618f1da813e344e9d2909fe93a495053481d
+EBUILD vcrpy-4.1.0.ebuild 1393 BLAKE2B a6470456c465894972edffdce4e89823153dee2cbb7d8bc033cc4536ae95ff169c24f140290f3a0c1b8d82565809c5208af61675b0340a844fffdaf926c0fd3f SHA512 09704e8002f65ad1bee470f333fd3a2e995dd0d90b97b62d24f2b51ac3fa9818565ae47e28f6c335b5fc4f3ae250b3367a1394110f5c5b79fcd95b3426167fb1
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-4.1.0.ebuild b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
new file mode 100644
index 000000000000..75f411685298
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.1.0.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=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# tests requiring Internet
+	rm tests/integration/test_aiohttp.py || die
+	sed -e 's:test_flickr_should_respond_with_200:_&:' \
+		-e 's:test_amazon_doctype:_&:' \
+		-i tests/integration/test_wild.py || die
+	sed -e 's:testing_connect:_&:' \
+		-i tests/unit/test_stubs.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index df235240b3ec..738cb1485e2c 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 668 BLAKE2B a4b87d4a0301ce4bd360f6d82917fc6b47958b742f4c5e772cec448062cd0ac13335e8aee8bf68d6f0724d3e1129925c7342660ec8d63b2d97e46719c1bd85b0 SHA512 07e7dadf96d68d3057da74978e9e1a71105b199f19efa10e4c6d82b742dcecb1c3913fe75d299e6ecdfcb31b9b52dd7e42f353f40a54152d44ee0266d9821e9e
+EBUILD vcversioner-2.16.0.0.ebuild 658 BLAKE2B 1624e042b47f88f69d62107cfc239f02b24eed15d70c9871a901b5463970881b0e565c29ba279258ff08b6c046d1ef25c1a974b5bd78fbcc34839c60532ac3a5 SHA512 04261c39600d6c390ecef76b0da838be97be069d4ab7119b573c1a5e1f18517a5ecf1c1239566c859db105b33393c2b620b3f104ff6b0cdf9c77d308b37bf75e
 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 a1f3f67769f0..48d8f6a7409c 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.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/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 83d80a6b0123..055548e0e155 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,7 +4,9 @@ AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.0.27.tar.gz 8265353 BLAKE2B 31e0a5fa11d988b5340b130615dc5095a61321393fdc4f72fd88e70d88bc7922c2f8f289b995fb623d2fe900a7da8f012433d4a7bb2ecd7ab53810865e05ea2b SHA512 812a17d1461c8e62568f345aba0722204dd22d0d149720d00e37712a34a9d2d614e1b854f07d7e89e1eb6e915ca3f90e8e81fb9c2442ed637efdc6b2120153d7
 DIST virtualenv-20.0.28.tar.gz 8265900 BLAKE2B ee07267a0fff59abe4b51091bbc8ff980ad5419375a1049e943622af174a1b533610f6a80876b75d36c3edbd1851767db08085bfd0db8215fa99495ea9a49bb1 SHA512 4984ce046e0787bd44feb3b30f01d53f1840722693643cec086ac3ee61c471ebf619ea31b41a7e20cfd792d59a7ba19ef64b3a6bf3950891bdf15a49747e4712
+DIST virtualenv-20.0.29.tar.gz 8277951 BLAKE2B 1f73bcc7420ed37b81f19f97f23d1df658ff74efe2f30c70babc06eb933b1a22ff0c9ad98aafda5570b21047f829b5a7ea5d8fbe76ef39d0319c1fe4a9514cbc SHA512 b1a2375828f3d1e54a2608405b093c7ce912c44bdbe5197abec19958f95bf45820c0e0f585732c15dfe8a52fd7c45857e7dcae1dbf6a7f25556ce59aa80cc50b
 EBUILD virtualenv-16.7.10.ebuild 1901 BLAKE2B e9464ea36c8772c6cbc19df04458ebc53bceafa9cf39a8e13ec2805d9a8c3a38a2e7b1bbae6a589dc5d912256c770e55f54a84b476b81d2c41c2907e495dfbe6 SHA512 586cc1b761b9a46e03a45835a010877aa9e7e29b00e35d722f5bc244a051aa3aad2458ac2f36311749291bf9a3e81671fd77d14fbcd9fe5aace0652d843d0686
 EBUILD virtualenv-20.0.27.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
 EBUILD virtualenv-20.0.28.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
+EBUILD virtualenv-20.0.29.ebuild 2612 BLAKE2B 1d09906f4570e8dd0bfd8e02569bb58ecbe7790f0afa506bc533b6fdf6f12005ba02b67589bc68fded0b0ef07c2ef063c093507adbef90692b57f7858fb70fc3 SHA512 bb1ee0a4b9a3f68c6e6fc2eae5250e4de465a1a575c4f517e7c52e59007058a939a29203a8480d9c593b0a5fd7a465c0a0e8a6d24b10958960996a21b5b3fdb3
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.29.ebuild b/dev-python/virtualenv/virtualenv-20.0.29.ebuild
new file mode 100644
index 000000000000..651770201985
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.29.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=( python{2_7,3_{6..9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+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="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' -2 python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_prepare() {
+	# we don't have xonsh
+	rm tests/unit/activation/test_xonsh.py || die
+	# require internet
+	sed -e 's:test_seed_link_via_app_data:_&:' \
+		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
+	# TODO: investigate
+	sed -e 's:test_cross_major:_&:' \
+		-i tests/unit/create/test_creator.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	if ! python_is_python3; then
+		ewarn "Tests are skipped on py2, please test externally"
+		return
+	elif [[ ${EPYTHON} == pypy3 ]]; then
+		# TODO: skip with better granularity
+		ewarn "Skipping broken tests on pypy3"
+		return
+	fi
+
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index a228da2e1c5c..284920275032 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,3 +1,3 @@
 DIST voluptuous-0.11.5.tar.gz 44216 BLAKE2B 921e0f35bd5348f412f0bf20939b3364b0014d3b1d1a7248cd73f2514eef0fb4e5b4b742876dc4606b5619529f1aa96e3577508ed0bf8d1e98b4d8bb88e2b8a2 SHA512 8893434e8e73ebf3682da1970d1d720444de452937ac9123fab53413c88a21d04ad3eb490902d829aa60be6804ff68b8bcf57a1c45807751c3d50be63e9b2551
-EBUILD voluptuous-0.11.5.ebuild 526 BLAKE2B 0524f99dd3c90f446064b27a2a0d8abd6aa73bd3b2713a827cce059701e06797283dd701879b11cdfc3658cfc036465533666551e5a8bb9dd6f067623da4926e SHA512 1a059795c8e77e1d7f19fcc9cabd0bb84d265fcaa00d81b39b29387e88cf8e80139220b929a13541ec5182ba8a48bcfe0b1fbbe83340e2ab355ac41f5d0cf92d
+EBUILD voluptuous-0.11.5.ebuild 520 BLAKE2B 0b1822d9f9c5d27660dc4d69d7b596ff3116fb503af3cb8ae2c45377de8cd3c0e72653ee14e4873927cf090cc346b91d1446bb52349b982a8e5c63bd1b425a64 SHA512 fbfd7bd4a77ccac9b8475ecd1c8d26aab14e6d352901aea1de3129db21476e34a8b7587ef3f494166ca8386648ad95a07f27d089f5f89c66f7717581ad7836fc
 MISC metadata.xml 691 BLAKE2B 833a0f6176b6e2b3db23053e8be9054b28434061afa2e09aae9ceec1a3c1b841b3f0e0b9939341b66614cb12d8a002111aa554ee4c094123439de935e7e60b73 SHA512 0162ad8edf206d260e648a6a2441fdf054bc591b9368e3c78525bde5ab7e6a23f65c3f0ed1c04827847759182a8b81c0fa55ebc833a753f90a9e7df14aa04f06
diff --git a/dev-python/voluptuous/voluptuous-0.11.5.ebuild b/dev-python/voluptuous/voluptuous-0.11.5.ebuild
index 40ef58995c16..b5a5d32daab0 100644
--- a/dev-python/voluptuous/voluptuous-0.11.5.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.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..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 526ed1692dae..eb4a3781279e 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,5 +1,3 @@
-DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.10.ebuild 611 BLAKE2B 6296e642f4cc47678435958d583ddd7189774e4003da333345b550468c68464224c6b9e5aed67a1ba8cfe528b52e7fcf73d360e548f2bb9b23d31327a18ada30 SHA512 ffecf7a0020b221944c31f515f5e91936fab9d3dbbc1db6a497fe3e9038acf2804c3d95dd1bd06a10a1cd606c65de115d929e78ad11ffd0fd29c1e7b3df1783a
 EBUILD webcolors-1.11.1.ebuild 605 BLAKE2B 92eec5251d209b91b48c9c23465f0bcf06aa34ea60ff341630bb59c9f020c14b5e20bbe4813990abcffdc410432174992742bd2fc899a07b552d95c7859bb763 SHA512 b4b3c1cf081986e27cb797c9d5ec2765667502c276425c81b79878657a57add681cf50927b3a78cb868fe999e4ef11762e9b542d78127445ae2bcf15b5271f69
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.10.ebuild b/dev-python/webcolors/webcolors-1.10.ebuild
deleted file mode 100644
index d16c23c3814e..000000000000
--- a/dev-python/webcolors/webcolors-1.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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..9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
-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 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index e0fd9021705f..aab230ef7367 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,3 +1,3 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
-EBUILD wsproto-0.15.0.ebuild 592 BLAKE2B a178738f2ca9abc07077b0952ac13474867d29806379a302be2188e3611a4f8615b326dd5e052e10094a492c9bac61640024e2736024d787e1a01e21a10a5223 SHA512 8f1ebc1ff26e78a599310e4a6e48b23a255882be838d32de9c9a4a0876f5bc690bb6a5c86ebbd5088fad6de967bb611c4e99a4c0c94ed598c1ee5f00f7db20d3
+EBUILD wsproto-0.15.0.ebuild 505 BLAKE2B 2d2d532f346f3ace6da891bd4ed235f2d6c3d8616cc22e1eded2f4adfed5dd499679b7ddda8edadbfa80d7dc8f3e2fd08a3d0e9bdda4a76a371f44e159bcb43e SHA512 51503f0f620628495ee26dae15b24bfff1ff39c8c4c691d0e598a18805d415544f9caeb4836269ec905f9060c1b069a831134a17a0beb5f18fd0c82ed5dbbeb5
 MISC metadata.xml 449 BLAKE2B 20905c7dcbfa8e649ec28d7825903e62987d2c5a77c2e66b21ee8493a9a7bd1294fe4cf89db71497a6580ec1f60aefff7406c0179b258f98db9a6e807d4f0883 SHA512 5652a88da35965492588df16a4b4d17318174284941e61dffa4a618820243ce6795fe566beb7c27a2d39ba56de776e71b49782e7294c7d43b4d48ce67466cc7c
diff --git a/dev-python/wsproto/wsproto-0.15.0.ebuild b/dev-python/wsproto/wsproto-0.15.0.ebuild
index b4e0f094aaf7..a6e5f0570e7b 100644
--- a/dev-python/wsproto/wsproto-0.15.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
@@ -15,11 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/dataclasses[${PYTHON_USEDEP}]
-	' python3_6)
-"
+RDEPEND=">=dev-python/h11-0.8[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 007f962db8e0..d7c8ab6551a6 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,5 +1,4 @@
-AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
-EBUILD wstools-0.4.8.ebuild 773 BLAKE2B b472741f6b5e67321f8a6b3eee88b018450558f19e42bbab36a7fcf4681d38432e14762221e91d7404b1a928aa34a30dca2a5ef1caae35be7d7dae1d0eb1c440 SHA512 7a1998d4881a79810c6250fd093c43ee4bfe3b796ac95239873cecc43b6c99dc6e9c5d7180e7ffb16ee0b5f6d87c33b46515dc90cfd6a3be09d0a31c8a64601d
+EBUILD wstools-0.4.8.ebuild 767 BLAKE2B 81b0fce596e1ee93c4f0ff636221a9e223a74d0311169439ed12cfc84bb4a5601f1805e7017b8080836c64c997fe31b18be54dcc0347c8a78f7b5a0422733f75 SHA512 d22b93b19b37b59ca9e6dcb5ebcd4863c8b7b6037bdce625670c1e4e8f2c055e87a823f2c6f80808ac45fa14f37a0e71a20f21f759b4a36d94c99dbd88b6649a
 MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
deleted file mode 100644
index 9de7c159c972..000000000000
--- a/dev-python/wstools/files/wstools-0.4.5-setup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Avoid pulling in a lot of unnecessary test and setup deps.
-
---- wstools-0.4.5/setup.py
-+++ wstools-0.4.5/setup.py
-@@ -9,7 +9,7 @@
- 
- from setuptools import setup, find_packages, Command
- from setuptools.command.test import test as TestCommand
--from pip.req import parse_requirements
-+#from pip.req import parse_requirements
- 
- NAME = "wstools"
- url = "https://github.com/pycontribs/wstools.git"
-@@ -55,13 +55,13 @@
- 
-     def run_tests(self):
-         # before running tests we need to run autopep8
--        try:
--            subprocess.check_call(
--                "python -m autopep8 -r --in-place wstools/ tests/",
--                shell=True)
--        except subprocess.CalledProcessError:
--            logging.getLogger().warn('autopep8 is not installed so '
--                                     'it will not be run')
-+        # try:
-+        #     subprocess.check_call(
-+        #         "python -m autopep8 -r --in-place wstools/ tests/",
-+        #         shell=True)
-+        # except subprocess.CalledProcessError:
-+        #     logging.getLogger().warn('autopep8 is not installed so '
-+        #                              'it will not be run')
-         # import here, cause outside the eggs aren't loaded
-         import pytest  # noqa
-         errno = pytest.main(self.pytest_args)
-@@ -136,9 +136,9 @@
-     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
-     packages=find_packages(exclude=['tests']),
-     include_package_data=True,
--    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-+    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-     setup_requires=['setuptools'],
--    install_requires=get_requirements(base_path, 'requirements.txt'),
-+    install_requires=['six'],
- 
-     license='BSD',
-     description="WSDL parsing services package for Web Services for Python. see" + url,
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index f1784423d1ea..97a2acd7dd53 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index ccdbfcff18e3..6929cf4f72db 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-1.2.0.ebuild 645 BLAKE2B e117b31d6b534175470ade71c870f5343c8facc186397b06daec7d89315eac3c8b9b9af9560b4ff933e4a0245d6c260c5e7bf18fe1f822998db0f40b27351aee SHA512 f86c8e58fa003af4127476fefe79783a2b590cbe6263e21202933ece387edbb8fbed525c77122dff6f752b52c74543a6009d5e587c7626e5a2522936dc73fe55
+EBUILD xlrd-1.2.0.ebuild 646 BLAKE2B 9c67ffaf0184999c662054dd8f5ee6394900477f7ec855dc68946d5d1033d24753209079e8caca7a336677fc3a23995c7f745709896375c914213af3eece1745 SHA512 65039e92e0fd1dc45d0a192b3580fdc1f917ceff4b7a07d91f3a05ca88f34f29e227cbf369fb29909c0778086c501d95716f4f81455bf1a6e2bdecd85b402ad1
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index d2dac8fad320..04f9088a3b34 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
-HOMEPAGE="http://www.python-excel.org/"
+HOMEPAGE="https://www.python-excel.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index dbfb7c938225..c16c58b2ef46 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -3,6 +3,8 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
 AUX yarl-1.5.0-typing_ext.patch 1762 BLAKE2B e633e9dac216db8c530338b87275fa0b655623adc3a1e651bc5a13d82ff8f064507bb2bd875f23124ca329b6c6d7dc146bb2f058400aa3e71db8c87c6c2e8870 SHA512 ac2b28541876815d9e8e7ad15a30d6cb183315bea56c8c7ab1aefe0eb8e95797a81846045371a03ec2ffa797f6ba0587c15a479b263726b08869287be9821653
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.0.tar.gz 172945 BLAKE2B bc8ee2fcbdf615366747dbdd9730cffb64476da1f62aec3948ee5acbd28c7a523905f3a233f19fa390f401a4b635d4b9b1758e3802b2ed3edf37637ff47360e7 SHA512 2e6aeb7c2d254395558c6ad689376f63da5bfec3213e4879fd096d1c60cba3653e3b4dc4793d8583ee37c4c75a3a4a69d6f00db73de88ee13c989e8bd44198e6
+DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
 EBUILD yarl-1.4.2.ebuild 723 BLAKE2B d0ec747247e1342272e63daf606b5637d413a06fbed263a73cb04cd3e89ed15c16c31416a52c966075cc0c9ed0c33280e8e6447f494b3c29bca1937752d3c70e SHA512 39c3dccccac74e8244d466b5c62ba1959b790545680cab67a67ce444453295b0665872905ca4f39ce42e0d001ff758f137b03057ecbb05650cacc8af99aa6387
 EBUILD yarl-1.5.0.ebuild 749 BLAKE2B 9c83d23d7180f59ef48bb962ea3ce5696a739da70d70391a86a7a28fb9818a1611a24af7640d4a3ef67bdf15b216f4949c78f3c8f46568c9a1b19cebc5c30130 SHA512 e303eb4b928ea5d01c2bcc7c15834cb58ce392e3a4ca1d438ccd3b6bfb6dfaa022d0ef778b9455667a641519fefb97be732693320267b3de93d83173e8facd61
+EBUILD yarl-1.5.1.ebuild 712 BLAKE2B 6ba93e840bacabf45e57df63185815e78860ed083d58ecdc4a005a20cfde0599208143c54a5b1f484b5d2b68520cdb6d532584d05ee8b8643e7a46aa096f08a8 SHA512 0d1b4ad627e46769676684f016d0805030bff053bcbc05e3fd39def2d3f847d830f9b4d40a02258aa8f14cbe6d3d2af37c95302a6297684268e1424d38ea53ac
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
new file mode 100644
index 000000000000..c521c73e1b22
--- /dev/null
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+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 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+)
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 5b237e2ffcb1..e7499d066143 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1.ebuild 995 BLAKE2B f14b00363691d457fa48463e479a941f60a70ae540f69d4ea3d1a23fc40849d001cbcca1e900294ee7c8fbd05822459837437350ed807d4c5d371b02522c14a0 SHA512 c575d2b7b59513e1614e886b4058c9b7ddae93b78711acac23c5b652ec1b2572716dbe9fbf8af5504b587fd5a409f8ce1d93945a77da6480bda2da792749927e
+EBUILD zope-component-4.4.1.ebuild 991 BLAKE2B 99c29354f3323789d2797f699de37739c3a786af16d510bc55e15838e12400c60c82f289da0bbebb7ae2ce7244b637dd7162399e6ef78557294f18a44cf81664 SHA512 562dd04faf46b1f1e6e9b4331f190aad6857d0202c3153f871021fdbbf46996870e506f69199d12f5d23a8338bdbc5a36c94676c0897969d4168d248f465e74e
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 34c27ba55b47..2dd6b633d078 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.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})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index c4cf5a9a62b8..3a7a195f1e72 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,3 +1,3 @@
 DIST zope.configuration-4.3.1.tar.gz 83223 BLAKE2B 9c55951932f34484fa6760a6a3cbdf89fbf8723c43b9b4ea2cf909b74716bcdd74d03327fc418f43bcfc8b6b5c17554cf8d062952d8d6880e49e6b270da9c1c8 SHA512 bc8edf84a391cab4f664ea3a4d24b65cb9db351c972b6118e69fe3c726bbe3337121ff59d687dddf463b3672ed6996f21d4437941c81dc456a4e5d837e0945d2
-EBUILD zope-configuration-4.3.1.ebuild 848 BLAKE2B 0bc69b75454af2640f60741988179491845cb78aafa026cbbf467fbaa54720b29810613637cd24a41962afe0808b2434f718cf5347268d3b6577c8069d6e4bc7 SHA512 b5ea2834754882221666fab02aa4f0c1e6b515bc4f1bbae804b2f6621a5491b6986f95f11eecefc246f52c879c0c06e2c48014a1682e04d31596c15c59347e3e
+EBUILD zope-configuration-4.3.1.ebuild 844 BLAKE2B 54e111a78e1f400a77e5a930dd35b9c73cb010de4bc8fcb63e04416b353c445de8fd08b4ef78e73204c8bb0f0070aebe53dcddc757f91a252f880b01a87a22a8 SHA512 6ed039fd1cba3860409bbe5e0482b829587e787c4f83ce5ce76952f5d31f38ef1e66b3fa0975f60a87a95d136e0bb2434b62d3cdc028206f9d1c61d1d5377696
 MISC metadata.xml 646 BLAKE2B c556a67d6a337d654d52e94060d0a91587cf3ef8fe95fdc8808f0ed03328a26c2aeb91dc459182fcfbcd1300d38f6f70f8e7489ddd41b788205da6545934cc3b SHA512 a8660b5d1a2619030fe32a06a95ae75e83f923a0c0b63a736a3c1c95137a99aa447c85fc0665efb7196a014a5473cd47a33744ab6cd047a8d9f33deb401e06d6
diff --git a/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild b/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
index fe5dcefb34b1..37573059ee96 100644
--- a/dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.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 distutils-r1
 MY_PN=zope.configuration
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index f765a04b8688..42dd28b0bf4f 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,3 @@
 DIST zope.exceptions-4.3.tar.gz 30704 BLAKE2B aa5319c8f9b3555038809f8209d121b4a8944a9df1c683302749c12e1e5097139047583b1f033e6530005232fadc326aed7da64fa585b749ec50cd22cb3411a5 SHA512 348c8edb0246bb2035ca5c1bcfaca7d3be2525157e2c9267a59a061c8ba749b364428e3d6a3aa3f967306abd0a319e4d6fa935b7fc35fff3bb53960015505695
-EBUILD zope-exceptions-4.3.ebuild 943 BLAKE2B 86acd0a771a708a1053a587698863d689c3de138380667d1ac79d08c12e05b884c93905d22f6718c9dcc69c63e5ecb3c946046463cbd4f48530e2f6c24711495 SHA512 b72f4ade74ce03d6fb1e731ae646c31938cc0b5e75e0c5616d4fcf73430011f6d23087af3c033f4fcac84331bed1dc271018be77fddb399da0e9c52a1c316fb0
+EBUILD zope-exceptions-4.3.ebuild 933 BLAKE2B c5816ebb7eebb32130399edb8e330f80ef1eee641380cee06531bf3aac38338f74ef1572d95cc9dda348558ed9d570fed02a447a236de89723d9bca831b4d066 SHA512 ff88b09e52b50d3ae08d93d6e7b3a882e2de5a0d6dd73260903048b26ac5669abd3497e9499a43434b9cd4d35fb0c98b0d14c22a0622e0284f29f8c173b81ea6
 MISC metadata.xml 388 BLAKE2B 81b6980b4187c8b5be0134c006c0327df68b4c4cd251085b132aeea84145894b189fff3bbae36fc685854caa3f3bae79eec6240d2cae2895012ceaab9f75be2a SHA512 8eeba4b9f4529cd57b811fbbab44a10dbb8c98e797def89845975e83f837f1b8c3a4607a4a32ad8450e4f9f046abe9388a54c89b007c5673976b3ba7186e60c9
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
index 7a4b0e61b6c4..c6701f6ddad0 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index cbbed5d174c0..0e9c385f941c 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
 DIST zope.i18nmessageid-5.0.0.tar.gz 28220 BLAKE2B 84727f56ce8dd069915b5b31a2f9824ee83b334d82e3b2a958e35e43842cee044ec47879809fe6256b51631a5baf9dfb4432f7e5e494faceca2f7ade479d38ff SHA512 76cf129e266f649ab379d1abea143b34e42f0ce66fdfcbebd1dbbca639a55c11a9d41687a7bb4dd04359fa1465e235035849786d142bafaa68d783c1f7aee2d6
-EBUILD zope-i18nmessageid-5.0.0.ebuild 821 BLAKE2B 43426a9a3de7249c822538b3d93c26c1adeab22d201aae7beb381abd50ce2203f6cf93bdd4c172781100129c48df972e3739d427682efcdcf001f3bb6f1ac837 SHA512 fa90b3b86eaa476155494ee41c60d8cbfe43f7a45b5f04dd6c6b3225912f1391f1d4f26073e090122dbccedfb4a95390110bce515cc425df8f949ea0aa252e73
+EBUILD zope-i18nmessageid-5.0.0.ebuild 811 BLAKE2B fac271aacfeb5a35be7c40c538304f34202e296dcfb5ecf71f3b673471c94db27477f37bee9466d9820d5880df52919015ffc6217888d63596fa79f5a36e72a2 SHA512 369dfca76b4582e0317b427ba60b940a88bae79520adf105e59d52c666205219de58c5dcc2ccc57719662b180857592302152357ea2f51502a1491185db6d1c5
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
index 792f5b319cc5..ff70030cf3e9 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 97897930a77f..1dd509bdaaa3 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,3 @@
 DIST zope.schema-4.9.3.tar.gz 98217 BLAKE2B 9b3288bf8b07174fbbd919398cc441f5585671e312651f9cbcbbab9f885af67f5f8e954d70bd4787e8f17bd465f8152c685b894188d05a0663344fb8b3c70569 SHA512 63cdf431ba2aa79eb5771f99cf0a60932182edae00a63873f96cc02c70f826d23c72ecabd736d0f6439d63af900b4ee2c05246eabe0b1689b01bc15a09648504
-EBUILD zope-schema-4.9.3.ebuild 1005 BLAKE2B 1585e8f0cec69b5e640503b7f9f79c16bda6e4f101467df0eba3ee2c43b99469e38e66bd88484a19bc3b2d1814965a38b4dfd2c035b3152081060b358081dc01 SHA512 8699bd15afc364501e906aee84ab9844d7bff833430fd2984a0b5fd60de737665fe7816d49420cc0a8ade4506180dc2d4893e48879aad04f3c2f7bda56f84e85
+EBUILD zope-schema-4.9.3.ebuild 995 BLAKE2B a83b4352d0a662c0e7e2f3e0d8fc0918d568997918e6832cba1a5d2ddb3627d88a9c860dcbeb114fb7b6a22e408dc16997043de4939b600a73b1509a88803926 SHA512 fb816c897db565471f8de2fefe90493a6ca86d4aafcae9977629aadd5ebda3f4cf62625839a83346f735cc81d97da7fe4ac866043599f9a136c7a0816e2fda78
 MISC metadata.xml 473 BLAKE2B 9d4475a1da73bc0330a977dc4943fe10a2b51465cc79413b2d8fc780a6b1afd73f77e54025fce33be258546fd991e1fd9ff9c37a2c9654065c67867255382a15 SHA512 6d2c6bc56197b18365bdb11a2986c614234aa1e57f37b93f95f6616a3674890f7f02a901d58dbac0d2d98ceb1cb8535d9c2e84969778108e1e8bcdecb89c4299
diff --git a/dev-python/zope-schema/zope-schema-4.9.3.ebuild b/dev-python/zope-schema/zope-schema-4.9.3.ebuild
index d1f836d2561b..0eee5d3b0047 100644
--- a/dev-python/zope-schema/zope-schema-4.9.3.ebuild
+++ b/dev-python/zope-schema/zope-schema-4.9.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,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 0cbe0c4d60d7..4f241602ebb5 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,3 +1,3 @@
 DIST zope.testrunner-5.1.tar.gz 140679 BLAKE2B 4044b9c77bbda6610b803fbc91cb7bb4d1aaeeb041c32cb91ecd05e05d75a685cd4b6d4531fdcb74380e6ce3fc40f32d21f71ad346491667458a165a90e3a401 SHA512 685d1e1512bd85a00c34f4f89ca1e0f8d1f0939de7b25db0cb43da44e5e41e735e1e9a5ccf2a89b959d7d5f074da71dfe0fd931bd62082159ec65c0b53cd38c1
-EBUILD zope-testrunner-5.1.ebuild 1037 BLAKE2B 2dca6bb079089098c62067982bacdd7c36dd1a7852c97585c311ecb8d8ebecf312a0ed22f855e5f7d48672d0d26dfaf6e374513ef29e74f18d3fdbda1ba7b5bc SHA512 0767e9747fc29d03a575827ce10cfb15ca8f53a83e8cc8fcd685fc9483f1252dcb625d81cbe023528c1091452bb024b4b075b67d98f120316aed2a3408b791df
+EBUILD zope-testrunner-5.1.ebuild 1027 BLAKE2B 221e45fe2b524328ab966545ca7136427dddf230913402b5542533611134cd2942324a533bcde2cd8ac9a244b1620bef91e7f3e9aebab13ed0121e728421236b SHA512 b1f38f469fc09bb42a89a40fcb6c4208e6c07c576a72d107d6066cfaf80cd1472190c37d5086176aa810ff86a18f6883e4b2dc32b028ab18a14a8161c1f3fbf5
 MISC metadata.xml 388 BLAKE2B 7e19b9134023bf0117cb60760a8579041f1627be3c018be3cad9dfb69d38cc269b1a44350f79a8b282b0ad7035b0328dcaea341a84b09a0a828175d5ee68bac0 SHA512 a6f78bea0ba1c56a15e520c58411503dc976224e7fbf5cc263477f37d5744da29ea3cd4a52c317753a3b68d5efc60e4b3ef8199f9922484ae8b916ff67bd2a32
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
index f147bb59206b..4412f2ac7d0b 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.1.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
 
 MY_PN=${PN/-/.}
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 5aa6f0a48f84..9142f8b1458c 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
index a94a64f38741..3329d81f0e1b 100644
--- a/dev-ros/combined_robot_hw_tests/Manifest
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -1,4 +1,4 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-EBUILD combined_robot_hw_tests-0.19.1.ebuild 565 BLAKE2B 0a4a984c504cab1ab01c200f4adb35a10cd79ec23c711f7721a84ab14158a2b7d53a66fcad00b7f42448c24b022c394a6f376d230b69cade14908349e6c24c4b SHA512 787d2038fba0e498306aaadbfbf06469bc9a9e86c567535b5bfa09b1fb7c1c4ef60f26f785c48c7743f46109b30cfd8af0305405f75acbfcbb88ba4d0f51d846
-EBUILD combined_robot_hw_tests-9999.ebuild 565 BLAKE2B 0a4a984c504cab1ab01c200f4adb35a10cd79ec23c711f7721a84ab14158a2b7d53a66fcad00b7f42448c24b022c394a6f376d230b69cade14908349e6c24c4b SHA512 787d2038fba0e498306aaadbfbf06469bc9a9e86c567535b5bfa09b1fb7c1c4ef60f26f785c48c7743f46109b30cfd8af0305405f75acbfcbb88ba4d0f51d846
+EBUILD combined_robot_hw_tests-0.19.1.ebuild 667 BLAKE2B ab1daefb5b1d1d8b8abf90d69d0fea9316cd7849cb089efd9fe64bd086d2a2718e773d9f8e68653bd0be9b18d6e4b489824620648420382c20e5b70c546da1b8 SHA512 9f6fc14a7c295bfae07882de662b02eda877e942cdfaaff8f8a8fb4a2de22297dbb8f97e41a16950306c10f8ac7cc635c103a82497a42b0f467fcb413883c17a
+EBUILD combined_robot_hw_tests-9999.ebuild 667 BLAKE2B ab1daefb5b1d1d8b8abf90d69d0fea9316cd7849cb089efd9fe64bd086d2a2718e773d9f8e68653bd0be9b18d6e4b489824620648420382c20e5b70c546da1b8 SHA512 9f6fc14a7c295bfae07882de662b02eda877e942cdfaaff8f8a8fb4a2de22297dbb8f97e41a16950306c10f8ac7cc635c103a82497a42b0f467fcb413883c17a
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
index f3d7b62e15b8..2ffddf9ca609 100644
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
@@ -16,11 +16,16 @@ IUSE=""
 RDEPEND="
 	dev-ros/combined_robot_hw
 	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/controller_manager_tests
 	dev-ros/hardware_interface
+	dev-ros/pluginlib
 	dev-ros/roscpp
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
index f3d7b62e15b8..2ffddf9ca609 100644
--- a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
@@ -16,11 +16,16 @@ IUSE=""
 RDEPEND="
 	dev-ros/combined_robot_hw
 	dev-ros/controller_manager
+	dev-ros/controller_manager_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/controller_manager_tests
 	dev-ros/hardware_interface
+	dev-ros/pluginlib
 	dev-ros/roscpp
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index f7530c4f5e21..d8e657e8a1ef 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,4 +1,4 @@
 DIST image_transport_plugins-1.14.0.tar.gz 28803 BLAKE2B fc3fc34c0dc01c5dc0ed7f2a88fd691f9b955009bbf91a2280e39455e0325a46edc67c25cf79d8e4882789c20235c13fb87bfc64669ffda40a1fe37224a346e9 SHA512 1333f18a3208ecda4f788dc2d974b5787a89d33a1ad1ea2c6b4cc07593c677686aa5e9df3346d2e5f307699b88b42f341a989eebecc3cd7885768e3dcdbbcdcb
-EBUILD compressed_depth_image_transport-1.14.0.ebuild 556 BLAKE2B a7591e9ad964270653398a9dc6fb2f2cdfca9f12ec670360acd3eb11e67f0bc8da2b5cc01285466148c70183f35041aa4e6b4b7d9587ed760165603e1eb9c117 SHA512 ffc7824aa64deb69c67ab48473c666cb08ee6c8a9b6ee77d53b8940e6cdffa737bb5dfa18a98ae12335ad6b30b5a148bdd17bf4c1954eaf08ffae572b64b2726
-EBUILD compressed_depth_image_transport-9999.ebuild 556 BLAKE2B a7591e9ad964270653398a9dc6fb2f2cdfca9f12ec670360acd3eb11e67f0bc8da2b5cc01285466148c70183f35041aa4e6b4b7d9587ed760165603e1eb9c117 SHA512 ffc7824aa64deb69c67ab48473c666cb08ee6c8a9b6ee77d53b8940e6cdffa737bb5dfa18a98ae12335ad6b30b5a148bdd17bf4c1954eaf08ffae572b64b2726
+EBUILD compressed_depth_image_transport-1.14.0.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
+EBUILD compressed_depth_image_transport-9999.ebuild 585 BLAKE2B 0b8b19deef36e366964662b6b0d7748cfb66f6e4bb4d4e5cca1b28f5c04dddf77fc296dc267d6d7ac2226f69850be63735f0dbe3a64dea0236181bdf504908dd SHA512 332f93b0ece052ab11ef4ef6cf532861e359675da30a74dd4d95427f4678c1dfadc30f48f78ecb2c833ce1bc0f8756eb6966bc0144a8f8a5b513eeea91df8e01
 MISC metadata.xml 352 BLAKE2B d741d3235de6a630917b5785819ea9a3b13d8602bc5fd27b9fb8d4cea1df216fb64eaa0fd2fee5c5f11012a823311155331e2ae65af23874322679dc57bc32a9 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
index cd36472d2cb9..97f465fd4872 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
@@ -21,4 +21,8 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
index cd36472d2cb9..97f465fd4872 100644
--- a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
@@ -21,4 +21,8 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/controller_manager/Manifest b/dev-ros/controller_manager/Manifest
index f171c4a8e400..7aad238d435e 100644
--- a/dev-ros/controller_manager/Manifest
+++ b/dev-ros/controller_manager/Manifest
@@ -1,4 +1,4 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-EBUILD controller_manager-0.19.1.ebuild 833 BLAKE2B 12f18ea6ea376fd0e53e991780add0989b188a5c041fbe4e4b169133cb5c85cd4f34c9413216775e0d80a2da5768326de26b5ca7ebea5ff81560ecf5d7068634 SHA512 603194ff1a41960d2c007dfb875dc4ce9ae6c430e9951b4ad1773485d8ca37cd5b036f6e4e3f1ebfcc199e980545b528943730b5e99b0750b4d934168cc42746
-EBUILD controller_manager-9999.ebuild 833 BLAKE2B 12f18ea6ea376fd0e53e991780add0989b188a5c041fbe4e4b169133cb5c85cd4f34c9413216775e0d80a2da5768326de26b5ca7ebea5ff81560ecf5d7068634 SHA512 603194ff1a41960d2c007dfb875dc4ce9ae6c430e9951b4ad1773485d8ca37cd5b036f6e4e3f1ebfcc199e980545b528943730b5e99b0750b4d934168cc42746
+EBUILD controller_manager-0.19.1.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
+EBUILD controller_manager-9999.ebuild 911 BLAKE2B e7289f33666ce614e3f20dffb0a2b73a425deea39a818168e290c97c64b06243430c4a55c65096188cbf81f42cbd1a2dad14492cb673a5c93fab1e7df3a4e2de SHA512 a452d8ed7ffcf8d5bce4176841cde2d336317817a61c8d7eda815e74c25752631bf050f9b243e973cc4bf3171219efad6bc5dd2a85593ebfbeecdba0fac41162
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
index 829d9e8c74ef..56fe44573d05 100644
--- a/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
+++ b/dev-ros/controller_manager/controller_manager-0.19.1.ebuild
@@ -15,10 +15,11 @@ IUSE=""
 
 RDEPEND="
 	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	>=dev-ros/hardware_interface-0.10.0
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
+	dev-ros/roscpp
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
@@ -27,4 +28,8 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/controller_manager/controller_manager-9999.ebuild b/dev-ros/controller_manager/controller_manager-9999.ebuild
index 829d9e8c74ef..56fe44573d05 100644
--- a/dev-ros/controller_manager/controller_manager-9999.ebuild
+++ b/dev-ros/controller_manager/controller_manager-9999.ebuild
@@ -15,10 +15,11 @@ IUSE=""
 
 RDEPEND="
 	>=dev-ros/controller_interface-0.15
-	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	>=dev-ros/hardware_interface-0.10.0
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
+	dev-ros/roscpp
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
@@ -27,4 +28,8 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	>=dev-ros/controller_manager_msgs-0.10.0[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/controller_manager_tests/Manifest b/dev-ros/controller_manager_tests/Manifest
index 04a02de0ff5a..024539903bf9 100644
--- a/dev-ros/controller_manager_tests/Manifest
+++ b/dev-ros/controller_manager_tests/Manifest
@@ -1,4 +1,4 @@
 DIST ros_control-0.19.1.tar.gz 678884 BLAKE2B 427d927900b52ecc7c83807666cb315ad6a0850b2425d1ee0ca28389668d081e594211678108315ec690391d0369164d58a23d0a3a4351c1a80fbb9bb51d454b SHA512 bb5d161510623e1257cddd41da79d0025bd5000a3f6d4fa1a0055336d830f4375e2d7a3dcc3215a86bb84a355da14e745044225d716b07631295e500ab45d1c7
-EBUILD controller_manager_tests-0.19.1.ebuild 654 BLAKE2B b18b5e34efdd2ab308ff66dfdeb2b483d7bcb934f518d6e15180eb6f5368c63ae67586c9ebe6735268ddc7e24e41ba41bccec3ee89f6a5525e9b13b59a7ca9f3 SHA512 7eb32c2d130868ed84d391d43eae88f93289ec1f6d9fb1fce4ed73c494bfcd89c6da7222c760113ee295a2251a54f6f0283ca16169bdb3622e2fbbf7dc9b7fad
-EBUILD controller_manager_tests-9999.ebuild 654 BLAKE2B b18b5e34efdd2ab308ff66dfdeb2b483d7bcb934f518d6e15180eb6f5368c63ae67586c9ebe6735268ddc7e24e41ba41bccec3ee89f6a5525e9b13b59a7ca9f3 SHA512 7eb32c2d130868ed84d391d43eae88f93289ec1f6d9fb1fce4ed73c494bfcd89c6da7222c760113ee295a2251a54f6f0283ca16169bdb3622e2fbbf7dc9b7fad
+EBUILD controller_manager_tests-0.19.1.ebuild 670 BLAKE2B 42fa03537cabe4431b34a074d5b6698f16c504c7239dccb60c101adf016dd7925f8e2e7ebda84cdab7614cc6ae24bb2b3e24f831aae596b283bff9c1fdb13c44 SHA512 35129556840ff4ce13c5e76fb436b4bf0578e68f81a86a7b5226f7e85e749ee7c522a929bb91bd57ce9807858a9d66220cbec836ab03668b68c523916a34a1a6
+EBUILD controller_manager_tests-9999.ebuild 670 BLAKE2B 42fa03537cabe4431b34a074d5b6698f16c504c7239dccb60c101adf016dd7925f8e2e7ebda84cdab7614cc6ae24bb2b3e24f831aae596b283bff9c1fdb13c44 SHA512 35129556840ff4ce13c5e76fb436b4bf0578e68f81a86a7b5226f7e85e749ee7c522a929bb91bd57ce9807858a9d66220cbec836ab03668b68c523916a34a1a6
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
index 537d9dcc26ea..5ce10ae8cdd2 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
@@ -25,4 +25,5 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
 	)"
diff --git a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
index 537d9dcc26ea..5ce10ae8cdd2 100644
--- a/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+++ b/dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
@@ -25,4 +25,5 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 		dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
 	)"
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
index f6502e9d7851..b7f520a1b042 100644
--- a/dev-ros/depthimage_to_laserscan/Manifest
+++ b/dev-ros/depthimage_to_laserscan/Manifest
@@ -1,5 +1,5 @@
 AUX isnan.patch 672 BLAKE2B 714348340fb583106891e467fb24815cb95e389ef863b39c8ed5d6250c2fc5d5467cf565590b0fa1e163c440fd6e282f6320d77395b676876bd51526a755e454 SHA512 c4993894868cbfbd66374b4062f43e7d58ef8e3d725024b06146144809cd059d6a01ba502626876089847688a58f1f069f8dfb788e657ac7c1a79e9cb8200a7b
 DIST depthimage_to_laserscan-1.0.8.tar.gz 12189 BLAKE2B 78668e8768bf9f402b5d94af71045677ce35b9b680c1b298f48a8a0c55f3920880eef24d0ab334150b967fd1378b9e4ada8069965057238e59116adb2f803d32 SHA512 50472016630d10b5a8544c7a2391c215de307dc5b0d8445cdc05d8e2f251651221bf18b18e389d000adacf79324569bb6ad7a23c6c6cce901d5ae1c966b4533d
-EBUILD depthimage_to_laserscan-1.0.8.ebuild 680 BLAKE2B 25a419e2bf100a817d8a47f28aa1011da15682a38a27b7dbd8b15b699d06024b6040842959704595cd76f79d799f389847a3d73a61aa0603dc5afc6c77122655 SHA512 f5f9ed94051684224ef3f98d74f2d69a2aca6a9ee1a4b239f134cf68154767299cf4f1b5a0df14d419f0e9892c629ffc15c43e5dc3449ebc58c5ac6c0634235e
-EBUILD depthimage_to_laserscan-9999.ebuild 680 BLAKE2B 25a419e2bf100a817d8a47f28aa1011da15682a38a27b7dbd8b15b699d06024b6040842959704595cd76f79d799f389847a3d73a61aa0603dc5afc6c77122655 SHA512 f5f9ed94051684224ef3f98d74f2d69a2aca6a9ee1a4b239f134cf68154767299cf4f1b5a0df14d419f0e9892c629ffc15c43e5dc3449ebc58c5ac6c0634235e
+EBUILD depthimage_to_laserscan-1.0.8.ebuild 709 BLAKE2B ea3a787ef86eb9968b561b9c2e36fd9e388705558912daf7dd23615795dc53355b203e7089968d82201421b2d5bb42be1e0210dba86cdd64bc1a17b263525367 SHA512 67c244026540b77ec4d2584a19c61be7b4663d10e96916349e4ebceeded03fd5800d8c06da783474c72f987cb224ed823508efab3c3904f76ff037f6225dbc5f
+EBUILD depthimage_to_laserscan-9999.ebuild 709 BLAKE2B ea3a787ef86eb9968b561b9c2e36fd9e388705558912daf7dd23615795dc53355b203e7089968d82201421b2d5bb42be1e0210dba86cdd64bc1a17b263525367 SHA512 67c244026540b77ec4d2584a19c61be7b4663d10e96916349e4ebceeded03fd5800d8c06da783474c72f987cb224ed823508efab3c3904f76ff037f6225dbc5f
 MISC metadata.xml 352 BLAKE2B 925e18de2139370d06d242cbf4c2d15f2d201df3c28036169eb868defaad60ef0e38814cae627c43efbe5efddfa21e311053970f7ad0b648650df538c1817a10 SHA512 3eafc06a8ac658f3f29903c2f23b88b53b2dd5b1a70fecb8788a4027646c5367a3d0384179c0ca1e75e58a8081ce53c00ae6def249f48a7fc7c2ea0365408d2c
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
index 2a0e0e7a739d..bee85b1f78d7 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
@@ -13,16 +13,20 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	media-libs/opencv:=
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
+	dev-ros/roscpp
+
+	media-libs/opencv:=
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+	)
 "
 PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
index 2a0e0e7a739d..bee85b1f78d7 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
@@ -13,16 +13,20 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	media-libs/opencv:=
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
+	dev-ros/roscpp
+
+	media-libs/opencv:=
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+	)
 "
 PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index 2e1b7bffc287..c0df19a313ca 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,4 +1,4 @@
 DIST dynamic_reconfigure-1.7.0.tar.gz 40420 BLAKE2B 8a08a96817c62552a5045e3d9435fd06465660513eef55c85a6454334db462c21dd6ebc2c48b3e5e59d66344c5904f87f6a86b701726c0e23de65967367a104a SHA512 5eb05bde8e283f319220331cbd1572f6735aba27f86964cd78c295e9a5a59904632aed0651cbc9f358cf6012299763ebe57bc4daee4a7af7d8537089394db845
-EBUILD dynamic_reconfigure-1.7.0.ebuild 547 BLAKE2B 058e107f9ffc56ceb750b8c5b5e3e15efc864d7a5461e0f8975eb34e5b1a0ec9f0fb88beba5c0b4975c05e698edc4b091b01620a3a1e29b2ae5757b156cb756f SHA512 abf36eb6e3a6ebde415161a68f5ec5f9043a3f67040c5bc5301fbcd8dcb299d78f7705c45792c79127644a3dba5281bbc0d138f1cd04690af34d00579e111b29
-EBUILD dynamic_reconfigure-9999.ebuild 547 BLAKE2B 058e107f9ffc56ceb750b8c5b5e3e15efc864d7a5461e0f8975eb34e5b1a0ec9f0fb88beba5c0b4975c05e698edc4b091b01620a3a1e29b2ae5757b156cb756f SHA512 abf36eb6e3a6ebde415161a68f5ec5f9043a3f67040c5bc5301fbcd8dcb299d78f7705c45792c79127644a3dba5281bbc0d138f1cd04690af34d00579e111b29
+EBUILD dynamic_reconfigure-1.7.0.ebuild 596 BLAKE2B 84d0fc8f718496f205482455bf164750f08994d32cc02440917cbb2d0611c35d694fd6f30c1419fd23710521961c4f4b6c10aeba7068f406a4e2ed97c9b3cca1 SHA512 7d4c3af31cf603abfe3f8078fc3b3b05e58b0836680c402dcb333ed5e055bd052819d8bdce33e60f4baebd50f3bc497d147abef8cb1117864b4c887ee398a304
+EBUILD dynamic_reconfigure-9999.ebuild 596 BLAKE2B 84d0fc8f718496f205482455bf164750f08994d32cc02440917cbb2d0611c35d694fd6f30c1419fd23710521961c4f4b6c10aeba7068f406a4e2ed97c9b3cca1 SHA512 7d4c3af31cf603abfe3f8078fc3b3b05e58b0836680c402dcb333ed5e055bd052819d8bdce33e60f4baebd50f3bc497d147abef8cb1117864b4c887ee398a304
 MISC metadata.xml 337 BLAKE2B c2b63166315cf868635f9abe7b49158c32f30d031cfd454ef9ebfb16fe7fc96c00cecc77c59bb3f91d4f07c77783bb2e1750d24f87da0507106355401ffe069b SHA512 19705df6cde1a0ae66f58cccc95a96e26302960f7e055a8c2b5fc15f0d995b2adaf0ac61c87470f7562e2ad03012845fd3abac6b4a081c1d6e01e9b91d53e561
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
index 454c90d5b70a..b10aeaba3d41 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
@@ -20,5 +20,9 @@ RDEPEND="
 	dev-ros/roscpp
 "
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		dev-ros/roslaunch
+	)
 "
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
index 454c90d5b70a..b10aeaba3d41 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
@@ -20,5 +20,9 @@ RDEPEND="
 	dev-ros/roscpp
 "
 DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		dev-ros/roslaunch
+	)
 "
diff --git a/dev-ros/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 532605137ec2..0004043da74e 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,4 +1,4 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-EBUILD image_proc-1.15.2.ebuild 621 BLAKE2B aee40bf23b84fdbe53c12de98c0998b2a8dd941cbaa75abb10db4c5047f6e4945ee7df47a24c0b9645122482df5e6413673c3105f6f7d2ee650cb61f1d0d3e8c SHA512 7430ac99c63cbb36c59926aedcdff576241e72d215f8105be326a0b76d559fb1f38727882224c5d9cafe129113839dce7702c2ef9a87ea4fb5d11070d178a017
-EBUILD image_proc-9999.ebuild 621 BLAKE2B aee40bf23b84fdbe53c12de98c0998b2a8dd941cbaa75abb10db4c5047f6e4945ee7df47a24c0b9645122482df5e6413673c3105f6f7d2ee650cb61f1d0d3e8c SHA512 7430ac99c63cbb36c59926aedcdff576241e72d215f8105be326a0b76d559fb1f38727882224c5d9cafe129113839dce7702c2ef9a87ea4fb5d11070d178a017
+EBUILD image_proc-1.15.2.ebuild 721 BLAKE2B e14f402aef6906b69c46c5ade655f7a008bf9f702b437de684d3791be4ba2a15e4ea52789beb430d5dda39fd6a8e884967e890be3a22a99c608a5a36d455c42f SHA512 6e0e269ceac1fa2d32ecdd358d6e64de18dd0bb7fddf4dded67fcf45658fc59ebcad569b2e3aba56edc8482e6d0dadc2c7931540074d01d2519a7c490d0925fe
+EBUILD image_proc-9999.ebuild 721 BLAKE2B e14f402aef6906b69c46c5ade655f7a008bf9f702b437de684d3791be4ba2a15e4ea52789beb430d5dda39fd6a8e884967e890be3a22a99c608a5a36d455c42f SHA512 6e0e269ceac1fa2d32ecdd358d6e64de18dd0bb7fddf4dded67fcf45658fc59ebcad569b2e3aba56edc8482e6d0dadc2c7931540074d01d2519a7c490d0925fe
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.15.2.ebuild b/dev-ros/image_proc/image_proc-1.15.2.ebuild
index 088890f6b623..b5835b9b9a33 100644
--- a/dev-ros/image_proc/image_proc-1.15.2.ebuild
+++ b/dev-ros/image_proc/image_proc-1.15.2.ebuild
@@ -15,15 +15,20 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-libs/console_bridge:=
+	dev-ros/nodelet_topic_tools
 	dev-ros/roscpp
+	dev-libs/console_bridge:=
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
 "
diff --git a/dev-ros/image_proc/image_proc-9999.ebuild b/dev-ros/image_proc/image_proc-9999.ebuild
index 088890f6b623..b5835b9b9a33 100644
--- a/dev-ros/image_proc/image_proc-9999.ebuild
+++ b/dev-ros/image_proc/image_proc-9999.ebuild
@@ -15,15 +15,20 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
+	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-libs/console_bridge:=
+	dev-ros/nodelet_topic_tools
 	dev-ros/roscpp
+	dev-libs/console_bridge:=
 	media-libs/opencv:=
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
 "
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 9b397b1c4874..81c9ce4cbde1 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,4 +1,4 @@
 DIST image_pipeline-1.15.2.tar.gz 147570 BLAKE2B 7e6ecad344e38426148017c4bdd109cdb505201256b811d7479b2fa5f2b6a94f94708ffd0e2a3c273f09fb8db0afdedb6955320bc142e4b48fbf94eeef45b453 SHA512 8fe9fa7759d83b2585589c6667c82b154c6ab748aa1644e8a58c75550e4c581fdea1b42f91a8c64df4eb7a06b33a76e55325268f314f3ec1f06ee38ee7b06bfc
-EBUILD image_view-1.15.2.ebuild 818 BLAKE2B 750a979c80808a448aeb8e720ee53999ec7d2999650ab6efec9dd999c5491e89e84a2305114e0c46446e1eca6a290852ad2dc5496159fe5bb5e60e5cef2e6341 SHA512 1ede97bcabd86f8ff291532531d273b50a08cc616800325e67836a705fc93bf65d2469a987aed2a6e014c3511526784241a12900d21861ad2ed8a8e93c759c6c
-EBUILD image_view-9999.ebuild 818 BLAKE2B 750a979c80808a448aeb8e720ee53999ec7d2999650ab6efec9dd999c5491e89e84a2305114e0c46446e1eca6a290852ad2dc5496159fe5bb5e60e5cef2e6341 SHA512 1ede97bcabd86f8ff291532531d273b50a08cc616800325e67836a705fc93bf65d2469a987aed2a6e014c3511526784241a12900d21861ad2ed8a8e93c759c6c
+EBUILD image_view-1.15.2-r1.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5
+EBUILD image_view-9999.ebuild 873 BLAKE2B ec5a77c58a5f77cfaa22b285f00d265e882c3f7d375101500951d14f2fce40136714e7ceeeb2a6f2a93d67a7dfec35ed363e61f10c4f27b76d6a02f29b98a336 SHA512 3bf82c2f933fb1538dd7230acb73e96ba80ef395af065555bd6f98208b5f0844afe6a4c384eb2e55b32b1cd661f42e2c582059f3d9850777b97fbdd23cadcbb5
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/image_view-1.15.2.ebuild b/dev-ros/image_view/image_view-1.15.2-r1.ebuild
similarity index 91%
rename from dev-ros/image_view/image_view-1.15.2.ebuild
rename to dev-ros/image_view/image_view-1.15.2-r1.ebuild
index 6ac898af8a57..59e53eacf1de 100644
--- a/dev-ros/image_view/image_view-1.15.2.ebuild
+++ b/dev-ros/image_view/image_view-1.15.2-r1.ebuild
@@ -14,9 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
 	dev-ros/camera_calibration_parsers
 	>=dev-ros/cv_bridge-1.11.10
 	dev-ros/image_transport
@@ -26,9 +23,17 @@ RDEPEND="
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+
+	dev-libs/boost:=[threads]
+	media-libs/opencv:=
+	x11-libs/gtk+:3
+	media-libs/harfbuzz:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index 6ac898af8a57..59e53eacf1de 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-9999.ebuild
@@ -14,9 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
 	dev-ros/camera_calibration_parsers
 	>=dev-ros/cv_bridge-1.11.10
 	dev-ros/image_transport
@@ -26,9 +23,17 @@ RDEPEND="
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
+
+	dev-libs/boost:=[threads]
+	media-libs/opencv:=
+	x11-libs/gtk+:3
+	media-libs/harfbuzz:=
 "
 DEPEND="${RDEPEND}
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/kdl_parser_py/Manifest b/dev-ros/kdl_parser_py/Manifest
index a20d78448647..365dfaa3c9e0 100644
--- a/dev-ros/kdl_parser_py/Manifest
+++ b/dev-ros/kdl_parser_py/Manifest
@@ -1,4 +1,4 @@
 DIST kdl_parser-1.14.0.tar.gz 31861 BLAKE2B dc4ad1ebafd4435156e39f38cec0b8b0dc4368195ff0b17009577511645ea6f1eae01edaeaba49bf50da3ca498a992b7e5d5f804ad9ccc020f398fe85bd26da8 SHA512 9661c4b4d1d3839d64c7b5579a751f6d02bbfe07c562f2b63919563470b255a6934ef57ed240105238bd8034388d910c2933f359d68b988d3106fc182b7c2600
-EBUILD kdl_parser_py-1.14.0.ebuild 593 BLAKE2B 3f1751037186bead0b7765f808aceb312ba86195f6837fdffbfadf5f99dcce1595310c60dca6bcd3202d7da4ccc5582d4b727937e540093273ce375cbb354bdb SHA512 cae4059aeb804ac012c65f97bda17bef6f4ab1d6dc39f1de544b3ba62336d2b35fb50ca00bcbf9300f6f88b5b406ab6fa9f42f2d4950749a2ebf5c02b820d753
-EBUILD kdl_parser_py-9999.ebuild 593 BLAKE2B 3f1751037186bead0b7765f808aceb312ba86195f6837fdffbfadf5f99dcce1595310c60dca6bcd3202d7da4ccc5582d4b727937e540093273ce375cbb354bdb SHA512 cae4059aeb804ac012c65f97bda17bef6f4ab1d6dc39f1de544b3ba62336d2b35fb50ca00bcbf9300f6f88b5b406ab6fa9f42f2d4950749a2ebf5c02b820d753
+EBUILD kdl_parser_py-1.14.0.ebuild 668 BLAKE2B 918399c2a2bc76401c1a0fd367cb1d6c4d12acc0cc447d3584341b375e29101899ac1117ffbfcf1654cad1d549d6923b2b2c253afd56b1c582b1314c1c4f5ca1 SHA512 244cd61389a845df82c8ddf5111fde5018ea08fd405ab65a5a21696df2da7db53dde04be118cdd05cd0f434f4d3a6596d952852201131f963005895740bc51b7
+EBUILD kdl_parser_py-9999.ebuild 668 BLAKE2B 918399c2a2bc76401c1a0fd367cb1d6c4d12acc0cc447d3584341b375e29101899ac1117ffbfcf1654cad1d549d6923b2b2c253afd56b1c582b1314c1c4f5ca1 SHA512 244cd61389a845df82c8ddf5111fde5018ea08fd405ab65a5a21696df2da7db53dde04be118cdd05cd0f434f4d3a6596d952852201131f963005895740bc51b7
 MISC metadata.xml 328 BLAKE2B a679a99d8839aa27a1cf8d33b125750c3ad1ccc76886d5b95b0a4dff0303e424c3b032f32c308ea5df9c10ca3f8686b2236d773b1a21d91eed45bbda8f71498b SHA512 c42cdb9f390f16b0e8cb2f0bad63d9b256ec01bf8cb1a49476bf7383678140debb1f5cca9682458205a4756e1917ce46feb93a99420444a52fed7faba6ccdcc8
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
index 016d69c455fc..de7f14183f6c 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
@@ -17,7 +17,10 @@ RDEPEND="
 	>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
+	)"
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
index 016d69c455fc..de7f14183f6c 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
@@ -17,7 +17,10 @@ RDEPEND="
 	>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/urdf_parser_py[\${PYTHON_USEDEP}]")
+	)"
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index a7acd0b8dd34..bdbaa4df741b 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -2,6 +2,6 @@ AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0
 AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
 AUX ocv4.patch 597 BLAKE2B 0b87de52c3a2fed94c32c47500a69f79d6d6861b5881d5ba357aeb9924be8356b204ceaf7ae9e14055048e7ddc6fb74751cadfd7a6e275b4115e793c5723f007 SHA512 711c26a8539facf376686e619c4a90cc77ae26480f3754edf5b04f0a14aaa861f14d58b19172e37fb4e501eb92883ff4173ae93d8ec5b31379eefb4a0fb2c1a1
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 758 BLAKE2B 0fad1660839b684382b36f1dcbe9bf792f9d8511309d40e41bcc7b0f032f70517e4b4cb007467558677f78afb6dfccd7143076f1e8d41d7723bc335748f876af SHA512 760903a7f2e03df82d9a3edebe1e15fb8522be4fad588acc98beb73b8e5a6759363ccdc3fe670d164b3631dcec1db8f5be6797c7938de6b06f63941d253b0891
-EBUILD laser_cb_detector-9999.ebuild 758 BLAKE2B 0fad1660839b684382b36f1dcbe9bf792f9d8511309d40e41bcc7b0f032f70517e4b4cb007467558677f78afb6dfccd7143076f1e8d41d7723bc335748f876af SHA512 760903a7f2e03df82d9a3edebe1e15fb8522be4fad588acc98beb73b8e5a6759363ccdc3fe670d164b3631dcec1db8f5be6797c7938de6b06f63941d253b0891
+EBUILD laser_cb_detector-0.10.14.ebuild 891 BLAKE2B dec7e2a313b239d43f7dc6fedde686cd0da407caaad35a25f22a6b361e47bb85bcc2db123fca335e25625727b6dc85e772355a170ac7ba6a377012e9a9281710 SHA512 470e2f1aa97cdd8adad204fb261c03b9bdace17f196408eda7db7afca88c905b124e166e4bcb12f1515529861a6b65ae18346f3a3fd01eff519acf4f0aedc56b
+EBUILD laser_cb_detector-9999.ebuild 891 BLAKE2B dec7e2a313b239d43f7dc6fedde686cd0da407caaad35a25f22a6b361e47bb85bcc2db123fca335e25625727b6dc85e772355a170ac7ba6a377012e9a9281710 SHA512 470e2f1aa97cdd8adad204fb261c03b9bdace17f196408eda7db7afca88c905b124e166e4bcb12f1515529861a6b65ae18346f3a3fd01eff519acf4f0aedc56b
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 62425b09344a..eaa01802cc3c 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
@@ -25,5 +25,11 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/settlerlib
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+	)
+"
 PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
index 62425b09344a..eaa01802cc3c 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -25,5 +25,11 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/settlerlib
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+	)
+"
 PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index 25727871009d..032c774334a2 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,5 +1,5 @@
 AUX eigen.patch 715 BLAKE2B dc12bfbb1eeba06624b70d0cab04a723288fd6740b66e8cba9d2e1108b050ab66efa361bc8a9f0455a338a228389d1b346401b77c94eec8b56dcfd51eabec2cc SHA512 f3cf4f9b2ddb8a6baff879e1eae5520c8db4da0b78b2d5af49b84cdde6b9a502cacb6eabfefb8ac36971ec1e86e673d8d0f7fca4e1c32d46001d2c693595dade
 DIST laser_filters-1.8.11.tar.gz 42303 BLAKE2B e5344b273ebe3f9ad75c32f15f15c69a241273def5b3a4b90e39b5a329f3d3a682f67e687c48da3d41c93db0fc94a39f31153ad23cbe1e4997139f57a4c34f75 SHA512 06833adfa96248e360f4bf1b267ddec6c9263296afe64eac3716014f53071ec8cedd8b73f93438d9072e3785843e2ba345f007036d680ba7f4fbd3b720f40b2e
-EBUILD laser_filters-1.8.11.ebuild 672 BLAKE2B 81e10ab585627575de35bbddd5122cf68c34e34e2cefd76c172f941df883faa857200f14951fbab1782568726a8d638ed3458f6ecf9421f92460e5ba3e82aabe SHA512 07267b749fb02f4ee5b8d8c04c9d7c3758fac6be5d067ba62cc58d755209585fd0a6e27b93a2bdcd5eefa8e4ce1aa9a1836cacb468f208f91fc3932b846fbc04
-EBUILD laser_filters-9999.ebuild 672 BLAKE2B 81e10ab585627575de35bbddd5122cf68c34e34e2cefd76c172f941df883faa857200f14951fbab1782568726a8d638ed3458f6ecf9421f92460e5ba3e82aabe SHA512 07267b749fb02f4ee5b8d8c04c9d7c3758fac6be5d067ba62cc58d755209585fd0a6e27b93a2bdcd5eefa8e4ce1aa9a1836cacb468f208f91fc3932b846fbc04
+EBUILD laser_filters-1.8.11.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
+EBUILD laser_filters-9999.ebuild 765 BLAKE2B c4208b0d5fcd0df3a66525007e8d33cd3c0bccccf61a29eeb6ee884e12f7b136ea16409f49155f67b84f6e7884e669b78463e23fa3706eb4b5642201bacdf177 SHA512 c55f5f9a74ef2c9384e0e95bba7d7fe72afd08165072270d94672f2a70545de9c826965e97daa87e9815589a88dcb56a6560899a4091c6f1b60bf6d3387fdaf4
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
index 90477d70dbdf..6d0bb2a716e2 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
@@ -14,16 +14,23 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-libs/boost:=
 	dev-ros/tf
-	dev-ros/angles
 	dev-ros/filters
+	dev-ros/message_filters
 	dev-ros/laser_geometry
+	dev-ros/pluginlib
+	dev-ros/angles
+	dev-ros/dynamic_reconfigure
+
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
 PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index 90477d70dbdf..6d0bb2a716e2 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-9999.ebuild
@@ -14,16 +14,23 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-libs/boost:=
 	dev-ros/tf
-	dev-ros/angles
 	dev-ros/filters
+	dev-ros/message_filters
 	dev-ros/laser_geometry
+	dev-ros/pluginlib
+	dev-ros/angles
+	dev-ros/dynamic_reconfigure
+
 	dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
 PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 7773cc0458f4..e2e7e88055ce 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,4 +1,4 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
-EBUILD mavros_msgs-1.2.0.ebuild 416 BLAKE2B 747835a7e4be830e3d5d60bc379a403f6be128439d5300a7028c7779bb8dc9bf5e78caf38c89ed6dfbe9d0e3638291a1fcf29bf9c5350d882520b9731f7dd323 SHA512 2d90597b901d1e691af9359e1816f5c650e784f9e45b2c92bae39393a165e2b92e605d0a7808ce625022baf8e0e64d12b4b3f17aefb1ca092c116a436db488a7
-EBUILD mavros_msgs-9999.ebuild 416 BLAKE2B 747835a7e4be830e3d5d60bc379a403f6be128439d5300a7028c7779bb8dc9bf5e78caf38c89ed6dfbe9d0e3638291a1fcf29bf9c5350d882520b9731f7dd323 SHA512 2d90597b901d1e691af9359e1816f5c650e784f9e45b2c92bae39393a165e2b92e605d0a7808ce625022baf8e0e64d12b4b3f17aefb1ca092c116a436db488a7
+EBUILD mavros_msgs-1.2.0.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
+EBUILD mavros_msgs-9999.ebuild 460 BLAKE2B ce4027da677ee2a46be25024daf5c835e8de20c2e03213235e6417b17b8ceb734c160a0df0af47c616e9e95678ba8094c326e6a3c09c28358bca7de099a1a603 SHA512 f1fdca8e381f9bb7b9be71d8fae20f8d52f24be3ec734ebd8dcf9ddc2b3f08a5a1fc70bcd3cae2aff6e66e013a8752806bb7cfb1971c3e8a0f1e0d8e4353b96d
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
index db94855f38ed..04710e1afb12 100644
--- a/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
@@ -6,7 +6,7 @@ CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
 
diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
index db94855f38ed..04710e1afb12 100644
--- a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
@@ -6,7 +6,7 @@ CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
 
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index 282fd29c3c51..6f0ed28d6198 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,5 +1,5 @@
 AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373
 DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
-EBUILD opencv_apps-2.0.1.ebuild 698 BLAKE2B 628b603f5756c3cf1123505d6ce8134bea5dbd4f0bb5eaae1fbf0f3c51785b666974f2c3edf6f88ee5598fd4c3b47626567a31e64a8e503363eb2d3dbe274d41 SHA512 2abd1ba9aedd48a093d52c16686e22e365f8aaa429b03022d8abb696092891be96f7b3a6fbc4b42062814fd3e553778cca97ef36cabea500f70160bcdd776123
-EBUILD opencv_apps-9999.ebuild 661 BLAKE2B 31933db199b6dbe97326749d1bd0de437bd71c5143983caf1070c93ec5e40f9166b286004ac49c0327c63c0f81eb9a712357387f01aab33f7c909e587a6afa49 SHA512 ff5880287fbfe20a32823c28e9b80f93dd3569d0b9a43d57b7da4eb18038128e9d71479ebcc5b673fb423e8b0ff288d296103174be4a8a10b4f2d2a712d201a7
+EBUILD opencv_apps-2.0.1.ebuild 885 BLAKE2B a407bfde56c9c1f14df21623f73e75a3225bdd9e44afbcb5dbcc461645932fcaaff9e24922f3a15ab4e85f11a0998458fc37d89321d3f6c4df2f8bc550a759ce SHA512 6f9a098724e48f781856621cc83fc656ad61c05176699fbd4c85fbd9a32c2930368bb955761a5147c35f4972bda574d1118137426661f221c206bd6be87c0165
+EBUILD opencv_apps-9999.ebuild 848 BLAKE2B a1a94c4a4af7f7a8ce07913ecc7bf98fb75d1e5fc7ad68159050d318e4f2edcd61f3764dc02210c1cdb8858bbe34b25e6c155ea44feb8acc8a6d4a83c5d4ba57 SHA512 c973ba5d50e0f7c175b96e1fdd959960add08504eaecf6e3b84087e09ec195ba09b4a01344844c86cf675cfad7c1073ca2be9784f58d38225bd5aaf37dc36ec0
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
index 0818e6781e5b..e6864994ac92 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
@@ -26,5 +26,15 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/roslaunch
+		dev-ros/rostest
+		dev-ros/rosbag
+		dev-ros/rosservice
+		dev-ros/rostopic
+		dev-ros/image_proc
+		dev-ros/topic_tools
+		dev-ros/compressed_image_transport
+	)
 "
 PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index 6aeb31d59bdd..bb49ddbddb1e 100644
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -26,4 +26,14 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/roslaunch
+		dev-ros/rostest
+		dev-ros/rosbag
+		dev-ros/rosservice
+		dev-ros/rostopic
+		dev-ros/image_proc
+		dev-ros/topic_tools
+		dev-ros/compressed_image_transport
+	)
 "
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 4eb2e5a432b8..5b92752dccee 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,4 +1,4 @@
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_description-1.12.4.ebuild 625 BLAKE2B 56c19e7279a7e89c444dda408ec454ec50e5c1d0b208b5d7baacd01e2d6424b16b568d0ada037f48870d536c8942c6862feb6aac059671a66e3142a2e895bddb SHA512 23f3dc1aa2541042f090a7960ee76eaf3946c124aa2afc2b76c1b318ae0d26c9cf6e2c214cd887b2ffe20236fe83d21936396fe27476d6e6c08061bdd6665b7a
-EBUILD pr2_description-9999.ebuild 625 BLAKE2B 56c19e7279a7e89c444dda408ec454ec50e5c1d0b208b5d7baacd01e2d6424b16b568d0ada037f48870d536c8942c6862feb6aac059671a66e3142a2e895bddb SHA512 23f3dc1aa2541042f090a7960ee76eaf3946c124aa2afc2b76c1b318ae0d26c9cf6e2c214cd887b2ffe20236fe83d21936396fe27476d6e6c08061bdd6665b7a
+EBUILD pr2_description-1.12.4.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
+EBUILD pr2_description-9999.ebuild 660 BLAKE2B b82c4c3ffa9f2798e7766aefae817bccf1dd574812aca03787678c6ab1130b35cb5d2bb9a0a84ee10e31cb5c6f0db256df1af43c7a31860745b83863ad83a53d SHA512 b84cdf3f3575970ce102c3088c95fcdda19ea230c1df03adfb10d1a360e169f4d25b1aa0214b1540e0113cc9ed89f0a31553e8ea5903cbed9177ad2b07ac2a9c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
index 6bdb9365260a..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
@@ -15,9 +15,15 @@ IUSE=""
 
 RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
+	test? (
+		dev-libs/urdfdom
+		dev-cpp/gtest
+		dev-ros/rosbash
+	)"
+BDEPEND="
 	dev-ros/convex_decomposition
 	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
 
 src_test() {
 	# Needed for tests to find internal launch file
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index 6bdb9365260a..6b8e630a5696 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -15,9 +15,15 @@ IUSE=""
 
 RDEPEND="dev-ros/xacro[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
+	test? (
+		dev-libs/urdfdom
+		dev-cpp/gtest
+		dev-ros/rosbash
+	)"
+BDEPEND="
 	dev-ros/convex_decomposition
 	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
+"
 
 src_test() {
 	# Needed for tests to find internal launch file
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 8f9f5fd96397..ca97091ac19e 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,6 +1,4 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD rosbag_storage-1.15.7.ebuild 654 BLAKE2B a82c0a23646c85b08d76b91d0c9455e63643828b42d96c1049552640afa986a6b047096dfa503fafaac9486b9e8b77ce08c48c2f6cf6993bf8a560bd84e1ea0c SHA512 20f8d2695ddb1078b9edd23ccdd5a9095935a414bccc4e5135259243b9d96617b7a3832cae95eab94299b798fec3aa13a2ff1b7abfe0b23278c0724d5de3b6ac
-EBUILD rosbag_storage-1.15.8.ebuild 654 BLAKE2B a82c0a23646c85b08d76b91d0c9455e63643828b42d96c1049552640afa986a6b047096dfa503fafaac9486b9e8b77ce08c48c2f6cf6993bf8a560bd84e1ea0c SHA512 20f8d2695ddb1078b9edd23ccdd5a9095935a414bccc4e5135259243b9d96617b7a3832cae95eab94299b798fec3aa13a2ff1b7abfe0b23278c0724d5de3b6ac
-EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B a82c0a23646c85b08d76b91d0c9455e63643828b42d96c1049552640afa986a6b047096dfa503fafaac9486b9e8b77ce08c48c2f6cf6993bf8a560bd84e1ea0c SHA512 20f8d2695ddb1078b9edd23ccdd5a9095935a414bccc4e5135259243b9d96617b7a3832cae95eab94299b798fec3aa13a2ff1b7abfe0b23278c0724d5de3b6ac
+EBUILD rosbag_storage-1.15.8.ebuild 735 BLAKE2B 5a13e2a2586e444846579b3e3c0134d9bda6b509b3e69a958ec74344eefe4b8a5c469c6443dc74511d1d85450d07d20e512e63a5efe8a2fa4f27be53adba28f7 SHA512 304d1b06495840c6536c20be84043fb5858b49343e1c089c0d490a802dd56033fcafeee31911b9de4e9fe3feea4686d3b36737b42a3eabc274fa4af5f960094f
+EBUILD rosbag_storage-9999.ebuild 735 BLAKE2B 5a13e2a2586e444846579b3e3c0134d9bda6b509b3e69a958ec74344eefe4b8a5c469c6443dc74511d1d85450d07d20e512e63a5efe8a2fa4f27be53adba28f7 SHA512 304d1b06495840c6536c20be84043fb5858b49343e1c089c0d490a802dd56033fcafeee31911b9de4e9fe3feea4686d3b36737b42a3eabc274fa4af5f960094f
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild
deleted file mode 100644
index 616e74d99b96..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	app-crypt/gpgme
-	dev-ros/pluginlib
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-
-	dev-libs/openssl:0=
-	app-crypt/gpgme
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild
index 616e74d99b96..d1b7808c3e42 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild
@@ -16,13 +16,14 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/console_bridge
-	app-crypt/gpgme
-	dev-ros/pluginlib
+
 	dev-ros/cpp_common
+	dev-ros/pluginlib
 	dev-ros/roscpp_serialization
 	dev-ros/roscpp_traits
 	dev-ros/rostime
 	dev-ros/roslz4
+
 	dev-libs/boost:=
 	app-arch/bzip2
 	dev-libs/console_bridge:=
@@ -31,4 +32,10 @@ RDEPEND="
 	dev-libs/openssl:0=
 	app-crypt/gpgme
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
index 616e74d99b96..d1b7808c3e42 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
@@ -16,13 +16,14 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/console_bridge
-	app-crypt/gpgme
-	dev-ros/pluginlib
+
 	dev-ros/cpp_common
+	dev-ros/pluginlib
 	dev-ros/roscpp_serialization
 	dev-ros/roscpp_traits
 	dev-ros/rostime
 	dev-ros/roslz4
+
 	dev-libs/boost:=
 	app-arch/bzip2
 	dev-libs/console_bridge:=
@@ -31,4 +32,10 @@ RDEPEND="
 	dev-libs/openssl:0=
 	app-crypt/gpgme
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 5d60d63e48fe..900773d7706d 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -4,9 +4,7 @@ AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133
 AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD roslaunch-1.15.7.ebuild 1477 BLAKE2B f3a56fb9b7a89e3910a1a524def2c8c7f702ea7992a42ce3147d1c6fc3c7254a7059c9852937080de9321e40c291abbefe6f11d660620a6727ca15818abcf990 SHA512 3405ffbb3cc77502fbe53fefd3719755180c8aab2c4382c7c7c16a40e09670d23fd6621320f34b093f08c185b89a1bfffeee26b58407b660add0a82430390802
 EBUILD roslaunch-1.15.8.ebuild 1477 BLAKE2B f3a56fb9b7a89e3910a1a524def2c8c7f702ea7992a42ce3147d1c6fc3c7254a7059c9852937080de9321e40c291abbefe6f11d660620a6727ca15818abcf990 SHA512 3405ffbb3cc77502fbe53fefd3719755180c8aab2c4382c7c7c16a40e09670d23fd6621320f34b093f08c185b89a1bfffeee26b58407b660add0a82430390802
 EBUILD roslaunch-9999.ebuild 1477 BLAKE2B f3a56fb9b7a89e3910a1a524def2c8c7f702ea7992a42ce3147d1c6fc3c7254a7059c9852937080de9321e40c291abbefe6f11d660620a6727ca15818abcf990 SHA512 3405ffbb3cc77502fbe53fefd3719755180c8aab2c4382c7c7c16a40e09670d23fd6621320f34b093f08c185b89a1bfffeee26b58407b660add0a82430390802
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.7.ebuild b/dev-ros/roslaunch/roslaunch-1.15.7.ebuild
deleted file mode 100644
index 6c3529607d8f..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-		dev-ros/test_rosmaster
-	)"
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 6a6fc3168a6e..8aa1f13ed71e 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,6 +1,4 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD rosnode-1.15.7.ebuild 569 BLAKE2B f3d9692146ba38c5f3d6a4b2403888c70a8ebfa3c345d81aeeb37dce9b3b27794c703a3588a21d7aefcf75938344d6ba02521e540e697bea3ce14fd2d74fa8c2 SHA512 cd062e2b075b16bf55ab5931db6b42bd9c0faa7a9df9e58b2eaf0cf550723a3f3fe84a2fffa54ae444b4dc464dedfe32730faa5f9a39b6b238c69ce095750bdc
-EBUILD rosnode-1.15.8.ebuild 569 BLAKE2B f3d9692146ba38c5f3d6a4b2403888c70a8ebfa3c345d81aeeb37dce9b3b27794c703a3588a21d7aefcf75938344d6ba02521e540e697bea3ce14fd2d74fa8c2 SHA512 cd062e2b075b16bf55ab5931db6b42bd9c0faa7a9df9e58b2eaf0cf550723a3f3fe84a2fffa54ae444b4dc464dedfe32730faa5f9a39b6b238c69ce095750bdc
-EBUILD rosnode-9999.ebuild 569 BLAKE2B f3d9692146ba38c5f3d6a4b2403888c70a8ebfa3c345d81aeeb37dce9b3b27794c703a3588a21d7aefcf75938344d6ba02521e540e697bea3ce14fd2d74fa8c2 SHA512 cd062e2b075b16bf55ab5931db6b42bd9c0faa7a9df9e58b2eaf0cf550723a3f3fe84a2fffa54ae444b4dc464dedfe32730faa5f9a39b6b238c69ce095750bdc
+EBUILD rosnode-1.15.8.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
+EBUILD rosnode-9999.ebuild 658 BLAKE2B e710cb82de78e27e96fd40f3b64b5f519d7330a9b717a34cc5f5f6c8af0939bdbd19a4a0d4171d775c3aa198e6dd7230f14eec2a9136ed999d190480c36a938d SHA512 f0f1f6570efb644397de72efc476af299fe6ff6c7401473890cfac3dac994c80c8c6660268da17067c868cf6ec8f8d39811067e61b0c5ff0e4e13f459fe9e06c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.15.7.ebuild b/dev-ros/rosnode/rosnode-1.15.7.ebuild
deleted file mode 100644
index c001cad5cf56..000000000000
--- a/dev-ros/rosnode/rosnode-1.15.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=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
diff --git a/dev-ros/rosnode/rosnode-1.15.8.ebuild b/dev-ros/rosnode/rosnode-1.15.8.ebuild
index c001cad5cf56..6ac973a5e5a1 100644
--- a/dev-ros/rosnode/rosnode-1.15.8.ebuild
+++ b/dev-ros/rosnode/rosnode-1.15.8.ebuild
@@ -18,6 +18,10 @@ RDEPEND="
 	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rosnode/rosnode-9999.ebuild b/dev-ros/rosnode/rosnode-9999.ebuild
index c001cad5cf56..6ac973a5e5a1 100644
--- a/dev-ros/rosnode/rosnode-9999.ebuild
+++ b/dev-ros/rosnode/rosnode-9999.ebuild
@@ -18,6 +18,10 @@ RDEPEND="
 	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest
index 3b75eb0a1f68..6dd1fb873e5e 100644
--- a/dev-ros/rospy_tutorials/Manifest
+++ b/dev-ros/rospy_tutorials/Manifest
@@ -1,4 +1,4 @@
 DIST ros_tutorials-0.10.1.tar.gz 159522 BLAKE2B b0e045c6ee62cb68dfa977d17125af23d8ef80a619e822d245531a6cb3520a4d53120769e74ae2ba9af2813ce968e0c4fb22b7655eadd13b1a720705a9f75374 SHA512 592edb84f2e0ea80b2757ae890f495e8cb93d867b1bc6d64e6446f28fcffbd48c05703ac30ac29fd184a689f465728a5958d8c747587c756b53341c1d0740684
-EBUILD rospy_tutorials-0.10.1.ebuild 609 BLAKE2B b7ddbb19e325c6e336edcaba03a3302a893f98a56b2f4c081fedd118dff972b276e4dc9074bc48db00cea17ff26f13b28161b07e6fb25c014c875d08fe6bc042 SHA512 62a9eb4c5baa3d4084c4fc118e949fdaf89f90fd19c67fb5145d70f49931e9382d973271164f1fba3858e4829f3c6f2fe32f8288ac04b28a557df45c507fe7d6
-EBUILD rospy_tutorials-9999.ebuild 609 BLAKE2B b7ddbb19e325c6e336edcaba03a3302a893f98a56b2f4c081fedd118dff972b276e4dc9074bc48db00cea17ff26f13b28161b07e6fb25c014c875d08fe6bc042 SHA512 62a9eb4c5baa3d4084c4fc118e949fdaf89f90fd19c67fb5145d70f49931e9382d973271164f1fba3858e4829f3c6f2fe32f8288ac04b28a557df45c507fe7d6
+EBUILD rospy_tutorials-0.10.1.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
+EBUILD rospy_tutorials-9999.ebuild 639 BLAKE2B 3b602a52e1c9f45918a4212621203b5a611545ae9ad60826694b52131442c1da2fe4870adec2dc1ff19caa1b42a039b2e241904abfb9d2f0804130f2420b28af SHA512 d6a94c2ed8f1d2d6946d199a15e57bb4d33fb8d13cbc8f748248750240f6b8c71d66ecd4df7f4b4f379c2a70119009f56a4d3da8bd101c54384d9c52a54cfbd5
 MISC metadata.xml 331 BLAKE2B 63203c43a194bcfe4efe5c478b8cbb8700ebc307b2312972f546ed86043374133ec6826aa6465c8c4f6c7fc94fdcc4f29c2c535d1c0bdcb1806c57ea67ebbc1e SHA512 110df3a9a1b63d8200d2c67c2671a9ca8dfdc307d54545c09f6c790e019c149e09db82a1bbbf40677ae528e0f6e12235987a21efff1d6c38e50871bbf98b477a
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
index 9977f2feee70..ecde7b0dc1db 100644
--- a/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
@@ -19,7 +19,10 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roscpp_tutorials
+	)"
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
index 9977f2feee70..ecde7b0dc1db 100644
--- a/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
+++ b/dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
@@ -19,7 +19,10 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] )"
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/roscpp_tutorials
+	)"
 
 src_test() {
 	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index a79352aa4ab5..8d3a9708f86f 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,6 +1,4 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD test_rosbag_storage-1.15.7.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
 EBUILD test_rosbag_storage-1.15.8.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
-EBUILD test_rosbag_storage-9999.ebuild 449 BLAKE2B 211dd15ae3eb1f7aac8829f7e43c60a87f2c0a9fb16deca301ebee0450171d551606cc69264eb0cf7e6ad8453a3d13815b5b29873efb600c3bea51b6eb7f8fd6 SHA512 6e599f7da72c39133a6017fd21c76833a9dde42876839133eefc641362e8c03a18f47c2e3c3c0a7b48cc49f313891fdd6f04fe69c8a11e4642efd8be3fc6805b
+EBUILD test_rosbag_storage-9999.ebuild 465 BLAKE2B 9f68320ee0d3b7e76bc344ca2ee54007efbbc9b7083aac353ce3cf94e74ac10575c79f7f2d41ae8ccdf93e03597e387151c6bdd7487c483652ed2029241ca26c SHA512 be77680f6db9f03bf414540eab944ac5598860b56eb4779e871ad917d9f7c135a2912daf6b2f27318830f1c508c4a08c53da5bf0c42d3562d7afedd2d0354e6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild
deleted file mode 100644
index 9b630af5d5f8..000000000000
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosbag_storage"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rosbag_storage
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
index 9b630af5d5f8..258d31bf3e94 100644
--- a/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
@@ -17,6 +17,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-ros/rosbag_storage
+	dev-ros/rosbag
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index f94ce929e609..535545b0bdab 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,8 +1,4 @@
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
-EBUILD xmlrpcpp-1.15.4.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
-EBUILD xmlrpcpp-1.15.7.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
-EBUILD xmlrpcpp-1.15.8.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
-EBUILD xmlrpcpp-9999.ebuild 369 BLAKE2B da4bf959669d93ae24d44dbb2cf6470d01c13e401cf592bcc800fddfca951e782af24233a6c0e034107d986d58c549d373f4422e36edc759dd1b11b2b982c3d0 SHA512 bbe65fcc0140d24d41a0d557e6d7402dc98ba2001820a99eeb44f108af452407a125a48b536151c69f917b71d30b59938e0f08dac42b566cb86425ab3787335c
+EBUILD xmlrpcpp-1.15.8.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
+EBUILD xmlrpcpp-9999.ebuild 444 BLAKE2B 11b1eda8abe7c6201faa025c584dbc21bd8dd1457932a244b23108aa3fad65fe6f5560c84ed22f8f0822b7bd1635af34faada3870d278eeeef783eca58380fc5 SHA512 8d3039c3406f21a738c324a8cd304fad351e208e9d8570a49c41e92ad2fbf1d7488caa749e53f26aebafdbdec69101c813f430866406f65425d21c42ee655035
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
deleted file mode 100644
index 605e02ba7813..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild
deleted file mode 100644
index 605e02ba7813..000000000000
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=utilities/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the XML-RPC protocol"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
index 605e02ba7813..2987c4392d5e 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
@@ -14,5 +14,13 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads]
+	)
+"
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
index 605e02ba7813..2987c4392d5e 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -14,5 +14,13 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/cpp_common"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost[threads]
+	)
+"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index dfe754995bcc..a0a26315122d 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
index 050b6f248c7e..59ebcccc15af 100644
--- a/dev-ruby/ntlm-http/Manifest
+++ b/dev-ruby/ntlm-http/Manifest
@@ -1,4 +1,4 @@
 AUX ntlm-http-0.1.1+ruby-1.9.patch 657 BLAKE2B 179668ac8377cb16485f934027dcec83faf2ad790f45b0382facc3fd25eb957a501099b346b1f9a7d1a90d96e96566cbd6307fd3868bb5702945a88da75785be SHA512 c1cf26169cfb7eb8e5759b143f49dd7eaa124cb9e22314e0d2d36c3128080e2dd85b84386ed219cd35e3022e1ba36926dff6ee603400362d8ad59bb627f3080a
 DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
-EBUILD ntlm-http-0.1.1-r2.ebuild 874 BLAKE2B 3f0d3d64befda91ad6623ee166135c8c902085b810a9d12c07f0c3fa04e01efdbc003c0f450dd5c82f02cc5aa97d270a074b54c9be464113581aa96f41c73a44 SHA512 13d025bdc53c7d8dbe8147d436db891f35a19cc8ea9c82b5dd80eb94b7fe4bf397e5e41679a417ef2c1c6b08f0851bf9b1b00796e6c6a2e9b39802e27939cb77
+EBUILD ntlm-http-0.1.1-r2.ebuild 874 BLAKE2B 6803d7cd255c5b463f521031c9529dd38e91ef58645b81f064080c414d15e63cd3cbdf639de99095af51456715a7df7aabb95a56755285817b716bed29199aff SHA512 95f7137df7a6fea8c2d148d19ac111906bda721047b1a26d71d9173342538669ee56c2740f486e35b3b65a5cb631846f387466c717ec9bf2aad6c4bf9dadcff4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
index 005ceae39aa5..bd4158cdc1ad 100644
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+++ b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.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=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 4efa99c7eb69..590b1ec533b2 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,5 +1,3 @@
-DIST omniauth-1.9.0.tar.gz 26060 BLAKE2B d0b7cd7536fc19184f56cc2b383ff70d7556d4794fb2981738216b770c340cc14025f1241a40260c0620a7bae73906c4baad1a9ce68402f0e7882128b620005d SHA512 8505fb5081f9f4daa143925b56804d81f656523c2e65c066668f2bc5c1da50cd17a06c86856e9f6560a71ee440804a536d3e814eb5dd34a0fd0c4ababe2fdadf
 DIST omniauth-1.9.1.tar.gz 26528 BLAKE2B da096ce924972c867ade4cde7e6ec90f5a7de41947f5d04ad092174baf3073ba6b235ff998551d9bbc7f6dfa2a4290eef1e1d962590591cf29f89395a554f3a9 SHA512 687ab9ad47d57d1cbe01fb7ed37754fecb3b75b7e62853070b5880ad6347a2834524a8d4042271ecd7f708ab35b7b5bd3203058ef03c3317f26f88a7639c2672
-EBUILD omniauth-1.9.0.ebuild 1231 BLAKE2B a8657a4910ed8acaa4264c31ec29638ac43fb3c6f9116ae574466931218fa02f3bc36ba2d042ba2d59748f0278108ba36158ad16ed2d6cb36f163850423fdd68 SHA512 2389d3946e7793f9e72388f5bade7affffbc1b02aa8c3a040bc6f69ba9811b5ab86692dec90fbc572e1026b080a6a72e43d820f5258f545bcf794c4ea595160d
 EBUILD omniauth-1.9.1.ebuild 1193 BLAKE2B dca25cf4c30faa152389c8a90129d97f612171366fab6918338784b89c32586b95a47645c8b37d8e168a2fac57e963579ef1e82267a4e1981447a1d6e08b954c SHA512 17c389780b47c302f48dd1cd3dfc69daf3a2106b439147f71b9017e514e576f98656dceff996c776843a5475e72c6e6e57efb987633030c532014f9c505ca48a
 MISC metadata.xml 343 BLAKE2B eca1c20d937a878552be8bffd3394dc6a5b472b87a88f1ef2a096fd2ee75fe4feb343990c8e021bcc1144b6257175e2f8119ee374b6b551ebf19bcfc7860dd9d SHA512 189a7a11a84b2fa108299499e9f867768246b34237b74029eba64a0895d5c95d39544e340c4340cf50644f602411dfad991ff460c0269f1956061641e3cba130
diff --git a/dev-ruby/omniauth/omniauth-1.9.0.ebuild b/dev-ruby/omniauth/omniauth-1.9.0.ebuild
deleted file mode 100644
index 83b0ae242f0d..000000000000
--- a/dev-ruby/omniauth/omniauth-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
-HOMEPAGE="https://github.com/intridea/omniauth"
-SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.6.2:* <dev-ruby/rack-3:*
-	>=dev-ruby/hashie-3.4.6:3 <dev-ruby/hashie-3.7.0:3"
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/rack-test )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' \
-		Rakefile ${PN}.gemspec || die "sed failed"
-	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#:' spec/helper.rb || die "sed failed"
-	# maruku fails, resorting to default markdown implementation
-	sed -i -e '/maruku/d' .yardopts || die "sed failed"
-
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die "yard failed"
-	fi
-}
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
index 49a4f5663115..44f8fe009b1e 100644
--- a/dev-ruby/openssl-ccm/Manifest
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -1,5 +1,5 @@
 DIST openssl-ccm-1.2.1.gem 24576 BLAKE2B 8fa23198b9c4c324e6306382b4e5eaefcec33ca34cf4177faad5b10ff17111864a08ca77bfc3e1f10c71b4888bcbc2ec788120b1c1a4428ced0b03a7554bdde7 SHA512 9cb2d7d0bc97b41f217f79b8488c5b4381754cf429dc07fe89bd51aea432c5eb19a1992b7bf9c7a402308949a734599f07dbf818e72550cbd584849946e4b0ba
 DIST openssl-ccm-1.2.2.gem 24576 BLAKE2B b94a205ce3b9d557ad649c0391428526339b050dd7a85633ee955b3532a94637e7c40a7cbb9bd739ff50f2922c97721e4dadf7e392c2aaaa38f35123858c01f2 SHA512 5f04af1ac65608e519fcf68259b2690f12882781cdba411939f809e1a6cb602723bf23d9cb920949e8eb7c4bfddb3e65446ae16d0276af78992de21cbfcdfc49
 EBUILD openssl-ccm-1.2.1.ebuild 496 BLAKE2B 6c692c5cded7a26a368c05450cc901aecd21583c940826f1dd27bdf117088dbe8ba6761de8a20f61810f485e90b13754f7c965a6f9370e337ff951bf6f93c83f SHA512 18e89d96765039bbd6ddbdb49bea44adc3e3784b59572d6fe243b3680360957f2b082f3f9c0bde5ee90ce3bbc3cf1a288a916fff1fe989a8ab482e8a6db18854
-EBUILD openssl-ccm-1.2.2.ebuild 493 BLAKE2B 868f0d295b031c78ebeccf47c71e99be7e7c944ce619ffd26774ea3ce646aeb901b1e223aa0ac5a5dc4d93f6c7084a010528e02b59a10c90906d17e0f1f854f9 SHA512 a3730e2b52128162e52c535c624f0e150cad68474ec1409f111caa15a1bae6033a672cd7e288d10f50980485f8a740c1058c7c29ea1f9c3f91b444a51eb8eb6d
+EBUILD openssl-ccm-1.2.2.ebuild 493 BLAKE2B 5486db1d0ab8fd75e7eec06043440ca10232808abf2f95f5cb3c248070b297ae32b8ddb7fa878811f2d4c7ef1215e16ed64bb7eb10a1408e00e483f125f87ec4 SHA512 cabff8973220f5c35eb431d37c9218729864b02685a8f628b3ed076e7f38736244cee5c83e0cf0df178f7163b3ad798291191e110441131b727a2626e54a83ed
 MISC metadata.xml 343 BLAKE2B 90d082dcbeb73687e10afe1c34641d34b6a2cf7a12b7c83daa0eef04b5e9a010096c5e63b26630a3ca8ad9c539453dedc29f0c9e8ec72c1c0b6ba13594174066 SHA512 0c3c88702d11fa68c1b3840f782559c074444a8fcc0ebf4ccf80c6014a68ee6c11431e076516bbf6df1a4364903f9c818abd38a7aebee9574c73a7c644e29ce3
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
index 388921ca3c8e..fa9c498b8873 100644
--- a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/optimist/Manifest b/dev-ruby/optimist/Manifest
index 8bad61685db9..52a797648c6e 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1,5 +1,3 @@
-DIST optimist-3.0.0.gem 29696 BLAKE2B d078a21fc95d64827e3f9a4539339ba3e3ba9f9649cb70d4e5a830f2523b02c4bb6aa1dca159a913d852aa2a320002beb6276d920ae1804bf65c9cf1535fc341 SHA512 1fcdc4dd01fb26d5b1d181913ad28314df05e60277bcf73b98e04a7463430a6c73396fb729e3cf34bc89e2eb8387d4d3294e93fcd530129a7bcd7efdcef5223f
 DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
-EBUILD optimist-3.0.0.ebuild 758 BLAKE2B 2a81c5c003c65b6c2123f2cd2f6057d0bb01b26ec89873f412a2c74db224ba8e384ef4794b21a8a1ab0c36a6e54abede7dd83c2be2435ddacc7179930b52b58a SHA512 1728d8124c62ced7e8815629f09d7e83d3b0cd4fa0956046967d3441ac8db2ccd0684e4e20d35dbd08a230206347c19eeaff946e461f39306ca0725fb235bc14
 EBUILD optimist-3.0.1.ebuild 727 BLAKE2B dee24eef9bf601701e708cef0d8849cca228fe4a946830a454c0fbdd03894cd8d9c0bf3dc467f7a02760e923ead6d5269b02941b5b3ab3d0ca3ee0fabfc9430b SHA512 db6ae6e92810a614efff55b212fdb5369920fe9a1bfb25d708c6e68329644f28e4771508bdd273e712d368ac56f8ae100c557c5745623d4953ed4e4b77d6ba18
 MISC metadata.xml 615 BLAKE2B a53d6689cb0a71ffe1bcd34437e4213114da2c79857404d084e55079125d8890d758b77f889dd9223b15f75b0cb286ae6b675d70938d901078d90072bc7fce20 SHA512 b0cedf05cb559e4673164d64d39a3523dae4bb27b33b1114bcc98da5ed550a752dae52f0882f66fd0d3a4cad1bab9619de6b3dea3148518eacb3046fa4022863
diff --git a/dev-ruby/optimist/optimist-3.0.0.ebuild b/dev-ruby/optimist/optimist-3.0.0.ebuild
deleted file mode 100644
index ee9ce245c62d..000000000000
--- a/dev-ruby/optimist/optimist-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A commandline option parser for Ruby that just gets out of your way."
-HOMEPAGE="https://manageiq.github.io/optimist/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="3"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/chronic )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundle/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
-}
diff --git a/dev-ruby/optionable/Manifest b/dev-ruby/optionable/Manifest
index d95a77d947d2..1d90c3d38c83 100644
--- a/dev-ruby/optionable/Manifest
+++ b/dev-ruby/optionable/Manifest
@@ -1,3 +1,3 @@
 DIST optionable-0.2.0.gem 9216 BLAKE2B 4d77994fc4a5b800d03f1fa675760f4755b5b0ed6ff18e79e15cb918129261a37bf09807bca504a0caba4eae8037b688933b7bf62b2770e8e451e7f4ef94980c SHA512 4c633c83cd51fb2f1771f5f842cc8024d769f644d513a8d4486c7960d2bdda81be44746a7bb4604bb458cd58c3bbb5db28cb426d25cded6098263798f7daa465
-EBUILD optionable-0.2.0.ebuild 396 BLAKE2B 1b3b69ace0ba84fb38af959132ce218bfdb4d96496ac9c489a6ee933763d12065e5c3b11545a1b79e5478bd35d975d147774d06841a43ab535ddadd25605869c SHA512 5ecedf2ee0ce94a19315affd33d36327b955784563d1ebe45d7f73305b7d5cda9cb836a1fe1ecc3c7fc05c9f9090d2d7b29f5b956613d025a5f4a31904f08487
+EBUILD optionable-0.2.0.ebuild 396 BLAKE2B dc1b27dc4ba74097e7bd65da7a6eef64d149b714f1560cac35ecb318130d5648cc0b5cae3d83963f85c08ab5e00830453c8ef5b2dc7443a9b5ac9eaf2655d148 SHA512 f3d231e5913563834cec7ba59dcf2c22268f626b712e70a7d564931829297c182970128d325aabb3e15fddb20c83d742eed5e8e79885b9320e8c59941704ae16
 MISC metadata.xml 343 BLAKE2B dadca36b1b953dffb43438426b7c4a6848636a892a5964d9777b3c4de7acb12f78b4bd9f76aaef3bd4a09c2cfe1a4579d8f656262c59c28702d753b4fff3598d SHA512 0d809b55d6aa2e967ac7b85e0222365053e0876566ddb5554561289992da0945bd143f94f3ecf75e578a497ab4c341793a26f4815159ec4c0cb91439cd05cb01
diff --git a/dev-ruby/optionable/optionable-0.2.0.ebuild b/dev-ruby/optionable/optionable-0.2.0.ebuild
index 5022ef6d17da..e172c59b8927 100644
--- a/dev-ruby/optionable/optionable-0.2.0.ebuild
+++ b/dev-ruby/optionable/optionable-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/org-ruby/Manifest b/dev-ruby/org-ruby/Manifest
index c3a74d3bd767..575905e09379 100644
--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST org-ruby-0.9.12.tar.gz 143472 BLAKE2B c90e0f664f64be0449e63d717441f3c8aac9957c3b892392c8425847ea42dd23e3b7a598f57969432601ba9c6208633c7aa6e101a4684db2f68c07511bcb0458 SHA512 040c7bc9d9727fcec9bbd7ed4994ca489121c103d58242f98d340b4149f94cb97fc0bbc670bbd5dfba5a11de53930b579a33b6b1ffa343c7f2602674ec65aa07
-EBUILD org-ruby-0.9.12.ebuild 835 BLAKE2B 6dbee9c8e3e2e803dd6940524e4dec0788eae07e987231c76994828a24a89c3a7523a42cfe27b204ba571f64d41b855a379274c23bec2d114d8a1f2d726d1240 SHA512 f3af164f73edde3ecd40171f1c4b326a036b677687a5581c55ff263a0bc4fbb6a5eb8ee2a0fdf4e8d0171760b8c853825a960931f022af9ee202d309ddddd427
+EBUILD org-ruby-0.9.12.ebuild 835 BLAKE2B 1148ad5a9a01d53a23f973a2659acf2196912e9a6c89b44a71b278f7cdb9629df34d2b83c9a351a365079a90aafb266b398436a0d04d78c7da60315c125da699 SHA512 78a87a234af2c8562ff12c355aac63f6d271f35431d2db6daa63671c446bad0b57bb601a99533b4e6acf00de06c1f42cb58b050f699900fc16ef1834127c39cf
 MISC metadata.xml 342 BLAKE2B 84af0d7e7af39798323a672b3318def4306872b215b8ca84b5f44bb74109ef1f82bfe81dc366cf55db1d54e33bcb414b1d70ed0938ac0e5a1194335fcae06c3c SHA512 427978e7f1422a295b8f7115f57b6a432c5ffb5d5d8671082298b3a52c8f175fa63de13d2a3dfcf59b506f6407cea0e6e9a1b54e2de4b1b2bb7337dfb07c90e4
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
index 67e280f6fe86..a621a6a19130 100644
--- a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index 1ba67cf6c404..d6134a767880 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,7 +1,3 @@
-DIST paint-2.1.0.tar.gz 21894 BLAKE2B f67302d32e81a0e259e6ddc25afd945abe93b9dd921a3ed93271f1aeadf7ed0697c1f79869985e7714ac588f37e9e9d35564dd22baf4d909f59bf9adcc3354a3 SHA512 0de206c78c678d77cfdff0f26e42f2a045fc98a982943f7104d11e47cd4db9b196dba6a14eb09d98c103b3b70e13b84e48fe6261d2b03a9a0f4d4f10037a39cb
-DIST paint-2.1.1.tar.gz 21939 BLAKE2B 32e0334e7119e58577214438e1274fc283a90ed748daba7a76dc9e82370a6d6c2f705c33afb1ba241b4a19b049d11ccfe97b497c936eb9f47f234aad1758dc85 SHA512 6f3a889b05a9227666c38005ae7af149b1edf7db4bad2aa9bd710444119b7b219bb316f6337f7fbea4b05ef4e8b292a62c372cc10cd99febed03cdc6fd61572d
 DIST paint-2.2.0.tar.gz 22107 BLAKE2B 4f1e978023cd6edb371ae7315cc48451f3a911522f0d39b7dea264d8d112a6db4560507c33fdc55e247b782f30cd8b844d6c790ce86194c151acc7c2abc7f9c9 SHA512 67f9752d270ff8cd2706318a16b3b3980515bd07a55a2b8900eb79b200d6da87993185c839748052457536b82d53694bba33c0f64d8ada50b61a34c9985ba009
-EBUILD paint-2.1.0.ebuild 521 BLAKE2B 0cbb24950a2109e09429009ddc74721c3ed01d95771541cb9d7fa3262c007605ea660569ac47025bad3e9eea8c52ed3e95fb23787a4c76bde21395612e988620 SHA512 85dd8bc1661c67edf1161d587422d61e14f8727be37e912f93d77760c781e8d432631601022c64bd94946263b076a08aa968eaec7009f92dcf91de0ab6071235
-EBUILD paint-2.1.1.ebuild 519 BLAKE2B e07261a2873e60eaf61d18b2252e945582249cfe30ffd41b2d4682e4148df3dd229e2b939b36145f23cfe91dc16e9fa549ef59135e5f270126945ea124d760f3 SHA512 06a52bfd5bea2141d788084d7de1a7dc9efa4158f6a5e1d79b63b202029036036a4be48007fd67a9fbf8dd3675ab056ec54ccbcc12375692ceb84589d1931bd2
 EBUILD paint-2.2.0.ebuild 526 BLAKE2B 4e820307b79085ec23ebaaa25e01f86422d2ddedad42d7ff07eb453a44bb53503931bdb99f7e4c31b1e157c09a2aa1d798bd08467de98f1b459f814770360e2d SHA512 65f26763d055a39434e392da36a12a8563a008120a21d1bed23f78a9e095290b333bd033921424708b12bd0dbf3ef809468417306bc1170b89c1e13c56aedf72
 MISC metadata.xml 340 BLAKE2B 732eb269ab350d7a6a922cb7bcfde4e68f7c7bd89b857a44719fcbc3e8ad72e35be71aaa9badc3a438e6f7ca2eb82cfd6bdc70cfcbea5a277f64e6ed0439270c SHA512 da77f9b9bc4d1f82a8c0934106888bc66e3e53cc30123ccd3fc7c74c19c514547e4159f5ad0a7dedc850da19c7fa86e6f0978c1fb0493feda9a3220f385a4a65
diff --git a/dev-ruby/paint/paint-2.1.0.ebuild b/dev-ruby/paint/paint-2.1.0.ebuild
deleted file mode 100644
index ab4a0db2f6c8..000000000000
--- a/dev-ruby/paint/paint-2.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal painter"
-HOMEPAGE="https://github.com/janlelis/paint"
-SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
diff --git a/dev-ruby/paint/paint-2.1.1.ebuild b/dev-ruby/paint/paint-2.1.1.ebuild
deleted file mode 100644
index ec09b1d5975b..000000000000
--- a/dev-ruby/paint/paint-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
-
-RUBY_FAKEGEM_GEMSPEC=paint.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal painter"
-HOMEPAGE="https://github.com/janlelis/paint"
-SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index 41c7c449169f..b96f721b0219 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,3 +1,3 @@
 DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
-EBUILD paramesan-0.1.1.ebuild 694 BLAKE2B ac2687f5455409c382846136032436b7899b0ff8b90fb97e2ea8bf6ace7f47437d351a14190eadb47ba4b264e519c03df6a088ccb35f35e93819120810220e9a SHA512 72d3e3a1de49a322dbd3578e7e8100aa29dd5c5c90654d7e6316c9db36eb6682af87bd8f8ec388943f01482de94d7ab87da0b830d905f7fb94f854b3fce34fc8
+EBUILD paramesan-0.1.1.ebuild 694 BLAKE2B 5fef784f26fb8f0d9393e34ab78f10fa350ab68584efb71940509af9b7700e2e6e3f9ea1ad8e43908421a7f905ec438d08477e2c7928eb3966f37db385bf781f SHA512 92df728806b398d36fc3228dc3efc98211a718474f56459e64fb4c610d3759b18da835493e299bb8ae20e7b425c20d803079298eeded6bf95fc832f3ea13ba2b
 MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
index 0c42565d823e..2339e07e4fdc 100644
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index b5c51362a6ff..160026def942 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,5 +1,5 @@
 DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
 DIST pcaprub-0.13.0.gem 36864 BLAKE2B 0a0ca07da261de2e8bd7aaa131bbda9f6ee3cd5eb5fa214c552179c707d20345bcedc8db5d49590e69c41220e69f93a6d9f0b1c1b6f768c25ab648d50dead388 SHA512 6099996cca317194582a50ac89769d11ba802a9658c67f707e342b3c345bcaab26fba5ca2dc245a39eeb01f9ff6fdde1ae64a3a1ee4dd0e5243bae2ebed37e5f
 EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
-EBUILD pcaprub-0.13.0.ebuild 750 BLAKE2B 426b4baee41bd1577ebae6ab078165388f0b09a927ed2fdb05cbe827d2a4388f90d6066d0aaaddf03ab4c394795d7d3304639ad3f19e881371ce82a5942cb4e5 SHA512 5c85cb27591b0170375a7ac65cd01369d7d7a404cc15eb724cb7a7ca2c12ece9208ac0096f905648f4cbf60d74be99681630dc47fb2aa1432ddeb3a060cc8715
+EBUILD pcaprub-0.13.0.ebuild 750 BLAKE2B b8f22a42566584aac53a17eea9e227b12f9001d2361a85d54a9aafc1e7fe2d458d5ea89b93500291fc18bed00e8966cf2da597be37395f28084e7a7cf678f434 SHA512 04bca9c2e233ba6d85e99ac20d048171d370c4fac3b35bcae4ad044cab46f61d3c8ab607880acd0b41fb7aaf12806c0bc5f70515b70b65bff7ed851298d54da2
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild b/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
index 77eb258180f0..4946aa12431c 100644
--- a/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
+++ b/dev-ruby/pcaprub/pcaprub-0.13.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=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
diff --git a/dev-ruby/permutation/Manifest b/dev-ruby/permutation/Manifest
index c72889cabe94..06ba7a66174d 100644
--- a/dev-ruby/permutation/Manifest
+++ b/dev-ruby/permutation/Manifest
@@ -1,3 +1,3 @@
 DIST permutation-0.1.8.gem 18432 BLAKE2B 719d2c8c3006d821e69a5540a387f5e783aa0b9270bc650110171ad7d049835d4317deec68535dd9d1119259272867d6abffe97aabb9daa6c55b1d367da4bbd8 SHA512 78f9679a652d3f18ea4b459aeeceb3e25c912e28b7d9052c523b930e94e841fa84daa329f9ff06a23456cd7ab826f18cea181b85dfcfecbf303747990fa9a582
-EBUILD permutation-0.1.8-r1.ebuild 525 BLAKE2B 6ea3f26f496191e5e7ea04e96421e116d564ebd010526e7ce220abb8364b8117f2add5d890f642b25b762b0ac9a2150bc245c6ba6403ba2cbfb85e934324f37e SHA512 487615c629ed36202c9e443d5180e8f5ee6d92001cccbb5cc88f416b3c9176e7222f2fdc02ff0d0a2b7ae11409ba4e6875c868a5c352f16bd9f13a59baf0a876
+EBUILD permutation-0.1.8-r1.ebuild 525 BLAKE2B 5269a3b375d143adfcb58d7291a590519b9eca9aaea4d8c260cb8419c74b3b5e5594a2257eb3b5f28f953be3e9248fe03d26de2ab68cfbb4816aa7b5a064f0cf SHA512 1a076a0176345f2542f6b73ab7b4515d1b4bd9d786a8f108f5711657c4be9d4127d7e29905f7af445423730dd7710481fcb21efdee65c3517ec8cfcf83779726
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
index 605ec839f5a8..e46af63003e1 100644
--- a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
+++ b/dev-ruby/permutation/permutation-0.1.8-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=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index cb05de308cce..bec311299201 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/bibtex2html/Manifest b/dev-tex/bibtex2html/Manifest
index f2eece8b2697..1ece342a192b 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -1,6 +1,4 @@
 AUX bibtex2html-1.88-destdir.patch 1401 BLAKE2B 4b3e1e61a20be3820c2ce9380f086206d62b246c200b7bdbdf40a539f192fd3c32c7689538c2b1e334fc191d42072cb6ba643171f7022a5764be73c8aeba834e SHA512 34a3f53f08a133f16987cdee2a87a13d767b9b83228996999fc5ee6726a7c99602a3865c6dfbd03ede014dfcada9cc4882e802eff7939083e7c110f1cf0e07e9
-DIST bibtex2html-1.98.tar.gz 92719 BLAKE2B d9846c1ee03c7f003fe9acf586a0833715f8fc0a675ca4d3d2b2f070206aa81112ce5de1ce84c17fad4f3f5b5972bc6820b67428c73c56709875b2574b03cf19 SHA512 7d8480ed87bef74a1e0c970446fba4d30b103df3e78f127a051efff875032ac7f52d3d6baab0c6a2fc67ca11f3d558d7be4439311934f99067993b5891ff6ad4
 DIST bibtex2html-1.99.tar.gz 93073 BLAKE2B 9cf7f98f9f8ef6f82bd54554482ac8130e88b98e845a6b66a52f7c6bfac326136d3c04b60801f4b1e607818bc0516f9ff75e206e31c531ce7a36217534a40d4a SHA512 70f7465bd51ad3ddb40297edd7b50732088d150692f53f33b2dff276a8d223d972f0935f30fc731fdb3bc693275743420eb0d670109054c1e170fbb49015bbeb
-EBUILD bibtex2html-1.98.ebuild 1237 BLAKE2B 40729b1025b9d3bd7521f13ea0ae48051ea3be45ec469d053ea816205e06caa0a0750e5902c87d759a87b344625fb61c293905a9a1bf800c5c6f115d1e25f5ef SHA512 748ae2c9467d0f115408b539765fba79de2a30cd511984e5db26d6d8aa4aec7d6364a3961626de3c8c628b5be5e7108d6ea209c195416f4a8816b00f6333dae8
 EBUILD bibtex2html-1.99.ebuild 1234 BLAKE2B 24a71f9c6de7200c78a732a1ae37151a3b41c0bc9d55c0040c631550a8afa97b509720c32776e02b6af785e96c4474cff4703976b13caa267a7493385dcc7daa SHA512 dd2973a3bca2c773df208ea01f2bc9fc10fa254c1c63dfa2fa7bf99d6676eac0fbb146802e24ae3a309da2ead8dc07bf866aba01ab47f43cc8ea40451be79d3c
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild b/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
deleted file mode 100644
index 40fff567480f..000000000000
--- a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-IUSE="doc +ocamlopt"
-
-DESCRIPTION="A bibtex to HTML converter"
-SRC_URI="https://www.lri.fr/~filliatr/ftp/bibtex2html/${P}.tar.gz"
-HOMEPAGE="https://www.lri.fr/~filliatr/bibtex2html/"
-
-SLOT="0"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-RESTRICT="test"
-
-# With use doc we need a latex compiler to generate manual.pdf
-# hevea is used for manual.html
-# manual.tex needs fullpage.sty
-DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]
-	doc? ( virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-tex/hevea )"
-# We need tex-base for bibtex but also some bibtex styles, so we use latex-base
-RDEPEND="virtual/latex-base"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.88-destdir.patch"
-	# Avoid pre-stripped files
-	sed -i -e "s/strip/true/" Makefile.in
-	# For make install
-	use ocamlopt || sed -i 's/= opt /= noopt /' Makefile.in
-}
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	if use ocamlopt ; then
-		emake opt
-	else
-		emake byte
-	fi
-	if use doc; then
-		emake doc
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README CHANGES
-	if use doc; then
-		dodoc manual.pdf
-		dohtml manual.html
-	fi
-}
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 2bc1e79bb847..f74e4dadf119 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -10,5 +10,5 @@ AUX latex2html-tests.patch 1052 BLAKE2B 7f8e2f08d0f0dc102a08837333bfef91610075c3
 DIST latex2html-2015.tar.gz 1217699 BLAKE2B e9daea005b7674ebb6a8c5902b77b609a633515b4127a2b3fe4d1b15bc2428c02ccc024df62545d5fe63e7034ad4b1532905fee97057d49730ec27f12913c55e SHA512 dd031944250efd28691edeba5e83b4c5c0deec3a2e7c2ab2a9bd285a911f6ab21a02cd0ef697bebc2c7c7c0ebd285493c1d6b01b0db9355fc7f3316a2af65e2c
 DIST latex2html-2017.2.tar.gz 1131438 BLAKE2B 0a13cca95e1f7d8a9fd7d6b077726e083a6d33fbc712b883be46d57fbdea91d1d02a2a2f1990c5827cf2a4b9db18033f41f326af0a69770988bf4ff5e53a010a SHA512 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
 EBUILD latex2html-2015.ebuild 2201 BLAKE2B eb029f4ed6a270a451bf30d27390965034bec92509b4aaf7ed4fe929c2c0ddaf7ade5d6adba004e7fa8e13817f7342a04dc59dca64dd61bbfed057fac45d136b SHA512 b4ae674c731fd638cbfe1feaa436e27754a80c2b0a8b3dce71d45bb681cb866283a9b7b8573ce401f95a5ebae50da09989c578cd7de756788caea3d7edef6cf0
-EBUILD latex2html-2017.2-r2.ebuild 2143 BLAKE2B 734e331ff240980a220b2f1de88b41bfb6bd92016b81fa215e57a6e7aab7cd01701374a7c6dffb7b61ad39b5e0a7dafaa59ec3e0387adb6079539c049543576f SHA512 cbb8382b12a75dbb102f95651dc58cfc532a5996ca6f5fb5ce0c84c55d45eddbca151cb78ba6dbc8bec52cee36e3d495f6e4f6acfdbce2d80d2bf4693d5f81df
+EBUILD latex2html-2017.2-r2.ebuild 2140 BLAKE2B 80ce59f9d8d0de4d586ac8ac24e70f831c76d530bd30232018ebcdcb1f6369b1e90c179c86d8be51d31a5bb4a3b635fa31804b29137184a067f63a22232685b1 SHA512 5f99d022e1e057cfb1ad48621d95be907d2b236403fd696bb3eba76d7e5a4db16cc7eaebf65745e6020ea51bbaa62eb845fbd19bae3c331f36433a896a0acb7a
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
index 5c8fe048f6a7..df75abfde465 100644
--- a/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2017.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://mirrors.ctan.org/support/latex2html/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="app-text/ghostscript-gpl
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7d6fcabf223c..71b09368a4ad 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
deleted file mode 100644
index 2bbb495fb6a0..000000000000
--- a/dev-util/cargo-tree/Manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST cargo-tree-0.29.0.crate 15619 BLAKE2B abd9d41da47b206f96a639f40c6862a934116241ace4592952e1614e37329f5f1aa67bf3c56aa7338394e1db1f3cc8f97ff110386e5d6c49c68fd2077debcf1f SHA512 a992bb5f23023dbeefe07748c1000a792203766e01546f952da301f25817f19222339fa6d2d7b85c379bd5aeb4125445219ddb45bc8882d9eac967583d515889
-DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
-DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0ff8929d49b00d5497e4fb28cc62c2fe34704b75f55fea416339be6c7417545a23b085d33af74b0ec31378edf2b0 SHA512 670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b
-DIST proc-macro-error-0.4.5.crate 12857 BLAKE2B 5576aa42ffe73c552664e298340fd190deb7f3a8b0481cd40789bd90b2e772c326db7727df317a7995f429522b1fd9fc20e7ec5d6f4741c5dc2db557ed1b628e SHA512 507e3e2b22a4bd9baf24b8a8a943047785a658b75106679db58d51b053c06b631e4eabbc378ec20df7c77a4d9fd4b1e2a90676c710c9c3765fc76098c6585bc8
-DIST proc-macro-error-attr-0.4.5.crate 6810 BLAKE2B e0f675c886437a165b1ee6e6752d0845c2ebdcf233090d0627663bf188a5479f2b37f5f181a3c702a273fbacf380d43fbdc1debc1f9296f590e86a15476771c1 SHA512 cede66772326cc70e131ce9cdcf69f9837b1a4f306df54635a417ed0be5ae586e57c0b58b360d1bb4f8096cb9d1a6f040ceed64f2e4e103f5d61c0494562a94f
-DIST proc-macro2-1.0.8.crate 35657 BLAKE2B 6f53919e85028b6ca2f1d04feb7daf9bf9c2f76273ee8813d9b09807585a1da81687b880b2f23109998332bd7f5d3798d83094042a44de66413a2cebcd60a2c8 SHA512 0214a1268a733872ef1fa59ab80a1cb9ed8f160b9f3751cd70cb26c0919bb3858e63c994163c727f7c7486067ebc681017fb452d51fa314e7da90ca120892254
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rustversion-1.0.2.crate 12264 BLAKE2B 52028178251461506f66cc1e259159e0102791f22ba8b87d17a004d8b9c2e8f2956aac314d6344b858ab1c90f1d02f07896a1b3e55decb88adb15c4e4d4da075 SHA512 79e6cb23a866ecbb6024837d840169473434d21f0cd7c3536c52d17f511fb13077e4ed6566a5a8f67d087c52682b1ab7605e02b2162211c758344881f8ade60a
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
-DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
-DIST serde_json-1.0.45.crate 71931 BLAKE2B 8d04547eb2564ed83443e79de0ad15dfb214b3020731e797d6a1364830b51640d2a67a1445955769c1db84a3dd6c0f59c31131b8746cedb8834a383fd8972fac SHA512 73c72e21eea82fb4103fcd7da43135aab7821d9d42ac9f0bf217c2dce0607e0283d29d10429edf7a4150b3fd473b2260a1be883ff8dadeca729cb7d73184ad1e
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.8.crate 50127 BLAKE2B b6121e30ca074300328f4b779814c02a67c19aa59df508971f26da15b5e52ac05e2d3ff8f5ebb61bf41cf48dcd60ac40130a45ec98306e3f825096a4aab17ca9 SHA512 194758e3eb924adcdd5ac89f74ec114aefd8008e507efe6406584452e0d80f7a5603619c9fbf920e072bbdcf8dcc602b58eb2a7230f28691021d6d7d9b21163d
-DIST structopt-derive-0.4.1.crate 19598 BLAKE2B 5d0fd2e2d1c2501b65fec0b6a8f54969d0665acc2a26625bfb584b026451055adf58bc3afbc72a2aa54195a9f50292f3076dbe715ac42731484998ad396841e0 SHA512 366bee6d9dd40243d3641f428dfcf60d0207b3ce5d2d201ed990d40deece6f618c041104df4d7bb80cb5155bfb0f6022c357801bf32bc2f6848fc09269a1a6a2
-DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
-DIST syn-mid-0.4.0.crate 13226 BLAKE2B d300be7f32c6f7db6fcc4967264de79272a69e370fc4286483128fc3473d635d4d690031f8b682f29abca0ce154aca3fa981a1950419423085d4a33dece9e962 SHA512 65351a6493c2906251eccc27ce9e262caf0dac16fce95454898190958961015f65c6f08443c46aae76d378d61d72d17c267dfc013ca5306cb229d751a2b0bcce
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cargo-tree-0.29.0-r1.ebuild 1226 BLAKE2B 92088ae4b32cc7e56b0e72421ad5bee004569de43446364653cba906ec8e253df8a417fa5085dd98cd186256b9f39acc8978635b7321027e5e2f0fd8f36faa4c SHA512 97a6b83ee1cb0b8d7e9e1093c0885f4ab5d0e2344938bc6d7ea0bd47d2367ab5f596800f00d2394d7dd5fc94c2d866c10dbd2eb5f0ecd7256e588fc770460da0
-MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild b/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild
deleted file mode 100644
index 306f92a38838..000000000000
--- a/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-anyhow-1.0.26
-atty-0.2.14
-bitflags-1.2.1
-cargo-tree-0.29.0
-cargo_metadata-0.9.1
-clap-2.33.0
-fixedbitset-0.1.9
-heck-0.3.1
-hermit-abi-0.1.6
-itoa-0.4.5
-lazy_static-1.4.0
-libc-0.2.66
-ordermap-0.3.5
-petgraph-0.4.13
-proc-macro-error-0.4.5
-proc-macro-error-attr-0.4.5
-proc-macro2-1.0.8
-quote-1.0.2
-rustversion-1.0.2
-ryu-1.0.2
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.45
-strsim-0.8.0
-structopt-0.3.8
-structopt-derive-0.4.1
-syn-1.0.14
-syn-mid-0.4.0
-textwrap-0.11.0
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
-HOMEPAGE="https://github.com/sfackler/cargo-tree"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-BDEPEND=""
-RDEPEND="<virtual/rust-1.44.0"
-DEPEND=""
-
-QA_FLAGS_IGNORED="usr/bin/cargo-tree"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/dev-util/cargo-tree/metadata.xml b/dev-util/cargo-tree/metadata.xml
deleted file mode 100644
index 841547e2c570..000000000000
--- a/dev-util/cargo-tree/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="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sfackler/cargo-tree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 075c61a047c9..045583b097ce 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,7 +4,7 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
-EBUILD ccache-3.7.10.ebuild 1526 BLAKE2B a306411f4ceb5f7b9f80559bea6f99a0b1345de7761bdf08b6891b2c072e0c459d88950b516f1fba842e85e8714b4ffec234dee0550305048a84c31206c4859b SHA512 62f4ea791b6959df1f188c61e79283329e60ad89aa302a5c2291715b320cf079c567666642eaebba7a767d4806eba6f1a8f05d6faf40387912977ab5f9140d6d
+EBUILD ccache-3.7.10.ebuild 1524 BLAKE2B 8e7f9923593f8b77c4c2a5a949d2bcd2e63530418d47c19f85ebef7f0486f7967f0af70b5a7e14855ccb3dc79b9519dd0ba13d2a389b6fa0c36d4f271d7896db SHA512 16dd3b770650bc7138ac94012288a7e99eecf0097b5cfba18d9f4c7da7f8aca75d338e47a40b8c0d313b5880c58a83e08effb5bd131eb61e28fb6b95ba940e40
 EBUILD ccache-3.7.11.ebuild 1539 BLAKE2B e91c5bc26064d9884bc7c12a40892f20320a1c1243c2c67e7afb439ea3fe545f0d28029039613945dbb1036ba4c8aabce871cf2e422814d15a7513b03b4d053d SHA512 45ae781ea44ac085adf7da580753fdd8e7f196ff3327b772884b65b041c92806259e2981f0e77eb34cc38d3a5c8d4b7816faf1109e3a8acf11edde00990d6f32
 EBUILD ccache-3.7.9.ebuild 1419 BLAKE2B 6f248e8069578a8fd82ff7c425978c3656d45943e77c611d663cb3d63ca3ac526cba14d410dc3a3a5f46a140733d8fefc0b7580504b9008fc97c963c47669ce9 SHA512 c218ae20057eebf4242b51c5b3fa4dd6e3e9bc43428d4ecdff197773c80a6967c81e3df246c298c89cb028dff9caeba6c190e897bc60cc772445d43519444c0e
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
index 0321cd7ad302..487f4872f444 100644
--- a/dev-util/ccache/ccache-3.7.10.ebuild
+++ b/dev-util/ccache/ccache-3.7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index adab716cf2a5..c4249ea53356 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,12 +18,14 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
-DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
+DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.0.tar.gz 8970116 BLAKE2B 3eba331eaa6b1d85baa5898836fc6106f2b5fcb10af85121806c429f41d09d4fde49bf87ef833c0e538ae5ccdf994e9cc86efa39b571ebcd429459ea37205c66 SHA512 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d
+DIST cmake-3.18.1.tar.gz 8969366 BLAKE2B e5a06cf10fbd8ab2e300a0822bf94943acc48f6632a34471d361c9bc4bdfc952b7b3c4adc969712f84c4b7185f11c2393753a6313b3efbc6edc348ad634662af SHA512 e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B 8bbcabb94f033e35c3c6436d7c53a08901bfa102e2b1d8dc57a090e7bc7a68c9cbcd80c1e758540282b2d03d6a3e72f54e35cea0c37cb905a648b1daafe370f5 SHA512 7d1462f3281e275fefea2f5983ade92ba3436981d652be57861bcac44f2b6b6e42e8da900574347cf76df123e4a6da37b5e3d94d06fa514ee3b91d32d9916675
-EBUILD cmake-3.17.2.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
 EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
+EBUILD cmake-3.17.4.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
 EBUILD cmake-3.18.0.ebuild 5924 BLAKE2B 12d903077c7ba2fbe51337577e033f8e7d41387ae34f063639926f315d6929b7b5120038a04a39939b48931dd5ccd5edee7dcd58835d79f330c20fa257acf177 SHA512 5f7e6ef952211e89e2a1a8d727d64d26146e27ccd8e4554d83a3a6bfed1e75a3ae32c2ff3d6c2c9265fdaf43edbf91db0bb99d8ced3952e3fcaaf1a6f5c926a0
+EBUILD cmake-3.18.1.ebuild 5924 BLAKE2B 12d903077c7ba2fbe51337577e033f8e7d41387ae34f063639926f315d6929b7b5120038a04a39939b48931dd5ccd5edee7dcd58835d79f330c20fa257acf177 SHA512 5f7e6ef952211e89e2a1a8d727d64d26146e27ccd8e4554d83a3a6bfed1e75a3ae32c2ff3d6c2c9265fdaf43edbf91db0bb99d8ced3952e3fcaaf1a6f5c926a0
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.17.2.ebuild b/dev-util/cmake/cmake-3.17.4.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.17.2.ebuild
rename to dev-util/cmake/cmake-3.17.4.ebuild
diff --git a/dev-util/cmake/cmake-3.18.1.ebuild b/dev-util/cmake/cmake-3.18.1.ebuild
new file mode 100644
index 000000000000..c95cd8652c83
--- /dev/null
+++ b/dev-util/cmake/cmake-3.18.1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 16e8fd0fd592..78e2eb85801a 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,5 @@
 DIST rpm-4.15.0.tar.bz2 4205632 BLAKE2B 3e9701582e82d4164a21374df78c7a9ab3ca4f9aeafc13706fd0aa27782a34d2a732d7ae9659589abc9f9b8a48ce5c2cdbbea72c46768f1baba28ded26817e5b SHA512 bca9cc9ef0ad53fa5cd257c29a0a0b9447956afe4024835f5416b13926bc8bbaf8aacd481e721b4a28983bc57f98b75b91750d39dd72de4876efa9d6db53a26c
 DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e SHA512 6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767
 EBUILD debugedit-4.15.0.ebuild 1758 BLAKE2B b908d7f51d74fec0fcaefdbc7ae69e134a646a587254baa1fa91c09036bf0aef2393d9fe377a9df8c92221de5a6fd7970fa54d6d8b24b080b9181d3f4caf68c8 SHA512 4e6b42bbd97d9c8d4b1d97bccc81877de702dab2e81293cf4fc87299b10063962007f9a459224fe1ce3257d7ec15e07e23650dfbbe9165e4afd86d981122c8a1
-EBUILD debugedit-4.15.1.ebuild 1763 BLAKE2B 85fbcf14a35453749f97ae6dc3b2cd83a255f416c2adec7a87e4285ff283c084642789ed7d23a7dcd34ce5f2090bdfddc2f2f44f0d12c4c918c9a4cd397254be SHA512 c2c5937bdeaabbb2765abeb3c9ea74f4ff37d5ee1ad10121a8fcf37cffc8c0d236cb9b573e7331979eaf0745827dd5c71f269a53ae03d44d2b9c0b42181bcc44
+EBUILD debugedit-4.15.1.ebuild 1760 BLAKE2B e39bb09707b24801c2ffabb404f35a1b501b78c39c3b5f2d4ffbae932d1eb08cf194e11a11d48c8c344ff1dfba36cb3b1028201dba02fcef73f37780eb59a6b5 SHA512 d4461b4d5a88cee41904021f9a726fa3005e79c64c3dc6931467cc1d97fff119476bd24f290c6e33d69bf1dc7576ac560f54764705802bbd55cb95332b8a469f
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.15.1.ebuild b/dev-util/debugedit/debugedit-4.15.1.ebuild
index dac8e1b8e5a2..5fee04d0c907 100644
--- a/dev-util/debugedit/debugedit-4.15.1.ebuild
+++ b/dev-util/debugedit/debugedit-4.15.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c628fc0f93d4..ffc1fb56c12d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-153.tar.gz 1571168 BLAKE2B 3fea8884d733b947c629f2797c2f3f27e41233494e4e930bf4913f444d5dbd815478f7acd7f714e30ec711c23a7cfe41191e4edee0e08edbd583953397a4d9de SHA512 500f866cfd0d0a5adfff3d98be68fa4d52c1f438668b5dbd30f40913523de069e7b53bfae3ece854b22e4860c56e4359240e92419b3b2a7a1981dac9358a3876
-EBUILD diffoscope-153.ebuild 2163 BLAKE2B 88207ca0255db290234a0277f9b397c9bb51e0f396b20d00eab02c26e65ded45d2c0ead5fdc037e722185dad8867775b9d09c1c46f8909ce80f23c636d6f2bb8 SHA512 bc4d0162e2cd56179b6363477ac024dbddc006c3820fef1a2f9aca097dfd85ee3da0728f423975f49f3dd7ec508681ca2b5723cba2ecec42349f2be7a92d7aec
+DIST diffoscope-154.tar.gz 1571220 BLAKE2B 84b7a282180b4f8d3b374dac8e3514b3bb7d3fda3b40db757dad98e011112174da27a35243bd9b23f2b905ea59dc8c9a85d9cef6d436d9c705ca57b379dfb7b4 SHA512 f3a21deb9542c7ec7fc9929685d57ef97739d86f8e5227e212aaf3984a53df88f3224b2f4ba6254fde76f1858cbae83fea138e3c914a47625a62c6e6607ed28f
+EBUILD diffoscope-154.ebuild 2163 BLAKE2B 88207ca0255db290234a0277f9b397c9bb51e0f396b20d00eab02c26e65ded45d2c0ead5fdc037e722185dad8867775b9d09c1c46f8909ce80f23c636d6f2bb8 SHA512 bc4d0162e2cd56179b6363477ac024dbddc006c3820fef1a2f9aca097dfd85ee3da0728f423975f49f3dd7ec508681ca2b5723cba2ecec42349f2be7a92d7aec
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-153.ebuild b/dev-util/diffoscope/diffoscope-154.ebuild
similarity index 100%
rename from dev-util/diffoscope/diffoscope-153.ebuild
rename to dev-util/diffoscope/diffoscope-154.ebuild
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index eb73e31533b8..42c302de6522 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,15 +1,5 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-AUX dwarves-1.16-no-libebl.patch 3974 BLAKE2B 88a5170bfed028cf7919ac010112ad21124a994e364af71f5124263b73c0aec00e7c75f73dd26255534a794065e1b17f15b8f27b566cf77a2a7aaf0832760f98 SHA512 9925c01104ccd0f5abc17488673a51b2a674751117a615a87f5b8efd1b6670bc778a5590e6a55e65cb6219d8521040b266b2dc63a31bf9618302e695a815cd71
-DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
-DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
-DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
-DIST dwarves-1.16.tar.xz 273060 BLAKE2B a4cd976ff1cf6af0e2848a337400f4b1961ec5aff528d1c5893053967c0d1e7fc77de8220ae67c4b8a3eb387b659fbfd72113b29b2bf6a20d1fc45a59008a3e0 SHA512 6d57b26db70736353d8797d1f7d68c7c73b6df3ae69eb66dd7cb07d6b50a26c4f2adaa576a8915a4a7f8c41b67dcebbfc8cbdf3ba507dbf941f63941b13d65b1
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-EBUILD dwarves-1.12.ebuild 1062 BLAKE2B 2e436733a3e3525194482c9f2d2d0327a51a1b6b49454dfce06769e01546eca86ff2f603e78fc0c4ebf1a000eacca8d0e86dd4b30db062ceee22303d75ca2422 SHA512 cbd4523e3135ad2d3b5336ecf970af7a7172f67e2b9a0f17919403d66f536a63654fd623ed37fbb200e2431c7af661181ce5270c4e61763fde7753991c1e9f68
-EBUILD dwarves-1.13.ebuild 1061 BLAKE2B 729f6f13b1b030171888139074499c0841ebbfa9ec4b1605706c3a1defda1a18bc5a56c41c89221b0ef78b294f5f8dbfea19eaa06dc4f0680af8eeea853c8c52 SHA512 a7aa494a88ac6f476d5001c2dfba81d1c372b3b4baaf2bc3a677cda395776b2f8c3eae60f151ece20a62e9d68a3922340ead94ce66f4bab0e181c741ef86e5a6
-EBUILD dwarves-1.15.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.16-r1.ebuild 981 BLAKE2B 73d0c73c70e17641b914ac177c3423a02592bc555c876aa99b2f23bfbf79a8ae3a74b11d593ef28bf34ec47f2b6e9d28637a8f49db9f03f90d25974edf65d69e SHA512 54a0e1425ac72e753e8c70534617f84863897b74689ea1f08602601c490a130830eae1ba3f984cd5a77eb9637131ba7ff7384e27542870871b40f972b932d1e4
-EBUILD dwarves-1.16.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.17.ebuild 931 BLAKE2B c471d826b831c5d663909c19a221ca96f18349e82f2f36486cc124185ff89377935282732423a5f1836c7a53dfe9f1e103443581a278bc238625b390d1447198 SHA512 18ef62683512041aaade7bce5bb443c0b3107e2d6f59453b64345102a7592ccc1876cecf82697124a907da3b6da660a6f8d4ab45b9a981110c190179dc4b30e3
+EBUILD dwarves-1.17.ebuild 929 BLAKE2B 6eb12848c991e990664cbf1b99fe8594e3330fb6903dd38140b89fbee0ab2d1d09de82792680763bb77c27e6e406de5c0a6e023904666e81e753e51632e52126 SHA512 1b0292734c586b397cfef3f0ff4daff400948ac6cc79b43caeb7e5a8642d1a0431f358faf2f7e50e6e06e25d39e9a7bb8731d16f59814cba65370302ee4e33cf
 EBUILD dwarves-9999.ebuild 831 BLAKE2B f6abb8e145532fe61e11b32695938c214c98b4f7adff2ea708af5d6794a1fb909a2ae779ebb07f9150af6d323f4cbd202200e1b1f6b4690d926408f84175f7bd SHA512 543e00d8572be3d4035cbe1c68adf5d3a3aab3a5dfbd9f47a976bccc8b0f73a3d382d0e96f796181afa9d130f00fe6fa623e6c3b674fb1efd8a1a1675ee7e694
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
deleted file mode 100644
index bcd44c849ea3..000000000000
--- a/dev-util/dwarves/dwarves-1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
deleted file mode 100644
index cb99e78f1ffb..000000000000
--- a/dev-util/dwarves/dwarves-1.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
deleted file mode 100644
index c58ef0fd660d..000000000000
--- a/dev-util/dwarves/dwarves-1.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-	"${FILESDIR}"/${PN}-1.16-no-libebl.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16.ebuild b/dev-util/dwarves/dwarves-1.16.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index 900e391c2b62..eb23c66249d5 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
deleted file mode 100644
index 78c6a4e3964f..000000000000
--- a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 16 Dec 2019 21:51:45 +0100
-Subject: [PATCH] cmake: libebl was merged into libdw
-
-Since elfutils 178, libebl is now part of libdw, so searching for libebl
-always fails. Simply remove it from the search.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- cmake/modules/FindDWARF.cmake | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
-index f4feec4..027d06e 100644
---- a/cmake/modules/FindDWARF.cmake
-+++ b/cmake/modules/FindDWARF.cmake
-@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
- 	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
- )
- 
--find_library(EBL_LIBRARY
--	NAMES ebl
--	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
--)
--
--if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND TRUE)
--	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
-+	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
- 
- 	set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
- 	# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
-@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
- 	# in distributions such as fedora). We do it against libelf because, IIRC, some distros
- 	# include libdw linked statically into libelf.
- 	check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
--else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND FALSE)
- 	set(DWARF_LIBRARIES)
--endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 
- if (DWARF_FOUND)
- 	if (NOT DWARF_FIND_QUIETLY)
-@@ -63,7 +58,6 @@ if (DWARF_FOUND)
- 		message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
- 		message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
- 		message(STATUS "Found libelf library: ${ELF_LIBRARY}")
--		message(STATUS "Found libebl library: ${EBL_LIBRARY}")
- 	endif (NOT DWARF_FIND_QUIETLY)
- else (DWARF_FOUND)
- 	if (DWARF_FIND_REQUIRED)
-@@ -73,9 +67,9 @@ else (DWARF_FOUND)
- 		find_path(FEDORA fedora-release /etc)
- 		find_path(REDHAT redhat-release /etc)
- 		if (FEDORA OR REDHAT)
--			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Please install the elfutils-devel package")
--			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Please install the elfutils-libs package")
- 			endif (NOT DWARF_LIBRARY)
-@@ -89,9 +83,6 @@ else (DWARF_FOUND)
- 			if (NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Could NOT find libdw include dir")
- 			endif (NOT LIBDW_INCLUDE_DIR)
--			if (NOT EBL_LIBRARY)
--				message(STATUS "Could NOT find libebl library")
--			endif (NOT EBL_LIBRARY)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Could NOT find libdw library")
- 			endif (NOT DWARF_LIBRARY)
-@@ -103,7 +94,7 @@ else (DWARF_FOUND)
- 	endif (DWARF_FIND_REQUIRED)
- endif (DWARF_FOUND)
- 
--mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
-+mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
- include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
- 
--- 
-2.24.1
-
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index cce3980f16c8..e57c555b0e33 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -5,5 +5,5 @@ DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f2
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.3.1.ebuild 1625 BLAKE2B d1428e4ff5cd8dbf4929d330e556c285a7d3efe7c5c831900c1aaf6c38130147c18c242caa220ba554b43cfcd526af18b695c82eac9d79bbccf82188a7b6af66 SHA512 c7c6d734c5e35ef30f7e1c20a03dce49386d71af80ff3580e4b844afd3abfa2a1e6d1941198f08dd3074b52b5dadf2bb5bf080acac298179df6660005a46183a
 EBUILD global-6.5.7.ebuild 1633 BLAKE2B 6120fd297353f710d91eedf03241552852567b73ff4a1b52e39f49538202961b930f07a5adcb41820c2c817f09b7556982fd2801aed4f332e43d2036bad95775 SHA512 4978e3550ca324412c01ab67264b8227ef35a7fbc0f5719b98c0b77db8f8cc09aa7420097aa3890bbd0f6b07b88a262886d4717c482c669d8d52a28adbfd52d5
-EBUILD global-6.6.4.ebuild 1654 BLAKE2B 4c4b8d0f515519534b4b43ab03a22906a71a1d2e4fa1718359a42bd0ed4f60eaa582c279acd414bc9b90c3ccc143b7110b9f93567c4de4ce7a4d957f7f7a71be SHA512 de7b306fa436ef7367dcc4f09307de5b96d2ab253853da997b280a6d7c2d8b8f96dee227248b2c07460c947b113b1d5abdc773ecd1721dd8a2f3e80ed8762b68
+EBUILD global-6.6.4.ebuild 1653 BLAKE2B cbc2ca8f87610896cb6b8bad7776595220937ede294c589b71dbad202ba19aef544247f2551e805ca39fa5c5d72dac20766d5b831a33097bf306430d2e81d4ff SHA512 9e98ae11f2046cbd3c5dc9fedf824c7a1118d3bc12196cc46d67fab345fe051d56555ab8d21938f0bc296412238bd56d0ae628e00db0bbb9ccba671279ca83b4
 MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild
index e45daf3d4f7d..eaa110afce6a 100644
--- a/dev-util/global/global-6.6.4.ebuild
+++ b/dev-util/global/global-6.6.4.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="doc emacs vim"
 
 RDEPEND="
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 3c6eacc6bce8..74283e69986e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.ebuild 2478 BLAKE2B 6a7a81eb18642b1e1afe11a7f2b77286c25e90d7574907cc0ce1f6a036df7a5ec8c39f90c7617d84220535d3819955da7dc61d2745af741e36f027f8ba2f7ef2 SHA512 2861b5f1c923204061d213a53875db85fe62f43a1f1c9d0a2faa74a154832dce0d8856a7414c0e4265d999bd1e23631b32791c566eef1ee2f312f750a6640754
+EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
 EBUILD lldb-10.0.1.ebuild 2318 BLAKE2B 7a51d8537d244c152098e46d4b617b42257260f96eba07bffc58b36c15caa3f73295eeb2f7791bc0cc75fdf39dcf3ea62095ce7a5925326afc9d0b077c23ded3 SHA512 ecbef89dccf5f747ab3e48c76deb223e3fd00ced89f2b8abbbd413cd963d60932aa18134a967f7c7ddd6e38d33b44de182edd93b37297ee9297a5d78779394c6
 EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 EBUILD lldb-11.0.0_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
diff --git a/dev-util/lldb/lldb-10.0.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
index bab3bed7e14b..950cb52a4b4f 100644
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 01ca1c276db3..6cf9654e7fad 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
 DIST lxqt-build-tools-0.7.0.tar.xz 24436 BLAKE2B b3bc9a62c530e682cff5412400d0fb14958d6aabddaef8c76b0073b01d356a9e7b227436428a3810f6b442dd77e57f4efb080a4902261679ad2c7898cf3098cb SHA512 7b6fd30e6ae8355ae36be55f8f7d47d78f507c11ebd9cbdd1d2ce5f14db68b845ad0bb8ca05fa1122bfd4c41f6dc792dff5100dcb8e61167517c3704527c7cde
 EBUILD lxqt-build-tools-0.6.0.ebuild 516 BLAKE2B 383ed3c5009bcd653e6a6f53b8de624b7b91c7ed2873c4fb5e26e57710efd1b4920aecc0542f453be7ee36f3af777f1b6414aeb7667239a171859f23b55045cb SHA512 c1eefa590d6ec6f29585e608aca2d43a962688bb06f3fe4b432bbe011a75a8d16cb7d38a7828aede1ce2c0881d22b1690c066ceacedcfe0d0bfc64aa8528ad75
-EBUILD lxqt-build-tools-0.7.0.ebuild 523 BLAKE2B 4ed1b96274339d24add91d6de7e2b6a07a57de60281abb6ef79a06e6f416dbc0aa17522d0ab300633114c6c9c968ee11fbd14179ad4e6469b7b0d1b44c3f30a8 SHA512 40e6ac6134676eec50e89eab19fe24eea7e085caadcc866d8091254530045ac2f9cc6079f7cf2e6126892ea8cc5189fafd1d54291364bd244fe696fe227a1fce
+EBUILD lxqt-build-tools-0.7.0.ebuild 521 BLAKE2B eb7b9f78ca0768842c4bf5cab81eb36e03a83f12212d87544afdbe2c3281478449c1abf0f464ad1243fb9362302ff6f8650c0720d9ee8448b40b996e30fa39a7 SHA512 f09c1e84e0f31a3732596bc641ebd165f2dcb0785be533c31c8db54b49ef8a9ab564b3c0f14e0c34c3a33308997cab10c814fcd478fef521f4a2157acc51f753
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
index ce1e2b0aad19..7656e424fc90 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2b3fda5b043a..3959690e0dff 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 68af2979ea1a..30b19aafd922 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -9,11 +9,13 @@ DIST darcs-2.10.3.tar.gz 1513296 BLAKE2B 4a900a4307f1067cb078396f28358f75107821a
 DIST darcs-2.12.0.tar.gz 1465730 BLAKE2B a021796aefc38aaf355a3156f26c8f313ffbe44ad5e9172883217f609c73baed49301a26bbc818574175c0e7174ad6401407ae9492584e3aed56e8fb2bf10f7a SHA512 654f9054dfe8e23e17ae00cdf22153ddaf89d114c5ee0e1ca86f373c1abf62b7bd808965f4d4df695aaba44d1d334d725cc0d57dea5df7cd1992a0ef15e49135
 DIST darcs-2.12.4.tar.gz 1462383 BLAKE2B 49827a07770da8253775649e9a72b33d4e715f7eae63c093c6d3a16f097cd9f3246e2aec4ee4782efd1629423a3d3a23d6d5350131ed4daa4fc47701fd6449ae SHA512 52a0b9b8a23b05dc29513c20c3c0fdc0b696da87156ea83a5736ea294618b993d1f3914f82a918e331db5de0746c147244f46d396ee7dbb02fee116825e1dd6a
 DIST darcs-2.12.5.tar.gz 1460698 BLAKE2B 9050b5863221d2c82e93d689b733b34a0b63fd0e7f29b0041ba3ff10e4359e4d32e1c8bca5ac4722a65fbebab66b25cba443efe23ee3e4a87d4117a7335db4de SHA512 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542
+DIST darcs-2.14.4.tar.gz 1063327 BLAKE2B abb6f6dd230c9e2b6a54a5416f66657e54387dc6b1d42901e909dc1a7a16a7e35e350c3b9e4a6949987c475415e2699caab8bd99b50c930b764cac5fa90d0c2b SHA512 cea95edc542328402f258f66de52c8b9fda417ecd905f957f94e1a398809652dc2f6e873e230683af97601349e0ee03095c67ba45d9c044706e12275c3fc0300
 DIST darcs-2.8.4.tar.gz 1301464 BLAKE2B 748494ae1c34318c14e128a4d08667b839644dbcf2b2d8bbcc86263ee5332f859f91bc2a56f3c6ccf6a465f45a90d97d304c9c15ebdd3cdd709c251c61c15a6c SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e
 EBUILD darcs-2.10.1.ebuild 4661 BLAKE2B 6baeaff0f00e514365f325bb67d264c1eb2a793a324aa867a11bd3713a952f2e4cca38ee872ba4a588e5babe6b4f92b199fefd3fb8eda70b572f9009b48c3a20 SHA512 947f58a975cfada502261baf79ff494dc096ecc2a835ee987778216221ce690c1a0fb10f1f67aa902e47b18fe7476988a0e623348f2756e55eb468d31db93328
 EBUILD darcs-2.10.3-r1.ebuild 4751 BLAKE2B a5e2fad1a29d43c82f7e3f6f38630c3201ca374ff38436005a4c1d6338a7b05aa275f365d8acd3b77608802542fb7e2c0797f3f692e949e3995f3694c31f580e SHA512 b8ec1cba9be4ce72c654d874358d6373530e1cd4cbdab69af8c16e1f552c6d749d59fce393fc736afe11c4480a11d6ae04c439aea8bd513575ada01d1515698d
 EBUILD darcs-2.12.0.ebuild 4793 BLAKE2B 558f2d89ff6ed54f16ff484468d4ef22b1795af9fda247ba6dd541b07b485fa79aa15fae59b3596a6dc1942c58fc7426217ad497ed79d57b5688ddd99414b023 SHA512 e96ba3b3038d115244731196882984cf37775dfd4ccc89470f315b075a5dfae6627dde57c499cc23cb52650cf671d0fa5f50c8f8033a5c85819a59ffdfb90311
 EBUILD darcs-2.12.4.ebuild 4477 BLAKE2B b803195ef7164c026944e943954ed3fc2f712c98a49f2aad9d01dcc4a7a2a6151d03c41b5bd1771f8017dda7b3c753a4db85450de97b6be3a5de0608045a3014 SHA512 173e6683a317a5a79f0f20f656bc7eb9be0a870871e8d6979a2db2687ad7eff35b0bcd1eff4e74d7eb55c31f2924887ffe6a6e6460f0aa24ce66fb0e427298ad
 EBUILD darcs-2.12.5.ebuild 4557 BLAKE2B 79069ed807976f10766d6b1c7856eea63bc3ce04f0f24fc1192ff80a208fdeb92f71b01867c90620c7f7e8fefb6d41a98fa2183c2aa5d65b876bca9fbf09df00 SHA512 2dc134298a44a05d71b1932c49b09dbb2ba28955174d3fdcf857427c80013560e504f1e83cb9ad46870567f132252f6a8c55d2b97f61c9f12efd47f46a35186e
+EBUILD darcs-2.14.4.ebuild 4206 BLAKE2B 6f3c2e4906b77659f435af8e200cca626b60d3a13fd428cca832d81a52ac7178e3f9f441dd3dcfafb0d930e45a8a80716073355ec2b0d58804bb7cfe1b088700 SHA512 357751a50700b6e6ce03e7a6a02b6218d41085e9d51f0844f03983bd2df5da1555a51ee90dbaa7ec6b10dead342b16060d5841c4bb94138e0efd6646dbcb23e1
 EBUILD darcs-2.8.4-r6.ebuild 4674 BLAKE2B e5289660b80bf55eee4604e87deedf31978bd205ae46b0f8c161d4ed1cfd6f5cac3df60c0030b7fdd68c9e5b4783dd557c766612d171e7d70aaec2109a11c9e6 SHA512 3e31ed5a97205cfbc9001785c36402225ba3a3700f2f3add0da6e94951a2fef9452ad41baa40f74bc06d1813b9c01c5c9bc98b623101dd9e3763aef30857d39a
 MISC metadata.xml 593 BLAKE2B c4ab655306f001cc3fe3007152e25d32d97fd3a87db76051c6c75b1d53c2c6ebd2105b2674bea5872e678b577c3cca737a3bbf6fe89923bc4f780ea2dc8642fc SHA512 cab7d36edce3f7da1742ebf086f69468f2745cb58fae83e74fa3e6016f4a7285aaa57100fed17df47940a51029ea78892147b7fe86ef2e456b7e34cc34a421bd
diff --git a/dev-vcs/darcs/darcs-2.14.4.ebuild b/dev-vcs/darcs/darcs-2.14.4.ebuild
new file mode 100644
index 000000000000..42f5f96a8680
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.14.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl +terminfo +threaded"
+
+RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
+	>=dev-haskell/graphviz-2999.18.1:=[profile?] <dev-haskell/graphviz-2999.20.1:=[profile?]
+	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.20:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?]
+	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.4.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
+	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	curl? ( net-misc/curl )
+	terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/shelly-1.6.8 <dev-haskell/shelly-1.10
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman "${S}/dist/build/${PN}/darcs.1" || die "darcs.1 not found"
+}
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
index 590d14674f8e..1210f6525be3 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -4,5 +4,7 @@ AUX git-annex-6.20170101-crypto-api.patch 212 BLAKE2B 0e9e1fdda1a93ffd709955c472
 AUX git-annex.bash 440 BLAKE2B af7b2b47e98386cef417051a11ae4baff07ea8cd96177c95b6b49095f5b7724ecbc1c4f13a6f351afe66f0d015c7355b6a56b77c06cb1e9e5cf155268312c619 SHA512 89b6520e4be14af9032638c1153df936a7e5707d6453b4251fe762712b8956ba1d39a4623b06910e5ac5724e33e157e654b724e070b6893f6f26578df730d326
 AUX git-annex.xpm 1961 BLAKE2B 0fe6e0cf9c43b1b16db1e8394ccda5eef2fdc41727aa3aa97fef8f955e8fdd71336c29f439ed2ad46553f8d67ef8be9d3dbcc6a93c81686f5e746a08b1113c6d SHA512 4a22ac448852160d66838c272f41b8c7599aa1b904e35ac03ea294d9ed15b855bde24b7e5407a2578937bfd51d482837ed6680af680166d030f71666316ae4d3
 DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
+DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
 EBUILD git-annex-6.20170818-r1.ebuild 4424 BLAKE2B 3f8bfdcb1c4ff2e328def3aa19df4ecaf37f63af2f13abc6da4d9e5083feecb67d61693a9045fa3b7f5b0a0671140d6cad803cf1880c51e9b41d7ce792c8e7bd SHA512 cd13af30010593bd53b55711478c8941e963f76f71bb52fcef1207c0275118d2ff95d693066fab96384bbba8d7deb808f0e3ec30563d1fa917b55d02cb52e5bc
-MISC metadata.xml 1661 BLAKE2B 356d0921a762cfb657a0da795457c4016c2b131d0465e214cd24ca1b61b6b2666d0d4d3888abcaad00c70bae8f45b25400abfcba669aaa0e6f136f7e782424f0 SHA512 711b59db225918c774489ce308f16fd372377ff64c1449030bc75c4ae17212515ddeac741ee11978a6e3212b3edc75fd45d730664bd625a54d7887bc12dab928
+EBUILD git-annex-8.20200617.ebuild 4582 BLAKE2B 7405254d596923ee31e01550644187c8b5b6e168c18bb7ba8393f1bb65f111480a5fc910769996534379d0da736670d5d7a4c05930e783e780c5df9923d422d0 SHA512 34d7dc3c8025661adb102535fd846607b2daa42db87af7df2348e2eeeb77048d4a373fbbe338c1a1000addf878e85b2d366fcfd1a0f0eb2cd2a499b82f2604ee
+MISC metadata.xml 1851 BLAKE2B 927b455424e47f733d1a22a6cc8bb7d7ad081bc51cbc5605043e904185f12e3bb46f54308e407f887d86288c42da50b036011324257f249834e45030996dd1d1 SHA512 2d385149e03003c5f2a0cd9f2c68a84396f356aedae72e2d2fd9c184f21b518de39df87eb8ce74e69a39ba3e3497666b700cec8f997ebc9e64500f9e10c6b3a1
diff --git a/dev-vcs/git-annex/git-annex-8.20200617.ebuild b/dev-vcs/git-annex/git-annex-8.20200617.ebuild
new file mode 100644
index 000000000000..033a5d6cb5a8
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-8.20200617.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -production,-android,-androidsplice,-testsuite,networkbsd:network-3
+
+CABAL_FEATURES=""
+inherit haskell-cabal bash-completion-r1 desktop
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+assistant benchmark +dbus debuglocks doc +magicmime +network-3 +pairing +s3 +torrentparser +webapp +webdav" # NOTE: add local USE flag 'doc' when bumping
+
+RESTRICT=test
+
+RDEPEND="dev-haskell/aeson:=
+	dev-haskell/async:=
+	dev-haskell/attoparsec:=
+	>=dev-haskell/bloomfilter-2.0.0:=
+	dev-haskell/byteable:=
+	dev-haskell/case-insensitive:=
+	>=dev-haskell/concurrent-output-1.10:=
+	dev-haskell/conduit:=
+	>=dev-haskell/connection-0.2.6:=
+	dev-haskell/crypto-api:=
+	>=dev-haskell/cryptonite-0.23:=
+	dev-haskell/data-default:=
+	dev-haskell/disk-free-space:=
+	dev-haskell/dlist:=
+	dev-haskell/edit-distance:=
+	>=dev-haskell/exceptions-0.6:=
+	>=dev-haskell/feed-1.0.0:=
+	>=dev-haskell/filepath-bytestring-1.4.2.1.1:=
+	dev-haskell/free:=
+	dev-haskell/hslogger:=
+	>=dev-haskell/http-client-0.5.0:=
+	dev-haskell/http-client-tls:=
+	>=dev-haskell/http-conduit-2.3.0:=
+	>=dev-haskell/http-types-0.7:=
+	dev-haskell/ifelse:=
+	dev-haskell/memory:=
+	dev-haskell/microlens:=
+	dev-haskell/monad-control:=
+	dev-haskell/monad-logger:=
+	>=dev-haskell/mtl-2:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	>=dev-haskell/optparse-applicative-0.14.1:=
+	>=dev-haskell/persistent-2.8.1:=
+	>=dev-haskell/persistent-sqlite-2.8.1:=
+	dev-haskell/persistent-template:=
+	>=dev-haskell/quickcheck-2.10.0:2=
+	dev-haskell/random:=
+	dev-haskell/regex-tdfa:=
+	dev-haskell/resourcet:=
+	dev-haskell/safesemaphore:=
+	dev-haskell/sandi:=
+	dev-haskell/securemem:=
+	dev-haskell/socks:=
+	dev-haskell/split:=
+	>=dev-haskell/stm-2.3:=
+	dev-haskell/stm-chans:=
+	dev-haskell/tagsoup:=
+	>=dev-haskell/tasty-0.7:=
+	dev-haskell/tasty-hunit:=
+	dev-haskell/tasty-quickcheck:=
+	dev-haskell/tasty-rerun:=
+	dev-haskell/text:=
+	>=dev-haskell/unix-compat-0.5:=
+	dev-haskell/unliftio-core:=
+	dev-haskell/unordered-containers:=
+	dev-haskell/utf8-string:=
+	>=dev-haskell/uuid-1.2.6:=
+	dev-haskell/vector:=
+	>=dev-lang/ghc-8.4.3:=
+	assistant? ( >=dev-haskell/hinotify-0.3.10:=
+			dev-haskell/mountpoints:= )
+	benchmark? ( dev-haskell/criterion:= )
+	dbus? ( >=dev-haskell/dbus-0.10.7:=
+		>=dev-haskell/fdo-notify-0.3:= )
+	magicmime? ( dev-haskell/magic:= )
+	network-3? ( >=dev-haskell/network-3.0.0.0:=
+			dev-haskell/network-bsd:= )
+	!network-3? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= )
+	pairing? ( dev-haskell/network-info:=
+			dev-haskell/network-multicast:= )
+	s3? ( >=dev-haskell/aws-0.20:= )
+	torrentparser? ( >=dev-haskell/torrent-10000.0.0:= )
+	webapp? ( dev-haskell/blaze-builder:=
+			dev-haskell/clientsession:=
+			>=dev-haskell/path-pieces-0.2.1:=
+			>=dev-haskell/shakespeare-2.0.11:=
+			dev-haskell/wai:=
+			dev-haskell/wai-extra:=
+			>=dev-haskell/warp-3.2.8:=
+			>=dev-haskell/warp-tls-3.2.2:=
+			>=dev-haskell/yesod-1.4.3:=
+			>=dev-haskell/yesod-core-1.6.0:=
+			>=dev-haskell/yesod-form-1.4.8:=
+			>=dev-haskell/yesod-static-1.5.1:= )
+	webdav? ( >=dev-haskell/dav-1.0:= )
+"
+# not generated by hackport:
+RDEPEND+=" dev-vcs/git
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+# not generated by hackport:
+DEPEND+=" dev-lang/perl
+	doc? ( www-apps/ikiwiki net-misc/rsync )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-android \
+		--flag=-androidsplice \
+		$(cabal_flag assistant assistant) \
+		$(cabal_flag benchmark benchmark) \
+		$(cabal_flag dbus dbus) \
+		$(cabal_flag debuglocks debuglocks) \
+		$(cabal_flag magicmime magicmime) \
+		$(cabal_flag network-3 networkbsd) \
+		$(cabal_flag pairing pairing) \
+		--flag=-production \
+		$(cabal_flag s3 s3) \
+		--flag=-testsuite \
+		$(cabal_flag torrentparser torrentparser) \
+		$(cabal_flag webapp webapp) \
+		$(cabal_flag webdav webdav)
+}
+
+src_test() {
+	if use webapp; then
+		export GIT_CONFIG=${T}/temp-git-config
+		git config user.email "git@src_test"
+		git config user.name "Mr. ${P} The Test"
+
+		emake test
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
+
+	dodoc CHANGELOG README
+	if use webapp ; then
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry "${PN} webapp" "git-annex" ${PN}.xpm "Office"
+	fi
+}
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index 556f1c584b7f..d3a3483550e2 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -23,6 +23,9 @@
 		<flag name="assistant">Enable git-annex assistant and watch command</flag>
 		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="concurrentoutput">Use concurrent-output library (experimental)</flag>
+		<flag name="debuglocks">Debug location of MVar/STM deadlocks</flag>
+		<flag name="magicmime">Use libmagic to determine file MIME types</flag>
+		<flag name="network-3">Use network-3</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
 		<flag name="s3">Enable Amazon S3 remote</flag>
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index c44fccd05fd2..342b5c682bce 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,3 +1,3 @@
-DIST hg-evolve-10.0.0.tar.gz 808587 BLAKE2B ec6c5f3edf8967df9556413326d2dc66830461c65a4697963513429aeb601999461012ec19a17ed8ba0d88a7fcf9ef41749428b71819e99a39b261d6d2541157 SHA512 4c88af31584d61df7fe397015e185d0191a021f89a23630b6d71ead5acb233f4b71638f3637e12e1d04b03fb79f127a754eeac0e85ab2b8d045665645d528d13
-EBUILD hg-evolve-10.0.0.ebuild 764 BLAKE2B dad3a999e0f5a439a5a79fe42d2ef6e86672ece4b76e60c2ea42fe868002c07cce75c4837e3a6440d0df50c870689b1e91057a0e9af9247fbb21bfd053807a0a SHA512 41bb97620a8908b0e6c3d3cf5688e20a91990789fc796069cf08f9f5c2ddaf49271e2a22e646e4f0098ba58b328d38182db9368126c474abb8bdf840a5e3a502
+DIST hg-evolve-10.0.1.tar.gz 810363 BLAKE2B 8d9de203262a90a37120f2a0fd4ec29352719f8aca6ca91138a5efa99087ec0084d4ed8b1f828f6df49dd93d2c3d3327119e8f4f17815e5fd1022af6b7a1f803 SHA512 0ab0d64962671f2a107a0b5d56d3c8ec3d29325ac425ee109c1e08d899c1c4124af5676deb60bb4e82f9786474c47f587fec267e27b741b9f73ab18fc473ecc6
+EBUILD hg-evolve-10.0.1.ebuild 764 BLAKE2B dad3a999e0f5a439a5a79fe42d2ef6e86672ece4b76e60c2ea42fe868002c07cce75c4837e3a6440d0df50c870689b1e91057a0e9af9247fbb21bfd053807a0a SHA512 41bb97620a8908b0e6c3d3cf5688e20a91990789fc796069cf08f9f5c2ddaf49271e2a22e646e4f0098ba58b328d38182db9368126c474abb8bdf840a5e3a502
 MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf
diff --git a/dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
similarity index 100%
rename from dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild
rename to dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index ad9a678014bb..2cafcaeaf3c3 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,9 +2,9 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
-DIST mercurial-5.4.1.tar.gz 7725893 BLAKE2B 3205647b4a8d14ad6d02d7494d3f41b0a6d306ef039ebbcd2f62ca1f00f4a870794de968edafc9379e4e29c59da0aa4c92308facdf8f151f390ed7309782c3c5 SHA512 6173853c38f0aba59d2e29bec7da1c384c27a6004d5d00d1aee70571155122e07514fe6e56cecfdae48ec5f670823a2e6a5c9c8a36dd7041def2b8956fd35703
+DIST mercurial-5.4.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15
 EBUILD mercurial-5.2.2-r1.ebuild 4058 BLAKE2B 34042ced46f70b449bd2b5227a6b75189fed424a0ebbe5a89aafe5fe333ad69d4fd9be38408839540a31fcc6f88bc57b9c8e6a1d9b0467a21e362df1a1c37742 SHA512 7d7d5bd4c6883256c5a5554ac31134b5bb4f78b28cbc84711a6ce70852419c9e1924cf05facc793ec0a6813bf5b6570436e30f41391873cf8e8ea272e095b3e2
 EBUILD mercurial-5.3.2.ebuild 4065 BLAKE2B fdb792f9fa429c7e2a28eed69108307ff3e90842c11a7814b2d73081170201cde11105f688dc1b3b5b561111a490f8854dcdc07bb54c450dc08dc9735378f91d SHA512 db9fd1d352cfec13b4fc5686b1d8f7e7dce992d9424a064a6f7db81c5c769d18c088fca40cc661614e6a5cc127f57bbbdc54bd756dd0c3d327ce6e76017a0b90
-EBUILD mercurial-5.4.1.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
+EBUILD mercurial-5.4.2.ebuild 4069 BLAKE2B 29c243c2ec8289596271a0555f40cf8c3740f372279a0586cda67b8ddaf6e9d294c7b18cd777557283b0cb448d601577c2c203230d24ccd5b4c6ba1fbc9683a0 SHA512 20606c5a0b4f29e688c465954917ed7c72c51c410a5ab948262e34d9056a792aef952a611bd0da3e005579f0c73306092feb4b0c5dc80ea31c577a1ce7d318bd
 EBUILD mercurial-9999.ebuild 4032 BLAKE2B 802015b5f8f386bf38d7397aec896b4ae0557b6096295dd103adb29c75fad955e280d90032ecb8f28686fe7b7f69faa523775ce19b770c43dac17378db8ee451 SHA512 1c5cad662f4482fa1ec1f25824f367b72fd9e2a3b79b058ef852c3a30ef1a974aecdd39d0e8da19aedf7d7a92f3ac49c718d200b1699e106c685d448efe8f250
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83
diff --git a/dev-vcs/mercurial/mercurial-5.4.1.ebuild b/dev-vcs/mercurial/mercurial-5.4.2.ebuild
similarity index 100%
rename from dev-vcs/mercurial/mercurial-5.4.1.ebuild
rename to dev-vcs/mercurial/mercurial-5.4.2.ebuild
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c9c57007707c..5b8b89536997 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index 982cf7b08b4d..20ad3555d239 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -228,10 +228,12 @@ kernel-install_test() {
 		"${T}/fs.qcow2" || die
 
 	cd "${T}" || die
+	local qemu_extra_args=
+	[[ ${qemu_arch} == x86_64 ]] && qemu_extra_args='-cpu max'
 	cat > run.sh <<-EOF || die
 		#!/bin/sh
 		exec qemu-system-${qemu_arch} \
-			-cpu max \
+			${qemu_extra_args} \
 			-m 256M \
 			-display none \
 			-no-reboot \
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 3867bd2b9f82..a4cb9cc141ec 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -7,7 +7,7 @@
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
+inherit eutils flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
 
 tc_is_live() {
 	[[ ${PV} == *9999* ]]
@@ -99,11 +99,7 @@ fi
 
 PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr}
 
-if tc_version_is_at_least 3.4.0 ; then
-	LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
-else
-	LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
-fi
+LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
 INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
 
 if is_crosscompile ; then
@@ -121,20 +117,7 @@ STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VE
 
 #---->> LICENSE+SLOT+IUSE logic <<----
 
-if tc_version_is_at_least 4.6 ; then
-	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-elif tc_version_is_at_least 4.4 ; then
-	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
-elif tc_version_is_at_least 4.3 ; then
-	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 4.2 ; then
-	LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 3.3 ; then
-	LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
-else
-	LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-fi
-
+LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 IUSE="test vanilla +nls"
 RESTRICT="!test? ( test )"
 
@@ -163,8 +146,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
 	fi
 	IUSE+=" debug +cxx +nptl" TC_FEATURES+=(nptl)
 	[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
-	[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
-	[[ -n ${D_VER}   ]] && IUSE+=" d"
 	[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
 	# fortran support appeared in 4.1, but 4.1 needs outdated mpfr
 	tc_version_is_at_least 4.2 && IUSE+=" +fortran" TC_FEATURES+=(fortran)
@@ -173,7 +154,6 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
 	tc_version_is_at_least 3.3 && IUSE+=" pgo"
 	tc_version_is_at_least 4.0 &&
 		IUSE+=" objc-gc" TC_FEATURES+=(objc-gc)
-	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
 	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
 	tc_version_is_at_least 4.2 && IUSE+=" +openmp"
 	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
@@ -353,13 +333,6 @@ gentoo_urls() {
 #			The resulting filename of this tarball will be:
 #			gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2
 #
-#	HTB_VER
-#	HTB_GCC_VER
-#			These variables control whether or not an ebuild supports Herman
-#			ten Brugge's bounds-checking patches. If you want to use a patch
-#			for an older gcc version with a new gcc, make sure you set
-#			HTB_GCC_VER to that version of gcc.
-#
 #	CYGWINPORTS_GITREV
 #			If set, this variable signals that we should apply additional patches
 #			maintained by upstream Cygwin developers at github/cygwinports/gcc,
@@ -404,19 +377,6 @@ get_gcc_src_uri() {
 	[[ -n ${SPECS_VER} ]] && \
 		GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
 
-	# gcc bounds checking patch
-	if [[ -n ${HTB_VER} ]] ; then
-		local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
-		GCC_SRC_URI+="
-			boundschecking? (
-				mirror://sourceforge/boundschecking/${HTBFILE}
-				$(gentoo_urls ${HTBFILE})
-			)"
-	fi
-
-	[[ -n ${D_VER} ]] && \
-		GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
-
 	if tc_has_feature gcj ; then
 		if tc_version_is_at_least 4.5 ; then
 			GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
@@ -487,20 +447,7 @@ toolchain_src_prepare() {
 	export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
 	cd "${S}"
 
-	if [[ -n ${D_VER} ]] && use d ; then
-		mv "${WORKDIR}"/d gcc/d || die
-		ebegin "Adding support for the D language"
-		./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log
-		if ! eend $? ; then
-			eerror "The D GCC package failed to apply"
-			eerror "Please include this log file when posting a bug report:"
-			eerror "  ${T}/dgcc.log"
-			die "failed to include the D language"
-		fi
-	fi
-
 	do_gcc_gentoo_patches
-	do_gcc_HTB_patches
 	do_gcc_PIE_patches
 	do_gcc_CYGWINPORTS_patches
 
@@ -518,38 +465,19 @@ toolchain_src_prepare() {
 		make_gcc_hard
 	fi
 
-	# install the libstdc++ python into the right location
-	# http://gcc.gnu.org/PR51368
-	if tc_version_is_between 4.5 4.7 ; then
-		sed -i \
-			'/^pythondir =/s:=.*:= $(datadir)/python:' \
-			"${S}"/libstdc++-v3/python/Makefile.in || die
-	fi
-
 	# make sure the pkg config files install into multilib dirs.
 	# since we configure with just one --libdir, we can't use that
 	# (as gcc itself takes care of building multilibs).  #435728
 	find "${S}" -name Makefile.in \
 		-exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
 
-	# No idea when this first started being fixed, but let's go with 4.3.x for now
-	if ! tc_version_is_at_least 4.3 ; then
-		fix_files=""
-		for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
-			[[ -e ${x} ]] && fix_files="${fix_files} ${x}"
-		done
-		ht_fix_file ${fix_files} */configure *.sh */Makefile.in
-	fi
-
 	setup_multilib_osdirnames
 	gcc_version_patch
 
-	if tc_version_is_at_least 4.1 ; then
-		local actual_version=$(< "${S}"/gcc/BASE-VER)
-		if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
-			eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'"
-			die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'"
-		fi
+	local actual_version=$(< "${S}"/gcc/BASE-VER)
+	if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
+		eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'"
+		die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'"
 	fi
 
 	# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
@@ -563,19 +491,6 @@ toolchain_src_prepare() {
 		fi
 	fi
 
-	# disable --as-needed from being compiled into gcc specs
-	# natively when using a gcc version < 3.4.4
-	# http://gcc.gnu.org/PR14992
-	if ! tc_version_is_at_least 3.4.4 ; then
-		sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
-	fi
-
-	# In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names
-	# in line with gcc-4.
-	if tc_version_is_between 3.3 4.0 ; then
-		do_gcc_rename_java_bins
-	fi
-
 	# Prevent libffi from being installed
 	if tc_version_is_between 3.0 4.8 ; then
 		sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die
@@ -625,14 +540,6 @@ do_gcc_gentoo_patches() {
 	fi
 }
 
-do_gcc_HTB_patches() {
-	use_if_iuse boundschecking || return 0
-
-	# modify the bounds checking patch with a regression patch
-	tc_apply_patches "Bounds checking patch" "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
-	BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}"
-}
-
 do_gcc_PIE_patches() {
 	want_pie || return 0
 	use vanilla && return 0
@@ -798,41 +705,6 @@ gcc_version_patch() {
 	sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die
 }
 
-do_gcc_rename_java_bins() {
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.	 Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry ; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#	 These are present in all 3.x versions, and are the important bit
-	#	 to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  Replace occurrences of 'rmic$',
-		# 'rmic_' and 'rmic '.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-}
-
 #---->> src_configure <<----
 
 toolchain_src_configure() {
@@ -1244,12 +1116,6 @@ toolchain_src_configure() {
 	fi
 
 	if tc_version_is_at_least 4.0 ; then
-		if in_iuse mudflap ; then
-			confgcc+=( $(use_enable mudflap libmudflap) )
-		else
-			confgcc+=( --disable-libmudflap )
-		fi
-
 		if use_if_iuse libssp ; then
 			confgcc+=( --enable-libssp )
 		else
@@ -1704,8 +1570,7 @@ gcc_do_make() {
 
 	# Older versions of GCC could not do profiledbootstrap in parallel due to
 	# collisions with profiling info.
-	# boundschecking also seems to introduce parallel build issues.
-	if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then
+	if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]]; then
 		! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1"
 	fi
 
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 8faf846bf5d3..430fa449079d 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/teg/Manifest b/games-board/teg/Manifest
deleted file mode 100644
index 68f96b38c7a0..000000000000
--- a/games-board/teg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST teg-0.11.2.tar.gz 5790172 BLAKE2B 8a8084307a278b7b4aa7df7ce416f53b7bcc2dabb5ef13441810dbbe1d545819d4662028947d88d95e225f8e5f7d0ea8a06d6891d874fb88512233e70976e2fa SHA512 ac31b074eb0ff007ba34fc62043200701d6a481e8ad5eb323a111d0a93b998aa69ce3972780ce3bd212729ffd72229eb1a3ef3e73a9c0c6ceedd16c16107f4f2
-EBUILD teg-0.11.2-r1.ebuild 685 BLAKE2B 2fcc383ffcdf5fde05bb7310c95180b014417a8fa811ad5dead20ef7f13e539fa5a4b622847fcb217def39d394c8a88f1ea1cfdbe4b055d645602bd49a2d303e SHA512 e69f4369ba0b87d4a7a0bcd142df6465da1c262a0932ab7896a7311bbc97fb722dceef4030985f1a34489d8de2df0a9b9ec9a1eb1f8c0914db2c7c5b63ffc266
-MISC metadata.xml 801 BLAKE2B 072d6f3eab552ee9add89f373133034203bac2769cb19295b6d0fb949c966fc890590b6070d549c96450421ea51dcf420e265d8edf9c4c2768797d117299751c SHA512 11efadf3c902ffc4b0ac9a14fbcd1c56d57299b48e09d024b9d175bc526c558808b99b836986b2e07dc5edafa5d79a8628c64d87fe2ef7ae62fd1630ba48a302
diff --git a/games-board/teg/metadata.xml b/games-board/teg/metadata.xml
deleted file mode 100644
index db57e70627ea..000000000000
--- a/games-board/teg/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		Tenes Empanadas Graciela (TEG) is a clone of 'Plan Tactico y
-		Estrategico de la Guerra', which is a pseudo-clone of Risk, a
-		multiplayer turn-based strategy game.
-	</longdescription>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="client">Compile the client</flag>
-		<flag name="debug">Turn on debugging</flag>
-		<flag name="ggz">Enable GGZ Gaming Zone support</flag>
-		<flag name="robot">Compile the robot</flag>
-		<flag name="server">Compile the server</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">wfx/teg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/teg/teg-0.11.2-r1.ebuild b/games-board/teg/teg-0.11.2-r1.ebuild
deleted file mode 100644
index 63ae34a6c6df..000000000000
--- a/games-board/teg/teg-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Gnome Risk Clone"
-HOMEPAGE="https://github.com/wfx/teg"
-SRC_URI="https://github.com/wfx/teg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+client debug ggz nls robot server"
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libgnomeui
-	gnome-base/libgnome
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-text/tidy-html5
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable debug) \
-		$(use_enable ggz) \
-		$(use_enable robot) \
-		$(use_enable server)
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 5d8652035ff6..b3f876b28953 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index 6468b496efc4..1d2c041aebb3 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1,5 +1,5 @@
 DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
 DIST m64py-0.2.5.tar.gz 201868 BLAKE2B 95cbfe58ae2741caac5e05bcc06af563ee398d2916d07902ba4aaf4213277eea3c6219448db5958e0a2d0ea8ea3f65c88e63cfd2938a8b4ed33231ba57ae724f SHA512 338f5e96dc4657ba2230c32a40cf0e85c5efcccaa0d5fdbe4b4dcef020b910f5d2d88e5c224f8b496ec0378051aaf44358a0438de52fb03b4ece353f55abc61c
-EBUILD m64py-0.2.4.ebuild 1096 BLAKE2B 8a109c7cb3c42db942e3486deb33779f6b58f1c451348233b753feb046e807a3f2ace1e8d73094e4cc17ef72483ce00bd0f3ca8907f6bf0e2b79af86d0373b76 SHA512 ab4056f01f15b99bb37d57452f693006094ba7955fa4d36bf4159e101e2a38773214ad5fa63be11cc80623ed05794953eabf762c29d0bd5af0089f748a620479
+EBUILD m64py-0.2.4.ebuild 1042 BLAKE2B fe84544eb7b564f86d36389c535fe83a845893eeda970c7fd225c46933641395bf32eeca69c5e27971aaf5b4384bac6b8f8be93a10fc357947105e69f3bef17a SHA512 d7c83240d5a747134efb50f9013e5f42dafed0f11ab12898c249e4474d83c6b6ac7dcfc7f9bd65642acd385452dde8f243cb78c62a9036dc93296ba181d0f501
 EBUILD m64py-0.2.5.ebuild 1043 BLAKE2B 96a9604565785fc680c7554cb8abec300eba99ae9ee64a7237a737fe6b86678c45b47a9715c84a9be6516cd803bf4cbfab74dbed0376c12994c4236e57465fb3 SHA512 8f57d7ceb16452973c53c8a639e0580ad7a2a70cc64ef0adb63b2aec8ab96c675e341ea32bf1b872dad2bb9348e5d1843106e348da28e460d89dcd51a8c3e749
 MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
index 7655373b07f9..be315cbc1541 100644
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ b/games-emulation/m64py/m64py-0.2.4.ebuild
@@ -21,12 +21,7 @@ RDEPEND="
 	dev-python/PySDL2[${PYTHON_USEDEP}]
 	media-libs/libsdl2[joystick,video]
 	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
-	7z? (
-		|| (
-			dev-python/pylzma[${PYTHON_USEDEP}]
-			app-arch/p7zip
-		)
-	)
+	7z? ( app-arch/p7zip )
 	rar? (
 		|| (
 			dev-python/rarfile[${PYTHON_USEDEP}]
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 96a4ee90306b..97b2c4fe5fa3 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,13 +1,11 @@
 AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
 AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
-AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
 AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
 AUX zsnes-1.51-c++17.patch 2520 BLAKE2B 0295b0e211e2ec8f4988f42299a78d477ba29128519fdb6542f3495d7770b44c245d76264d3dbf97008a9a857da270ce753b90974b705af4b6a319f3389b47dd SHA512 abb9dd3cbc24ace02f132e44a44c3454402c34dcbcf40b2d3118befbe7553e71111382bd48ce281f05ecf2832ce814001f17b1598d155b9abb20943500ab5e99
 AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
 AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
 AUX zsnes-1.51-gcc-10.patch 409 BLAKE2B 4508e17379148a504a171110ddb121df3666dc9430a477d67b33fbd3544dff6799b159c9fe1f8c51fe2ffdf6d5c3fd1d809181942b774639cb7aad03fdaa2929 SHA512 28f1e215c0b85ffaae8f5128a79778532119bb51a89f7e4a6ee655aee0bcf520086f25c60ff303a5a3f8ea0b976aa4c29a3f68db0d320109ecd4349311bfedfe
 AUX zsnes-1.51-gcc43-20071031.patch 739 BLAKE2B 798bb1b45bd82a7e25c5923a2653aa61e2f2b197e26ca1e6cecdf5d55ecd83263c5aae17aee18419d0a14f58c6a24b02d0c31212189561d4a355d9f3e2fc386e SHA512 0ab19c1fadaf0ac07a7641366a56c5a2f7227e2fc39fe904e27954596ebee64174242b98a873abf6ee52b8e8335ce277189606e7a376ae02d4a95498cce24a40
-AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
 AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
 AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
 AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
deleted file mode 100644
index b3e466036f22..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ /dev/null
@@ -1,502 +0,0 @@
---- a/tools/archopt.c.old
-+++ b/tools/archopt.c
-@@ -1,8 +1,30 @@
-+/*
-+Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+version 2 as published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
-+#ifdef _M_X64
-+#define __x86_64__
-+#endif
-+
-+#ifdef __GNUC__
- #ifdef __x86_64__
- #define cpuid(in, a, b, c, d) asm volatile("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
- #else
-@@ -13,6 +35,22 @@
-   movl %%ebx,%%edi;\
-   popl %%ebx": "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (in));
- #endif
-+#else
-+char cpubuf[256];
-+int z_in, z_a, z_b, z_c, z_d;
-+void cpuid_run()
-+{
-+  _asm {
-+    mov eax,z_in
-+    cpuid
-+    mov z_a,eax
-+    mov z_b,ebx
-+    mov z_c,ecx
-+    mov z_d,edx
-+  };
-+}
-+#define cpuid(in, a, b, c, d) z_in = in; cpuid_run(); a = z_a; b = z_b; c = z_c; d = z_d;
-+#endif
- 
- char *x86_flags[] =
- {      "fpu",        "vme",        "de",         "pse",        "tsc",    "msr",      "pae",    "mce",
-@@ -62,6 +100,7 @@
- {
-   int have = 0x200000;
-   #ifndef __x86_64__
-+  #ifdef __GNUC__
-   asm volatile
-   (
-   "  pushfl;"
-@@ -76,6 +115,23 @@
-     : "=a" (have)
-     : "c" (have)
-   );
-+  #else
-+  z_c = have;
-+  _asm {
-+    mov ecx,z_c
-+    pushfd
-+    pop eax
-+    mov edx,eax
-+    xor eax,ecx
-+    push eax
-+    popfd
-+    pushfd
-+    pop eax
-+    xor eax,edx
-+    mov z_a,eax
-+  };
-+  have = z_a;
-+  #endif
-   #endif
-   return(have);
- }
-@@ -196,238 +252,268 @@
-   cpu = "native";
- #endif
- #endif
--
--  if (!cpu && *cpu_family && *vendor_id)
-+  if (!cpu)
-   {
--    if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+    if (!cpu && *cpu_family && *vendor_id)
-     {
--      if (strstr(flags, " mmx "))
-+      #ifdef __GNUC__
-+      if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-       {
--        #if __GNUC__ > 2
--        if (strstr(flags, " 3dnow "))
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-+          #if __GNUC__ > 2
-+          if (strstr(flags, " 3dnow "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
--            if (strstr(flags, " sse "))
-+            if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-             {
--              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--              if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-+              if (strstr(flags, " sse "))
-               {
--                if (strstr(model_name, "Opteron"))
--                {
--                  cpu = "opteron";
--                }
--                else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-                 {
--                  cpu = "athlon64";
-+                  if (strstr(model_name, "Opteron"))
-+                  {
-+                    cpu = "opteron";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                  {
-+                    cpu = "athlon64";
-+                  }
-+                  else
-+                  {
-+                    cpu = "k8";
-+                  }
-                 }
--                else
-+                #endif
-+                if (!cpu)
-                 {
--                  cpu = "k8";
-+                  if (strstr(model_name, "Athlon(tm) 4"))
-+                  {
-+                    cpu = "athlon-4";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) MP"))
-+                  {
-+                    cpu = "athlon-mp";
-+                  }
-+                  else
-+                  {
-+                    cpu = "athlon-xp";
-+                  }
-                 }
-               }
-+
-+              if (!cpu && (atoi(model) > 3))
-+              {
-+                cpu = "athlon-tbird";
-+              }
-               #endif
-+
-               if (!cpu)
-               {
--                if (strstr(model_name, "Athlon(tm) 4"))
--                {
--                  cpu = "athlon-4";
--                }
--                else if (strstr(model_name, "Athlon(tm) MP"))
--                {
--                  cpu = "athlon-mp";
--                }
--                else
--                {
--                  cpu = "athlon-xp";
--                }
-+                cpu = "athlon";
-               }
-             }
- 
--            if (!cpu && (atoi(model) > 3))
--            {
--              cpu = "athlon-tbird";
--            }
--            #endif
--
-+            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-             if (!cpu)
-             {
--              cpu = "athlon";
-+              int model_num = atoi(model);
-+              if ((model_num == 9) || (model_num >= 13))
-+              {
-+                cpu = "k6-3";
-+              }
-+              else
-+              {
-+                cpu = "k6-2";
-+              }
-             }
-+            #endif
-           }
-+          #endif
- 
--          #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-           if (!cpu)
-           {
--            int model_num = atoi(model);
--            if ((model_num == 9) || (model_num >= 13))
--            {
--              cpu = "k6-3";
--            }
--            else
--            {
--              cpu = "k6-2";
--            }
-+            cpu = "k6";
-           }
--          #endif
--        }
--        #endif
--
--        if (!cpu)
--        {
--          cpu = "k6";
-         }
-       }
--    }
--    else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
--    {
--      #if __GNUC__ > 2
--      if (strstr(flags, " mmx "))
-+      else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-       {
--        if (strstr(flags, " sse "))
-+        #if __GNUC__ > 2
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " sse2 "))
-+          if (strstr(flags, " sse "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--            if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-+            if (strstr(flags, " sse2 "))
-             {
--              if (strstr(flags, " lm "))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+              if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-               {
--                cpu = "nocona";
-+                if (strstr(flags, " lm "))
-+                {
-+                  cpu = "nocona";
-+                }
-+                else
-+                {
-+                  cpu = "prescott";
-+                }
-               }
--              else
-+              #endif
-+
-+              if (!cpu)
-               {
--                cpu = "prescott";
-+                if (!strcmp(cpu_family, "6"))
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  cpu = "pentium-m";
-+                  #else
-+                  cpu = "pentium3";
-+                  #endif
-+                }
-+                else
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  if (strstr(model_name, "Mobile"))
-+                  {
-+                    cpu = "pentium4m";
-+                  }
-+                  #endif
-+
-+                  if (!cpu)
-+                  {
-+                    cpu = "pentium4";
-+                  }
-+                }
-               }
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              if (!strcmp(cpu_family, "6"))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+              if (strstr(model_name, "Mobile"))
-               {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                cpu = "pentium-m";
--                #else
--                cpu = "pentium3";
--                #endif
-+                cpu = "pentium3m";
-               }
--              else
--              {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                if (strstr(model_name, "Mobile"))
--                {
--                  cpu = "pentium4m";
--                }
--                #endif
-+              #endif
- 
--                if (!cpu)
--                {
--                  cpu = "pentium4";
--                }
-+              if (!cpu)
-+              {
-+                cpu = "pentium3";
-               }
-             }
-           }
-           else
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--            if (strstr(model_name, "Mobile"))
-+            if (!strcmp(cpu_family, "6"))
-             {
--              cpu = "pentium3m";
-+              cpu = "pentium2";
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              cpu = "pentium3";
-+              cpu = "pentium-mmx";
-             }
-           }
-         }
--        else
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          int family = atoi(cpu_family);
-+          if (family > 5)
-+          {
-+            cpu = "pentiumpro";
-+          }
-+          else if (family == 5)
-+          {
-+            cpu = "pentium";
-+          }
-+        }
-+      }
-+      #if __GNUC__ > 2
-+      #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+      else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
-+      {
-+        if (strstr(flags, " 3dnow "))
-         {
--          if (!strcmp(cpu_family, "6"))
-+          if (atoi(cpu_family) > 5)
-           {
--            cpu = "pentium2";
-+            cpu = "c3";
-           }
-           else
-           {
--            cpu = "pentium-mmx";
-+            cpu = "winchip2";
-           }
-         }
-+        #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+        else if (strstr(flags, " sse "))
-+        {
-+          cpu = "c3-2";
-+        }
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          cpu = "winchip-c6";
-+        }
-       }
-       #endif
-+      #endif
- 
-       if (!cpu)
-       {
-         int family = atoi(cpu_family);
-         if (family > 5)
-         {
--          cpu = "pentiumpro";
-+          cpu = "i686";
-         }
-         else if (family == 5)
-         {
--          cpu = "pentium";
-+          cpu = "i586";
-         }
--      }
--    }
--    #if __GNUC__ > 2
--    #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--    else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
--    {
--      if (strstr(flags, " 3dnow "))
--      {
--        if (atoi(cpu_family) > 5)
-+        else if (family == 4)
-         {
--          cpu = "c3";
-+          cpu = "i486";
-         }
-         else
-         {
--          cpu = "winchip2";
-+          cpu = "i386";
-         }
-       }
--      #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+      #else //MSVC
-+      cpu = cpubuf;
-+      *cpu = 0;
-+
-+      if (strstr(flags, " sse2 "))
-+      {
-+        strcat(cpu, " /arch:SSE2");
-+      }
-       else if (strstr(flags, " sse "))
-       {
--        cpu = "c3-2";
-+        strcat(cpu, " /arch:SSE");
-       }
--      #endif
- 
--      if (!cpu)
-+      #ifdef __x86_64__
-+      if (strstr(flags, " lm ")) //64 bit
-       {
--        cpu = "winchip-c6";
-+        if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+        {
-+          strcat(cpu, " /favor:AMD64");
-+        }
-+        else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-+        {
-+          strcat(cpu, " /favor:EM64T");
-+        }
-       }
-+      #endif
-+      #endif
-     }
--    #endif
--    #endif
--
--    if (!cpu)
-+    else
-     {
--      int family = atoi(cpu_family);
--      if (family > 5)
--      {
--        cpu = "i686";
--      }
--      else if (family == 5)
--      {
--        cpu = "i586";
--      }
--      else if (family == 4)
--      {
--        cpu = "i486";
--      }
--      else
--      {
--        cpu = "i386";
--      }
-+      puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
-+      return(1);
-     }
--    puts(cpu);
--  }
--  else
--  {
--    puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
--    return(1);
-   }
-+  puts(cpu);
- 
-   return(0);
- }
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
deleted file mode 100644
index 4650bc12a7d1..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/parsegen.cpp
-+++ src/parsegen.cpp
-@@ -31,6 +31,7 @@
- #include <sstream>
- #include <set>
- #include <stack>
-+#include <cstring>
- using namespace std;
- 
- #include <errno.h>
-@@ -1828,7 +1829,7 @@
-   }
- }
- 
--int main(size_t argc, const char **argv)
-+int main(int argc, const char **argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
---- src/tools/depbuild.cpp
-+++ src/tools/depbuild.cpp
-@@ -24,6 +24,7 @@
- #include <iostream>
- #include <string>
- #include <cstdio>
-+#include <cstdlib>
- using namespace std;
- 
- #include "fileutil.h"
-@@ -183,7 +184,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
---- src/tools/strutil.h
-+++ src/tools/strutil.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <vector>
- #include <cctype>
-+#include <cstring>
- 
- struct ci_char_traits : public std::char_traits<char>
- {
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 7aa11cc2854e..9d31f7a34777 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 2a1a51359929..ee207fd3effe 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -4,5 +4,5 @@ AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
 EBUILD libglade-2.6.4-r2.ebuild 2833 BLAKE2B 9a427b6a95d8d9387b20b27cf327d57c81a668871cf0853193f499b980144caacad0ee6bcd3e0cf48655d5d4c668f8cdc43674243495d62f200925789dca4145 SHA512 3ba8b42f9a076a5bbfc103be2864494345e4095a1b4274a185af2dd00dcf92a57abbd23e7bc6bbfbaaeaf083ec36a75b88c652ebd39980c3f624f70aa5bd0fec
-EBUILD libglade-2.6.4-r3.ebuild 2492 BLAKE2B 6df61f4b2c5d4cbb89b9d51140e4d6352eb578f47e7a2ccfc8333fd30872c7cf1de69c0b4c7eafe7b0944682614352abb25c3eb2450889b2c4558856cbed8020 SHA512 4e306fbf6158927d5cd400f3492a31dcfe2d6561f41b96534920c585391c1cf6780dcb05cd5e5c576133a8bb2518145718384879756955b7552163e7cccb2945
+EBUILD libglade-2.6.4-r3.ebuild 2491 BLAKE2B 0b59af1dd9a005fc9ef906a30ac4fe3df5f44acc53bb6a1cd8e79dfcbc13ba1b274e040da03becf60b89639ce49175d4fa890a4dc1536ccb6013f26e2d2884d3 SHA512 c9ceb11b78b59349699cb99ae26ae07d2a54446d24d2483d275b2f002414c3e8384cef28e60c880246e13af8a360762cfe47080ea4ab4513a5f2c09027b8dee7
 MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
diff --git a/gnome-base/libglade/libglade-2.6.4-r3.ebuild b/gnome-base/libglade/libglade-2.6.4-r3.ebuild
index a40726551922..365c5044f8d6 100644
--- a/gnome-base/libglade/libglade-2.6.4-r3.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 147297008473..7a8593d74b40 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,4 +1,6 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
+DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
 EBUILD librsvg-2.40.21.ebuild 2639 BLAKE2B 90b8112288349552ac764ea1e148ab03df464a7f7d3c50e1da99c73116c4c6b5bab15e808e08862944ab5d18da54e2938334490ea29edf1715f043ec941adf10 SHA512 03779cf7a6f14b55e8a38c2e28e07ebbc425dce3bb59eea3542643fd6e84fb9ee51b0610bb9d73ff929ff0b7f5efdaf8b19b4696d535158d2c2b8ed7381ff34a
+EBUILD librsvg-2.48.8.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.48.8.ebuild b/gnome-base/librsvg/librsvg-2.48.8.ebuild
new file mode 100644
index 000000000000..c5ec2752fa96
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.48.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 multilib-minimal rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.39[${MULTILIB_USEDEP}]
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 020746be9b84..efffbd0e0b7f 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 8f855b88af2e..8ea307d993b0 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
+DIST yelp-xsl-3.36.0.tar.xz 642608 BLAKE2B 59ee903e4d6cf6e0d40ff6ddecab8d65e9d81f9889afc37b4369136728cb5962d6e941ab39b80ed6e0613f172546cf659ea57a4b77c0f4633463f2b760bf0aeb SHA512 50544ae434a93cf37779db3be4e2b8d4eebd3575e9d31d3db8426f686ae262f4655d8d4b957e673daba4314d8e1c4c7a5e6485ca17b6627424b18087acd74a12
 EBUILD yelp-xsl-3.34.2.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
+EBUILD yelp-xsl-3.36.0.ebuild 566 BLAKE2B 2f9c5b6e1a35587611956ed392c563f41406a40f03db3881c8feb74b885bd904427d7d1df5d3a6634f85df15ed0fbc87264885a9d57b541f4041c3f390b9c3e1 SHA512 18f003fc43fc925eb3b05c27787001dc4be392403e35039efba3fe00b75aed96fb6525d6b8939eaeb90a88a843bc562e8888b012d3844d91d20c7582a4f43bcf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
new file mode 100644
index 000000000000..28f7695035cc
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index f143cdff8430..fe0147a68ee3 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
+DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
 EBUILD yelp-3.34.0.ebuild 1236 BLAKE2B 4718064927a9cafcbbb1b53146e4d25916183d90e8d7c6c86270d8a547af7f027ae23abeaaeb4103836dd59ffafc3ba6e0badc8b84667bfec5da5ead18ebbf0b SHA512 49c550d5ec380c1708661b6de856bfe610443938ff04d5b10215abdac197fb4c8a24b489c6a7cd3874b595f14d37adfc5cd32b014f4476290fa50fdff5fef50d
+EBUILD yelp-3.36.0.ebuild 1238 BLAKE2B 9e10d20d864b6ad0b1214ccfacba54bdf6fa10bbd5219ae2e06253fa1763b74d0ad0413adf3305612c38a9911d794f5207f420f304de283bd73230524287baa9 SHA512 775012e60d8eae89f4bf4501f463bbfcd0594790adf8c944414385037ad6fcd7597797f39294768b501496f2511e16866ed78b4f096404899836f7dc341840f3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.36.0.ebuild b/gnome-extra/yelp/yelp-3.36.0.ebuild
new file mode 100644
index 000000000000..4fca088de720
--- /dev/null
+++ b/gnome-extra/yelp/yelp-3.36.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index e5355efd1079..bb0ebd6e3cab 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 172dbc65833e..2c876601a613 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,7 @@
+AUX ark-20.04.3-CVE-2020-16116.patch 1819 BLAKE2B 878e3046b1096bb5c9ec1ba64fcb2350b025f87295350182df435ad05302415ac486c51be39ac4c561d41930998a0b8b0031d5240dbcf085f275375e453eb640 SHA512 953ca28531a92198f9d5e429cea85e2887b88e5132093845c3f52615e7f736b592bea8d80c98a7c198685062ef47efc463e5cecacca5470cf920f00bfc461e41
 DIST ark-19.12.3.tar.xz 2586112 BLAKE2B c4bde5469dde1ac7cc48b4ecfec260596e2bd3123d9b7c83a5281f45d17675477c2641b708469301e536f04f0e2b469e733c9f95053201682e4af1c2bf378226 SHA512 0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a
 DIST ark-20.04.3.tar.xz 2586436 BLAKE2B 98343a4bc91fd13a33ba9dd69487c27433435d4bff722245c2cde02191017f4fa0b2d15213b97a86c3ecd87a17bf59e62a80b63c6684c813845bec9bab58f441 SHA512 6274483bc7cad9b8b3842a622a3f243fd5756aec147624eb9041459efd5c833e203c286412185bb105133d8c83a7503c8c7e519b8cb9cbd13830793c3429e142
 EBUILD ark-19.12.3.ebuild 2247 BLAKE2B 051b5d50521be9f15a1e072171a934db35b7f7baf578824329c5852668f81f104b99516b2561c9982cf5619eba82477fed99599879cd50617b6ad8cee51ba54e SHA512 a331b79aee1a6a9f4f33dc04aba0365cbb10e51693813477c746b27848f663dbb35a899fe629b816839276a2024705264c67d650b75450358f00f50721d602ff
+EBUILD ark-20.04.3-r1.ebuild 2262 BLAKE2B 8a8312ee001aa50c0e7cdb5ba5e006f7d712db1dac42b4f208d9f051fdc56a61d4465248fea8f20d20df75f8247ac443731572f26dd2c3890e40a731dc1c5758 SHA512 3455fba23b11102f56274157cb311a2e025cc65b83a3aefa853871c7704a0e77235747096e057d76e34fa72bc3a3c501b15013ea073873e363d168d175abc6e9
 EBUILD ark-20.04.3.ebuild 2207 BLAKE2B cfcbac84044c8f160dc928103d93cbc980917c41917ad5447d2e09c421fa71df73f6744e6b621a8972c106c2e4ad5b0caf788722f7451f3d11b1ef1f489caae6 SHA512 18d6cb2b7594a3c964a7685d4bc2340d1d9f7a3d057e2c6c7dd6ec552022ada26c8953c8f6df56b78aaf957e42f1a5d713ddb23166b3e027821d0d75623ac630
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-20.04.3-r1.ebuild b/kde-apps/ark/ark-20.04.3-r1.ebuild
new file mode 100644
index 000000000000..0777dc7a6bc5
--- /dev/null
+++ b/kde-apps/ark/ark-20.04.3-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.70.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark
+https://utils.kde.org/projects/ark/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bzip2 lzma zip"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-16116.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package bzip2 BZip2)
+		$(cmake_use_find_package lzma LibLZMA)
+		$(cmake_use_find_package zip LibZip)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version app-arch/rar; then
+			elog "For creating/extracting rar archives, installing app-arch/rar is required."
+			if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+				elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
+			fi
+		fi
+
+		has_version app-arch/p7zip || \
+			elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+		has_version app-arch/lrzip || \
+			elog "For handling lrz archives, install app-arch/lrzip."
+	fi
+}
diff --git a/kde-apps/ark/files/ark-20.04.3-CVE-2020-16116.patch b/kde-apps/ark/files/ark-20.04.3-CVE-2020-16116.patch
new file mode 100644
index 000000000000..79129c7be6e1
--- /dev/null
+++ b/kde-apps/ark/files/ark-20.04.3-CVE-2020-16116.patch
@@ -0,0 +1,46 @@
+From 0df592524fed305d6fbe74ddf8a196bc9ffdb92f Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Wed, 29 Jul 2020 23:45:30 +0200
+Subject: [PATCH] Fix vulnerability to path traversal attacks
+
+Ark was vulnerable to directory traversal attacks because of
+missing validation of file paths in the archive.
+
+More details about this attack are available at:
+https://github.com/snyk/zip-slip-vulnerability
+
+Job::onEntry() is the only place where we can safely check the path of
+every entry in the archive. There shouldn't be a valid reason
+to have a "../" in an archive path, so we can just play safe and abort
+the LoadJob if we detect such an entry. This makes impossibile to
+extract this kind of malicious archives and perform the attack.
+
+Thanks to Albert Astals Cid for suggesting to use QDir::cleanPath()
+so that we can still allow loading of legitimate archives that
+contain "../" in their paths but still resolve inside the extraction folder.
+---
+ kerfuffle/jobs.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp
+index fdaa48695..f73b56f86 100644
+--- a/kerfuffle/jobs.cpp
++++ b/kerfuffle/jobs.cpp
+@@ -180,6 +180,14 @@ void Job::onError(const QString & message, const QString & details)
+ 
+ void Job::onEntry(Archive::Entry *entry)
+ {
++    const QString entryFullPath = entry->fullPath();
++    if (QDir::cleanPath(entryFullPath).contains(QLatin1String("../"))) {
++        qCWarning(ARK) << "Possibly malicious archive. Detected entry that could lead to a directory traversal attack:" << entryFullPath;
++        onError(i18n("Could not load the archive because it contains ill-formed entries and might be a malicious archive."), QString());
++        onFinished(false);
++        return;
++    }
++
+     emit newEntry(entry);
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 9075a05a9226..5df8ef66c1e0 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,7 @@
+AUX kdepim-runtime-20.04.3-CVE-2020-15954.patch 891 BLAKE2B 842b8bdf564a18b70fba9f5135e56e1ea351bb4e4f3afd22f49be32b9eae89cee18272ab20b2c34d4b6c23405f33978bfdf5fa460477dd41c8c430ea796147bf SHA512 3c30ec3e482683b78384704f3c67d41beeb5b59bc8d2815998bc5b197d3fb3c94c14aabc27db35e681a7bd39b071da7a4a150143dddf7629c1440e71e74689a6
 DIST kdepim-runtime-19.12.3.tar.xz 1736984 BLAKE2B fdb6e010a6944738ea3618183e709ed8ff93e199be18c5a7a3695f8ec83d23e1a92e181d73decefb6266e24ec1f149933620aae236c24769f26d4db1e656c154 SHA512 0a851ac588ac8b78f31344712badcf8770e5d1effe488aaa70baf695034bfa75fd08d6a2b30fa43856b800f9d016551213960495ba1ef4687ae38f88fad08b3b
 DIST kdepim-runtime-20.04.3.tar.xz 1739888 BLAKE2B 514bd4167e961a079397df11331abcf7a308071306f53be18386106eb14cca99c5c984f9bc69d1f361cb7f93d2b41a1568175f889df48f513b4d89d94f906afe SHA512 2b6e88a61606a833fc7376e9f28f347261c8a7000baf91cb2f0ff2a7df465c8a642c64aabf0e1d064859cab2daf0ef84116f47c043d3cdcea0bfbbe102c12d19
 EBUILD kdepim-runtime-19.12.3.ebuild 2468 BLAKE2B 357b9416270ec12a6677ebbdeaa0250ed9febba599057ee88b28a45a73a0eb463425de2f6e394cb9562bf16c13f8e7f6460babf273e905fdb5d7882d69edd14c SHA512 c0ccb25d1ea0493bb86497e6f0bf740c9471b61c3f85df8c10b2a0987cfe7c7031df8a97622c01d4e01c2becbd29cafa7c39bbb3112d1d40e39b3ac443c6b5fa
+EBUILD kdepim-runtime-20.04.3-r1.ebuild 2490 BLAKE2B 9243a6fb0b8b479a8c6a289b47b3772cd74f0211adfaf08240336f8b6704368357e01e977d43e3af014fdb2ff193f4272f1d2e19112fd9ed05fc8866e5435c66 SHA512 df1f5f7e2051c58f634d42ea452f2795174dc3193cedfa2cc7f75fc453d9eadad72a6662858437d811fa26d67e9693aa5c0f4732b1c11ce8aa8b492b3baeabb8
 EBUILD kdepim-runtime-20.04.3.ebuild 2435 BLAKE2B fbd96f14f9cd70dbb859a582cd884630fbe23555bf4489428320db81bb7b4386816743fa4b5f1b8eee465694a645950ea53619eb2218f6c950755f90c945ed44 SHA512 5799348bce8acd6193a6c0e7b97775ba5acfdf9af40d7f72728a5f4cc192b7c24cb366e5bb7628fc9faeb81e5a707b7cf121a76097961e86572f6767cb183864
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..92fec0bbcfcb
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
@@ -0,0 +1,28 @@
+From bd64ab29116aa7318fdee7f95878ff97580162f2 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 28 Jul 2020 13:35:24 +0200
+Subject: [PATCH] Fix Bug 423426 - POP3 setup wizard defaults to unencrypted
+ connections
+
+Make sure to use TLS when we create it
+CCBUG: 423426
+---
+ resources/pop3/wizard/pop3wizard.es | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
+index 81d511d0a..aa83d0abf 100644
+--- a/resources/pop3/wizard/pop3wizard.es
++++ b/resources/pop3/wizard/pop3wizard.es
+@@ -53,7 +53,7 @@ function setup()
+   var smtp = SetupManager.createTransport( "smtp" );
+   smtp.setName( SetupManager.name() );
+   smtp.setHost( page.widget().outgoingAddress.text.trim() );
+-  smtp.setEncryption( "NONE" );
++  smtp.setEncryption( "SSL" );
+ 
+   SetupManager.execute();
+ }
+-- 
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
new file mode 100644
index 000000000000..5284241615df
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.70.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# TODO kolab
+BDEPEND="
+	dev-libs/libxslt
+"
+RDEPEND="
+	>=app-crypt/qca-2.3.0:2
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	|| (
+		>=kde-frameworks/kdav-${KFMIN}:5
+		>=kde-apps/kdav-${PVCUT}:5
+	)
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 1627c5634155..1349efab8eb4 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,7 @@
+AUX kmail-account-wizard-20.04.3-CVE-2020-15954.patch 2790 BLAKE2B be3a02e7d3c12d121196a0230c42094a2f9cf6ad562adcd3de2693a7702c1fa1df6c4ceb3f7e20547b83627350db0d8566688ef9f9c62d18691ef2ae46aae3d7 SHA512 d680fdd9cc506cadbf3f62e639acbf152a958230fb0b5b014a99af9fa0a25f54aaf95cb005b213dbdb005f3f41012319154594b79e68162ea4b5dcd436df4a2c
 DIST kmail-account-wizard-19.12.3.tar.xz 158392 BLAKE2B 0d7bbe070ecf50665915c3e353eb7c0bda7208989f5702a8ac11d1419e471568db62491bf335f468798665d8fff99166f5cb716527caf35adce2089f28f0f02b SHA512 07bbf4f935c411cf1a7b25654af2b2123d763b0136880a814a310e689ad7ea508f6b943743980ce3bff339c56f9157c35368ff77401ca7b6b50ce1409286b216
 DIST kmail-account-wizard-20.04.3.tar.xz 158132 BLAKE2B 237e1d9535c1dde19ad21ceed08177da0d98cc773a96785afaa14a8e780573f30ad4ab9ba946314ce440093923acc3dbc91406c598f02b017556a74d9fe8df52 SHA512 71a305dcf51fe20d700c181f0a13981bae243e2a3d9080e58cc4ec24a1adc625f500936656b732fd419cfbfef9258af1ace45789c7756687a22788fc5d9da296
 EBUILD kmail-account-wizard-19.12.3.ebuild 1579 BLAKE2B 49f0af1d780f5f92820bfb4b0f1b76c17d0db2b49eea4c15b27240077f0a32a83114381022bb4b4f133800dc6da9a46c3a9103238fd63465286b08f41de7e2d5 SHA512 c04db238555bc0579f51d01f59d93967f60a31ae9df570a6a414b18c4673bb3effa7b9f879116b5c6d3a61f8352349f16ba9d55224a49c6f0de4a2c20d73385e
+EBUILD kmail-account-wizard-20.04.3-r1.ebuild 1635 BLAKE2B 6fd562588803bcc3d3f48a5252eb3691da355f3ab401c08d0b8cdcbaf85103e97d2514885bb04a3000d333a02fd386d1f452fcd2b77de0c25817801e4334ee3b SHA512 b71f983359595de533a9fd576b3dbc956e7c323b341648cd381c9bee26e5b55e757d486dc04824c7db21a0678a2ef1ba104032025c39a1e4b40285bb62ec946a
 EBUILD kmail-account-wizard-20.04.3.ebuild 1580 BLAKE2B 072fadf5cd1288eed0aaafa122811b7d7c495763fa3edaa25dbd590314f704928279810b0866c1b16aa7c7f2744c822e87674fe98279dd9ec77c13dbe533608b SHA512 ecd197f5c68e3fa9d7b958c27d0e4b9e303e1731b4831f34ff27425b2ba31eb6a683666d6ce0d0e92963f98ac20e1498bf8358a95e7318ed02760b9db06bf3cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch b/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..a1c63e3a3a1d
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
@@ -0,0 +1,81 @@
+From a64d80e523edce7d3d59c26834973418fae042f6 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 28 Jul 2020 13:52:19 +0200
+Subject: [PATCH] Show info about encryption/authentication settings
+
+CCBUG: 423426
+---
+ src/transport.cpp | 18 +++++++++++++++---
+ src/transport.h   |  2 ++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/transport.cpp b/src/transport.cpp
+index 567df31..26344ef 100644
+--- a/src/transport.cpp
++++ b/src/transport.cpp
+@@ -53,14 +53,16 @@ static const StringValueTable<MailTransport::Transport::EnumAuthenticationType>
+ static const int authenticationTypeEnumSize = sizeof(authenticationTypeEnum) / sizeof(*authenticationTypeEnum);
+ 
+ template<typename T>
+-static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string)
++static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string, bool &valid)
+ {
+     const QString ref = string.toLower();
+     for (int i = 0; i < tableSize; ++i) {
+         if (ref == QLatin1String(table[i].name)) {
++            valid = true;
+             return table[i].value;
+         }
+     }
++    valid = false;
+     return table[0].value; // TODO: error handling
+ }
+ 
+@@ -98,6 +100,7 @@ void Transport::create()
+     mt->setAuthenticationType(m_auth);
+     m_transportId = mt->id();
+     mt->save();
++    Q_EMIT info(i18n("Mail transport uses '%1' encryption and '%2' authentication.", m_encrStr, m_authStr));
+     MailTransport::TransportManager::self()->addTransport(mt);
+     MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
+     if (m_editMode) {
+@@ -154,12 +157,21 @@ void Transport::setPassword(const QString &password)
+ 
+ void Transport::setEncryption(const QString &encryption)
+ {
+-    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption);
++    bool valid;
++    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption, valid);
++    if (valid) {
++        m_encrStr = encryption;
++    }
+ }
+ 
+ void Transport::setAuthenticationType(const QString &authType)
+ {
+-    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType);
++    bool valid;
++    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType, valid);
++    if (valid) {
++        m_authStr = authType;
++    }
++
+ }
+ 
+ int Transport::transportId() const
+diff --git a/src/transport.h b/src/transport.h
+index 3773b04..6415bf9 100644
+--- a/src/transport.h
++++ b/src/transport.h
+@@ -53,6 +53,8 @@ private:
+     QString m_password;
+     MailTransport::Transport::EnumEncryption::type m_encr;
+     MailTransport::Transport::EnumAuthenticationType::type m_auth;
++    QString m_encrStr;
++    QString m_authStr;
+ 
+     bool m_editMode;
+ };
+-- 
+GitLab
+
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
new file mode 100644
index 000000000000..09eacba29859
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.70.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 7b8f20c209f9..97ca2af916f4 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 12effdae1c76..ec463784219c 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,8 +1,4 @@
-AUX kdiff3-1.8.2-crash-w-o-clipboard.patch 950 BLAKE2B a075e1e8a06958e5f849b024d65f7d709be49a7facda5b4bd2a223374735a80b19a94ee983c9d1245733fed6c46f6d4c70cf631d32c2c2aa5f345b999e437674 SHA512 43d0c4898841fb822571502257a0d7acd359deaa7e906a0a80fb9d2f9cb8b61008a6b96d08acf74d5a76534b519fc6f3435e08034651aa4572c637817be4e025
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
-EBUILD kdiff3-1.8.2-r1.ebuild 1092 BLAKE2B 9e32869ac25e4341b2604e001a6e7079ea02487d5a5349756fb7931e1554327814a22295978448a0bc164abd56cbcfa0991d4886b5cded7c19a8d8880207d06c SHA512 624c8c8d282bdcf5d0797b795decc55fbe558a590e240586967f064623281444a8f722c1a0d66db8eca3de22a058288bd14601d686afec33068c20aa29399e15
 EBUILD kdiff3-1.8.3-r1.ebuild 1078 BLAKE2B fefd53a09e26ab9c0c699ad7f939ba456d55e2497220159a6c3b06497d79f1c8e2de6f3c00e7aabf85fdc861af7bc1ff709b81d9ffa71ea84745b5bc7b3ed258 SHA512 59142b7b8b835121f61c7013f8f678bea635e03440041abdfe11da3d9fe6d62c6acee158f05197dc92c9ca45362035f4a5a504acfb664319d6060c994963da5e
-EBUILD kdiff3-1.8.3.ebuild 1036 BLAKE2B 8c6d9b36f5eb10d6c2f5af8075ec1e4b08c28377b6c9e4cfab49ed2a4dcbc51a5ae40320e840559f897c4de0eb59b1b14458131c20296d71b3888ee5d43f6e07 SHA512 54a845c025f3c771e8d1eebec160d94dcc86c82958c0b5d9755ac5868d5f765ca94607178857d3a9dce88d121793e11ac46138e42d63e30372f81a3a6bd70962
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch b/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
deleted file mode 100644
index b1d00a12f47d..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-1.8.2-crash-w-o-clipboard.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 643edc26bcc8f8e083a97e87c2686f62ffd01f31 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <cfeck@kde.org>
-Date: Thu, 30 Apr 2020 18:27:58 -0400
-Subject: Fix crash when clipboard is not available
-
-Summary:
-QClipboard::mimeData() can be nullptr according to documentation.
-
-BUG: 419722
-FIXED-IN: 1.8.3
-
-Reviewers: mreeves
-
-Reviewed By: mreeves
-
-Differential Revision: https://phabricator.kde.org/D29248
----
- src/pdiff.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pdiff.cpp b/src/pdiff.cpp
-index f3f2284..3588e3e 100644
---- a/src/pdiff.cpp
-+++ b/src/pdiff.cpp
-@@ -1577,7 +1577,7 @@ void KDiff3App::slotClipboardChanged()
- {
-     const QClipboard* clipboard = QApplication::clipboard();
-     const QMimeData* mimeData = clipboard->mimeData();
--    if(mimeData->hasText())
-+    if(mimeData && mimeData->hasText())
-     {
-         QString s = clipboard->text();
-         editPaste->setEnabled(!s.isEmpty());
--- 
-cgit v1.1
-
diff --git a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
deleted file mode 100644
index 0659672ef390..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-crash-w-o-clipboard.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
deleted file mode 100644
index 50728ca4d608..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 7087dd0eaf3a..22c8e7d8d38b 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,7 +1,3 @@
-AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
-AUX skanlite-2.1.0.1-hidpi.patch 2234 BLAKE2B c2867f5d6251b2258097e1682e2cc8a8263631000f32701802940d84d63e657d12a45b326932d3bb087c571928b08529d2e050cf5298addcb9749d38337a3635 SHA512 d5c559a8d057acce73db1252d52299a72788554845dd0a00fb000c15b7d0a4ba8d20f72a24dddd032c2cb8cf84ff6bef9b2d365cbb70e98f7003523d479e9e92
-DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
 DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
-EBUILD skanlite-2.1.0.1-r1.ebuild 1040 BLAKE2B 68f0e4f91e43a3e5b2acd4b9c7d809fcce8d8136fd1cd1ede94f36943b21da2d0339efd6775c4d2cc4b96e2a80f23b8d1511bb2614c2178adb28eb5976dc39e4 SHA512 0066e2f8de64404fac44075e2a9c67d4c77e24f62b2d39039ae42de5cfe310041d1edd8f7c3c5cb1cb3143b91edcef27a6884c2fadefa9612cec7b83c1cf3748
 EBUILD skanlite-2.2.0.ebuild 963 BLAKE2B ed5ce6f331c0919afb9885e92ec305bdefc1adc7f9d54ee6c70fdb38a283447797f628392786f8e1de286dd56e28e1764fcc4fab1f34be7d12c7503c163fe99c SHA512 081d96ae41052eb8b8755eebb6c3cf6e34fb629a83de74f4dedea41e94d90de63347058760616a1d25859286881aa5c757f0ad7d93875f3646c65a93a303e14e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
deleted file mode 100644
index 7b7daae11eac..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 2 Apr 2018 21:27:52 +0200
-Subject: [PATCH] Cleanup CMakeLists.txt
-
-Summary:
-Cleanup duplicate find Qt5 and move all below #Dependencies block.
-Sort dependencies.
-KF5Sane is not an actual framework, so separate it from KF5 modules.
-
-Make use of FeatureSummary
-
-Reviewers: sars
-
-Reviewed By: sars
-
-Subscribers: ltoscano
-
-Differential Revision: https://phabricator.kde.org/D11861
----
- CMakeLists.txt | 32 +++++++++++++++-----------------
- 1 file changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c23351..6b326df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(GenerateExportHeader)
- 
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
--
- # be not so strict with the poor developer who just wants to use strings
- remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
- 
--set(KF5_VERSION "5.1.0")
-+set(REQUIRED_QT_VERSION "5.2.0")
-+set(KF5_MIN_VERSION "5.1.0")
- 
- ecm_setup_version(
--  ${KF5_VERSION}
-+  ${KF5_MIN_VERSION}
-   VARIABLE_PREFIX SKANLITE
-   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
-   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
- )
- 
-+set(SKANLITE_VERSION_STRING "2.1.0.1")
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
-+
- # Dependencies
--set(REQUIRED_QT_VERSION "5.2.0")
-+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
- 
--# Required Qt5 components to build this framework
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
- find_package(PNG REQUIRED)
--
- include_directories(${PNG_INCLUDE_DIRS})
- 
--set(SKANLITE_VERSION_STRING "2.1.0.1")
--
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
--
--find_package(KF5 ${KF5_VERSION} REQUIRED
--    COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-         CoreAddons # KAboutData
-+        DocTools # yields kdoctools_create_handbook
-         I18n
--        XmlGui # KAboutApplicationDialog
-         KIO # contains the KIOWidgets which we use in target_link_libraries
--        DocTools # yields kdoctools_create_handbook
--        Sane # will find KF5Sane
-+        XmlGui # KAboutApplicationDialog
- )
- 
-+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
-+
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- 
- # Subdirectories
-@@ -62,6 +58,8 @@ add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(autotests)
- add_subdirectory(tests)
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
--- 
-2.16.3
-
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
deleted file mode 100644
index 563f5950063a..000000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Thu, 25 Apr 2019 18:09:59 +0300
-Subject: Add HiDPI support
-
-Reviewers: sars, davidedmundson, ngraham
-
-Reviewed By: sars
-
-Differential Revision: https://phabricator.kde.org/D20821
----
- src/ImageViewer.cpp | 14 +++++++++++---
- src/main.cpp        |  1 +
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp
-index 09f9b3d..5cf1439 100644
---- a/src/ImageViewer.cpp
-+++ b/src/ImageViewer.cpp
-@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img)
-     }
- 
-     d->img = img;
--    d->scene->setSceneRect(0, 0, img->width(), img->height());
-+    const auto dpr = devicePixelRatioF();
-+    d->img->setDevicePixelRatio(dpr);
-+    d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr);
- }
- 
- // ------------------------------------------------------------------------
- void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect)
- {
-     painter->fillRect(rect, QColor(0x70, 0x70, 0x70));
--    painter->drawImage(rect, *d->img, rect);
-+    QRectF r = rect & sceneRect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr);
-+    painter->drawImage(r, *d->img, srcRect);
- }
- 
- // ------------------------------------------------------------------------
-@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize()
- // ------------------------------------------------------------------------
- void ImageViewer::zoom2Fit()
- {
--    fitInView(d->img->rect(), Qt::KeepAspectRatio);
-+    QRectF r = d->img->rect();
-+    const auto dpr = d->img->devicePixelRatio();
-+    r = QRectF(r.topLeft() / dpr, r.size() / dpr);
-+    fitInView(r, Qt::KeepAspectRatio);
- }
- 
- // ------------------------------------------------------------------------
-diff --git a/src/main.cpp b/src/main.cpp
-index aa704be..ae0d9b6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -34,6 +34,7 @@
- 
- int main(int argc, char *argv[])
- {
-+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite"));
--- 
-cgit v1.1
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
deleted file mode 100644
index 1a7a7c968a19..000000000000
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
-SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libksane-19.04.0:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/libpng:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-hidpi.patch"
-)
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b4f4048ff4b6..7118d443ffde 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 4d11821aba77..5330cca45df0 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,8 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
+AUX kscreenlocker-5.19.5-ck-unlock.patch 906 BLAKE2B 5551961d457f2d74cd956b779cbf7282e51ac97df7b112600fe5d5a3f6c5dba9545df143077eff01cfc1b67af5ad2f344af6f0007c33aa78901a18cc872f0dd0 SHA512 541b7e6d7b8feed1455879a03cce78be0b944aee798cd67fa4ead86bcb0e6e7c4b4468f4813dd1785e35acc7065e45afec7f430a869ef15ec27101905b616a62
 DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
 DIST kscreenlocker-5.19.4.tar.xz 126328 BLAKE2B a09e37b59231570519399332fdcd7d759bace113d9edcb0ea0f27bcc4b64ae39e70781de004eddbaebb51455cff3dbb1377c265bda97ffce5f03c8da4cd9c1af SHA512 d26b776d30447ed8260eae01f560966fe98e2e6d7686f2e73a5df906a43e3c115844cd8b016ddac1a4024f8c9189b93613559875f0b573f2d18fc352571dffcf
 EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
-EBUILD kscreenlocker-5.19.4.ebuild 2355 BLAKE2B 77c2afbea14eea51d600c3341596aee500b61cbceffe8645d97f53f42f3cce670ab660b42a1ca4001b093ce1d60eb84202e4efc1fb5937ec504150b06bce355f SHA512 527247581e1653caaa15a4af66b7f79452d9dcc25d1f60d3749454fe4e807fe9886c649790acfc57539a644024793f8af60afe361b334273cb633c8dd463f622
+EBUILD kscreenlocker-5.19.4-r1.ebuild 2336 BLAKE2B 9437b05f26ab01fddc32199d6f59b724fda45ee0a166c9e06f7accdf484ea92162c95a7436db5c1b795cd777b1ad12b4bdfa454187a547cb1aae169fac19501c SHA512 d25582331875bc370469e54b4ec55d69db4af986c0fb511116d130482a7836a42e4853e728fe51f01fef5b90e95ece6fa3c2e67e245abc7e4159f3a9ea3142fa
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch
new file mode 100644
index 000000000000..bb15eba72b86
--- /dev/null
+++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch
@@ -0,0 +1,32 @@
+From 1bac5f6e50bc3255ab0e4c9183e7456f53acfdd5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 1 Aug 2020 20:05:17 +0200
+Subject: [PATCH] Provide ConsoleKit switch irrespective of HAVE_LOGINCTL
+
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60d3ee1..aaebc82 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,7 +92,6 @@ set_package_properties(loginctl PROPERTIES
+     )
+ set(HAVE_LOGINCTL ${loginctl_FOUND})
+ 
+-if ( NOT HAVE_LOGINCTL )
+     find_package(ConsoleKit)
+     set_package_properties(ConsoleKit PROPERTIES
+         URL "https://github.com/ConsoleKit2/ConsoleKit2"
+@@ -100,7 +99,6 @@ if ( NOT HAVE_LOGINCTL )
+         TYPE RECOMMENDED
+         )
+     set(HAVE_CONSOLEKIT ${ConsoleKit_FOUND})
+-endif ()
+ 
+ if (HAVE_LOGINCTL OR HAVE_CONSOLEKIT)
+     set(HAVE_UNLOCK_CAPABILITY TRUE)
+-- 
+2.28.0
+
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
similarity index 91%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.19.4.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
index 57a7aacb9acf..8848223ae78c 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
@@ -15,9 +15,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
+IUSE="consolekit +pam"
 
 RDEPEND="
 	dev-libs/wayland
@@ -49,7 +47,6 @@ RDEPEND="
 	x11-libs/xcb-util-keysyms
 	consolekit? ( sys-auth/consolekit )
 	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
 "
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
@@ -60,6 +57,8 @@ PDEPEND="
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 
@@ -79,10 +78,10 @@ src_test() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON
+		$(cmake_use_find_package consolekit ConsoleKit)
 		-DPAM_REQUIRED=$(usex pam)
 		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
 	)
 	ecm_src_configure
 }
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index e688a67dc1f9..7381f47b0200 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,7 +1,8 @@
 AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
+AUX powerdevil-5.19.4-ddcutil-0.9.9.patch 975 BLAKE2B b151f0109b4ee804359c63171df3020334f8410baaa4f24155d9f478540254645866eabb594040f334ae811d2bb6c4016cb5c175a64626aafd229babe312e391 SHA512 d1bfb6d7b16b80077989af9bf7600d063c5811d1fa115ce8985099022b468bacd54a4cd41283766780eb5734dc3d8d26798c9d74f5aa7f2bc003aa76b7c131ad
 DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
 DIST powerdevil-5.19.4.tar.xz 600236 BLAKE2B f4357ba9307bbdd11a7353191bacabc2363038f0d16f86ff6e4c3fef33b828de51c96bdad42f0c10818c378b14d5bc00c7176e6fcccb5ec1f87a1cedfbdcec30 SHA512 ff74aa963adf3ebb8366d4ae129f41c7761983e956ebc10c1640a2c1be25879c77605209a861d4898843741d3c087dab1343a6cd3c4aa6e261159c6058eb5640
 EBUILD powerdevil-5.18.5-r1.ebuild 1955 BLAKE2B dd399d4215373ca4e4ddcd8746d0d2f809bec25f3ab771723eded65fa3a9513780d50e33b8f808651e9059ff11ad595a15a19bb6f9f7f42f26bdd7d8d3071e4f SHA512 a6b9381c04af9a398640dfcb3c2752f94d1c7b35c6d04b232ff66b0ff8c58172d85376d71d35d151526298bac19dae53b55e53f6f8e815eb5f28292dacd91432
 EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
-EBUILD powerdevil-5.19.4.ebuild 1875 BLAKE2B c2b8272b452f12f651f9f26b6f4c49489096706fc402c2cfb960c8cd5f94b6f4c1d1a5cfdf60696d38afe5658d3d69bfb2d55973a428b3b219ce060f9e09c3c0 SHA512 7ee09fe0e9525bf6690676848dfc744e0bc8d76beb0a90621086ee315b127ea162fe1a97ed5daae6ddd69302c1268e370f521d7dcae88a9d3633369e1484406a
+EBUILD powerdevil-5.19.4.ebuild 1940 BLAKE2B 8482b7429a0eec4512423716acc3a8c58bf2a816d94cb39b383dd160c4c2878cb212ce57e6ff76bc315534cc275711dda9b191350d06e484b9aa8df1b95080a1 SHA512 6e2823b8795471816db8b063431afba5f45ceb49e0fc54c31de31beddbc8a953e4aeee1e4cbc0cafd5f087d96101d755c1d8c446d89767b52f5491f071cf6eb3
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
new file mode 100644
index 000000000000..3a1c4c381557
--- /dev/null
+++ b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
@@ -0,0 +1,24 @@
+From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
+From: Johannes Jordan <kde@lanrules.de>
+Date: Mon, 29 Jun 2020 10:51:40 +0000
+Subject: [PATCH] Fix compilation with ddcutil 0.9.9
+
+---
+ daemon/backends/upower/ddcutilbrightness.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/daemon/backends/upower/ddcutilbrightness.cpp b/daemon/backends/upower/ddcutilbrightness.cpp
+index e712c05a..a75aac5c 100644
+--- a/daemon/backends/upower/ddcutilbrightness.cpp
++++ b/daemon/backends/upower/ddcutilbrightness.cpp
+@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
+         
+         DDCA_Feature_List vcpList;
+         ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
+-        qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
+         QVector<uint16_t> tmpVcpList;
+         for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
+             DDCA_Non_Table_Vcp_Value returnValue;
+-- 
+GitLab
+
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
index 4f9763f2ecb9..4452b67c937d 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
 	>=sys-power/upower-0.9.23
 "
 
+PATCHES=( "${FILESDIR}/${P}-ddcutil-0.9.9.patch" ) # bug 734918
+
 src_configure() {
 	local mycmakeargs=(
 		-DHAVE_DDCUTIL=$(usex brightness-control)
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 94667080fe16..24eaa5f0c1d8 100644
Binary files a/lxqt-base/Manifest.gz and b/lxqt-base/Manifest.gz differ
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index a2df36707a25..56bced8fb6d4 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -4,5 +4,5 @@ DIST liblxqt-0.15.0.tar.xz 80624 BLAKE2B 0f5b1fede9460dddd2a506e4945ad81c8e7121e
 DIST liblxqt-0.15.1.tar.xz 80040 BLAKE2B f729bf1b10a35b97d71f2e95a35999d3f246b4e59cdce25e32ab2a72ed5be50a443db0c841dcd0d41deb25e130c91cf75a5ba384ae4c1e6d92aa306e0b4eb75d SHA512 a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c
 EBUILD liblxqt-0.14.1.ebuild 921 BLAKE2B e6422d743906d0b25c2c06b047f1115380297bd87c6318f2e4a7d710bd559c5c404ec219fbb709240974885cccab55a82935e727d1c5aabe3b7cf988ceccc2c7 SHA512 3b0ff68fe141e1597cc6016948a1a0805c86015549ebb48a099d4c9b06f9518420ffbdee976db3cd507a7faf024287020a3a04a7390439d399de15816aa88350
 EBUILD liblxqt-0.15.0.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
-EBUILD liblxqt-0.15.1.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
+EBUILD liblxqt-0.15.1.ebuild 1012 BLAKE2B 710ae3e812f388b9399fafda307e8d18bac56cd26d747862960284afeb5e04f353929ded81b2f7b6e6f5f8850c91d4e6a1c8bab4ba23502a0566601cd9601595 SHA512 37f135c5af73d2572c52f0d736215a50c072c0a62aa5f1141f5f98ca9c164e968faf578ff8057048e9baf5c702f9fcfe8b213f1843927e571af4a1e521677352
 MISC metadata.xml 395 BLAKE2B 8f890c4837644e26eeed09ff318d3058271adf60b91b7f94246107ab748c36c8adac766a3020ab50ba900e3287cd891f4a6e708784a2835f3629736429ea60b4 SHA512 2dd16d3ce72b587d4ae4589202a7a06ad34d58067d706ce757d89b3c7da23ef2a2af4ea39f93dc22246557e3ebb62f65d6a0b50961614ce7e3218693b9d664cc
diff --git a/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
index 70e3a186da24..f540ebffc07f 100644
--- a/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
index d4caca0ab589..fb3e3c7af795 100644
--- a/lxqt-base/libsysstat/Manifest
+++ b/lxqt-base/libsysstat/Manifest
@@ -1,5 +1,5 @@
 DIST libsysstat-0.4.2.tar.xz 17508 BLAKE2B f6c7703efbb449659278624d46c595a6fcf4f3e99d0d8633faeb7be36e8759c5ede8941e81df5ab085daa8178b079f598be31a4856339c248f3560bf0d21073a SHA512 9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df
 DIST libsysstat-0.4.3.tar.xz 17520 BLAKE2B 2bb2a37e44e825a0c35ef371d41fead9301cf2f40504ce298d6a259df8b37e1c98728aa881c977ec1518108742dbc8a46ffabdf57ed89119241ebbfca695b1b6 SHA512 a34511e4f9fe1ed977ffc65b11948459922760f9a22b225d48d1c7cae9fc6c94b315c1394768f4c7b94ffc28c1267410c21ba55ff89e54976526ea1e5e4d7a56
 EBUILD libsysstat-0.4.2.ebuild 558 BLAKE2B 02bb8ed2aa34e09425c71958b58dbf01240397e5ba549a099a4d5ed20c76a47c94253eb0b8a2974e34dca2075ddd67e025b67e3d7079080d0bc158c866b24300 SHA512 b919f50f37a5a28c18a37c999ba318695cc457a4d7c43bcb89b95e731d613eefaaf13872a60a827d000b653a47d6da32ae6cc1a3936a767b4aaf32cd1b9dcef8
-EBUILD libsysstat-0.4.3.ebuild 552 BLAKE2B 6cb13e7addf5da71475d3f9dff849026f7154effa52494f9cc6dfe7821035d17a1f0bbfc358d3f1520f163ed7a6a639379bca66fe182d5d62a1588694c22e801 SHA512 6b74fa395179d567ad252757906e5310adcc4ed5d79b9aaafb06c486e69d8f6a2ad8b833fb73bce1883915e1a6a249b0947b4ea6f91b09d8987b233a7b28b784
+EBUILD libsysstat-0.4.3.ebuild 550 BLAKE2B e6463529fc312b1252113d8332d008fac05d72d25db3a236ff8fb22dabd662be295e9ef10f8b63043ef650593330e7c0a8edada4d1dd335f815de5525b4ed3f8 SHA512 df976beaf22d125710fa1abf9df767f70c4802cb37359c6abe77cfa5016b5b577ea81b0cc3ae74bb67f69fd0d2e48a8a055f277b37c8f1ccdec8d1ca621d31b3
 MISC metadata.xml 316 BLAKE2B dc4c870d7a406c938756a0a5df097283f0d001d10b7bc9a2beb1730214405578f97faf60d9475fe7ba93b649ed33e8b1dd4bf40eec4091e405fc1eecf8b9e450 SHA512 3f9226fbc9629f0c61468c7bc142904fc2e4087a425d528def9f6432c31f3aead2f77959d49337aa3431975306e8ce3ee1d7d8e5d13ce57d20a62538fc7f4ce4
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.3.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.3.ebuild
index 3308b8391356..cc56854146a5 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.3.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
index ab92f59db7c7..89e11e471ed0 100644
--- a/lxqt-base/lxqt-about/Manifest
+++ b/lxqt-base/lxqt-about/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-about-0.14.1.tar.xz 36204 BLAKE2B 99bb41746b2ba3943f3817a59dd0786a3fe95a3ff9046a7a382351e17a835953c5fb8748619c2520e18fa5ba665bcadf05fe2c0992dec39366270de26f009fcd SHA512 09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a
 DIST lxqt-about-0.15.0.tar.xz 39048 BLAKE2B 332420e29f1859769e9d191bd9ee3d061ccd67e061ec9b3ae7b6e2f45ff5087b95e7d9898c3d5fe135b1064b5fcd4b1bd041ae5219d09c64ef1b0b856b18ed7e SHA512 0572db83f7f11abe2b17c69ba3d1bcefc5daa011a3c474aa8217f2cf8cc1db54a5de1db4a0678381c4d37caf1d1ebbe4026ed63e17e2fbbaa4133d1e781c6e44
 EBUILD lxqt-about-0.14.1.ebuild 659 BLAKE2B 2149a442a51738240acfae2c5a1e7bb27568c0533ac97a0d231fe49143f63ef9f89661c15aaa51b6c66edab9367660a31042517e6985f1ed6d0691e11980b9de SHA512 3e78c0f38df7af19a55f4b223897fe2d4ec5d7664a331bb0a8a1a759ea9c8fc954ae63c9ad5d6da9be3e1536b7d97e259335d12597be4ae9d9441b270485666e
-EBUILD lxqt-about-0.15.0.ebuild 666 BLAKE2B 7145f46d0933e2489c663283ab35cd46fdc96c2f3e5312325020b97baec1f6c26f226a312bf14539150603a71f7e0a66a22a79097cc81d6af13cfa237d755286 SHA512 c6baeedf196326a65b4121efa888b30bb26c4dd9ef84a1be416d78bb9c30f4ccdc6ad695aa9ec3f9a001e100d04e67664f346e74830437a7a3e06ac4a5770608
+EBUILD lxqt-about-0.15.0.ebuild 664 BLAKE2B 96f5f43dacb824d206edf7e2609729df66869a2de62c61935bee8aa997afc95627699ef82625bfd33956b457a3cae66f4dcf808983ee8072e6dd6ccbea33bea8 SHA512 7d041158ebef141f485219c91c2ccb49f7306d41a94a3e1c0336dca0450755efdb49cead250e8889ee3f615fd19fe9487fe3e2565850e473caae151062aec521
 MISC metadata.xml 316 BLAKE2B 36bfefa13949cfad10150cddaf4d8e2fdbf96632479d9b6a3343f7b9b51e83d34134242b0e5d3a5a0e25a3159030d7a5bc1c97e9ea27d0d85663be67dbadaeff SHA512 b5109f43afacd0a858485db451a587e8dcf9ce2d8f3e146d0c24efcd5a88404265c8e99578aeb7da55ba3429e27c52e27acf6adddc1015eda4f8e57c5f37ef91
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild
index 1c418a8fd06b..bcdb1324d76d 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/Manifest b/lxqt-base/lxqt-admin/Manifest
index c31879a118ac..2aba3edddd7d 100644
--- a/lxqt-base/lxqt-admin/Manifest
+++ b/lxqt-base/lxqt-admin/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-admin-0.14.1.tar.xz 141088 BLAKE2B 89e84167b4dfe67f2c7831a8d2ec4ee8805518d421e36b5cc1ed482e2166c85c54150ff54789f4e0e3f9fd6a5d202f620d2da60f79a0a23178ac0bf9882108df SHA512 bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373
 DIST lxqt-admin-0.15.0.tar.xz 143456 BLAKE2B 641d4185f00c6aecd4f1e4da1667cf8644522932800629c925ee04045d2a996cd17ef60b5856954c6e0315fce3243f9ac528d9ed85f18a63aa4ffe8e20b6e309 SHA512 830de1f3f65913b939b286adeeddfdfc22318bf09ea0ff7b705521c5c06f8edefa189b08bd4f6281116a12fc3255ace68a35ee56f3f7bec0e0f1cceea3b47c22
 EBUILD lxqt-admin-0.14.1.ebuild 688 BLAKE2B 2e02b6da7aff2425ec2eafc55e575bec9f0c0e2d487f662fa1d8bf58fe7eef4008bb7d7d824534f93a5eac05e152ee8382871ea669d329183ac1fd12598851b6 SHA512 c877be8d4d694cfe7f2cd5d2e731afd1a2514a5c06672b1c355688e3865c67703838b52c605436b0751832c7795973f00ac1ce4e933d9a28c3bdb96b0ed189ee
-EBUILD lxqt-admin-0.15.0.ebuild 695 BLAKE2B 1109c78cb983b36ecdac50c68e8a76a24e63422296ee0825dda9cff1fb40dbed5e129ab7274ec670c7a249ef0d63442198c4bdbe03cc2b65f1094e0d91dd3075 SHA512 e2076a9a3d0b78ec75e360b0e9ecc43aa16bc02b6a30f0931088ed80bbf408ccb3215073661134eeb5b04f98b0af486362b04d7ca1d80d8489c26a7019274981
+EBUILD lxqt-admin-0.15.0.ebuild 693 BLAKE2B 9ad44111f85c1e9df1c307479320150e5c7d141b7eb2d1649215c3e6c8b416dd0223ae17bbeadf37a4ee5073a0b3dd36de03bdced6a2c47c76bf30de1ed7f7b9 SHA512 d584ded7cdbabf74185c9f082c898e38efdcc17d2e2f19b2691e1625bea9909b5d8dd4bf9370957abc95ea9e739ff9cf97cde56df2da7c3dfc0a3fb6d78b68ae
 MISC metadata.xml 316 BLAKE2B be2bd5cb125c608cd60b791dd173079f9a18b247dd7113dd5ff7b9c893b10bb62678e0463553d3f16b10a92a40e88bfe4aa75aca0d5b3ffca9d4024b8e0c43ca SHA512 4fa962d54db76373af467ffcead4c651b8fc226e8da994c6b574dff81e5e1013ff5609c19bcfdeba669809e42c0141cb135248fd48f151781dd611703c88035e
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild
index 1ba97cc02655..fb38e2cb3aa7 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 0a90b928af4a..f4e23eb4fc50 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -3,6 +3,6 @@ AUX lxqt-config-0.15.0-window-colour-option.patch 12529 BLAKE2B 5abfe6c0ca54878c
 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
 DIST lxqt-config-0.15.0.tar.xz 312468 BLAKE2B 2b3eb43141f3b46996b785b7cd19b709028c8cecc455a63578c93a9ae580148bc35df1192591bf0fdb5584d2cf66f589dbdde0d43c6848dda263d1f0b80e8c59 SHA512 68dc8ecc38033a7a93167fb0afbe45b3e14eb1132c3faf3395ebed1fc96b5836e8db003ecffde0417dfaf9e73b70fcc69a06523319f1f858cd2020eb61113a0d
 EBUILD lxqt-config-0.14.1-r1.ebuild 1520 BLAKE2B 01d067c42d6a5b77b5b06c5c30204da8d3a79e1a9d35f488a5bbe1ea0ce0d29d1498721f93962ec7968bb193d22f94d1750af83987a3ff9c42492e5884025630 SHA512 b3c7ab4fe6ce89b2dd9238d164d792aa3367c6937ed23125c302ab1b732055a23d7d706e2045175bb3dd85d02bc32b14a2c0f0d782e67c81c82435e2ef179011
-EBUILD lxqt-config-0.15.0-r1.ebuild 1538 BLAKE2B 942ff5c18fca343b61abd53c0608f4cd20cd4b18f7111b7b3ffdddf55bcd1780c2b49395198ffa70e581cfa751113bb2c4f1fb2c1cc086f660fa5d4eb87a5758 SHA512 e5cbb728b68411e170a03ab774d5b3d675265e63a3537b932549460fd9bb0842e7205dd35c857c8fbb6c77ef086a6385dca7f67701ddd8ac773c14d48c031523
+EBUILD lxqt-config-0.15.0-r1.ebuild 1536 BLAKE2B 59a72716f6514325c2cbb85942e9b27295bb430a725bcc3e7c78878f43f67a22a0f93a70447026acced323cff012b1622a6f886733c5da3d0e49d4ab1ed06bba SHA512 708a6102079ed65a3400913b437f4eedda67251579d8c5ad86282fb26065d1c8e746bd8b0072d3c768a34bf653a50b8ec3d6277291ccdbf1d975cf6ffad678ca
 EBUILD lxqt-config-0.15.0.ebuild 1471 BLAKE2B 5a10e760e5964c7b1059de314e036ab5ab697605721d7e8d9f05c99cc43de7236539e8cb55dd384d1a91e954530bd0c272f699018a9a993146f6658371f67835 SHA512 87a9d073b092c1b2069ba78a384e1ec2d18bca7da648172f9d6fea1eeec241e983ffdf06d32ebc484cb264812e396061826a6e14c527781862e10fcd48aba884
 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
index af99f9d0116e..84f03be2dab7 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index 28e9d30afd80..4b7494c6e57d 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -4,5 +4,5 @@ DIST lxqt-globalkeys-0.14.3.tar.xz 67928 BLAKE2B 0298d393b17801a6dc9923299ab8ec8
 DIST lxqt-globalkeys-0.15.0.tar.xz 68932 BLAKE2B eedf706b9bb65c4c9a05dd122f627349a35ce6d4daf514ac2697dff8466a74fc85636c4b113919fd115b419d1430f5c5549350aa36c2b9cac857e2fbe47b186b SHA512 95beba4ce6c2324582d93a6f3f56d57681ec7d992db80a8d9fae34a637ba1612260932944e3865c3c749982e6aa111b3495558bc5d36e8b4c8e21027775e346e
 EBUILD lxqt-globalkeys-0.14.1.ebuild 887 BLAKE2B e8a280550046095a9c57036c56a6a22d4a0a410143a9fce7d40e290600a3e9c2e71b27273c0c38e1cf0f4f9ca7d7dcfb6d12284f8de59581904790f2c3a7d51d SHA512 0ecc040bc9f61620b32b530801b18c8c619126dfd33bc25280a5ba67c48e74f05faf8d727f4ddfb5ed4b12644910d8919a6036ab64984ce75cd890039d12f408
 EBUILD lxqt-globalkeys-0.14.3.ebuild 895 BLAKE2B 262abf50d02965892328d669e2d795c09f199d679bce42510cf37f751d2bb06b7f04d16526f6a8293fd8b6fe833fd53cbcb6a64a0917890e4b66b87d91847496 SHA512 1f6f0f70c4e6c2487917c92d6318409618d3ed55c7beae462c0f04aee041980e6df6c02aff832b01a0328de65437cee7f3b3e15c0d28f9ad8577c84110347982
-EBUILD lxqt-globalkeys-0.15.0.ebuild 851 BLAKE2B 5452dc96540d6a6b6708e00f030e7f1c5f1ec2b5786a935d958f0805bb9221b150b022c034c83e8a506a5123d3ee1ffbd2d01c4b3e52fade07e5749baa04b80e SHA512 7ddb2a7c928d5a7c1e9a45e3c691f15eabb73ecf6e1373196b52cef8b77d2e7452a5ce76bb2dc64b48383e0109a9214a4e6eaea480868fbe4aeaa35e6bc27936
+EBUILD lxqt-globalkeys-0.15.0.ebuild 849 BLAKE2B 03dcd916d72123dc21c9f45448d95cf9395056885237338892dac347092876fb83c6bd547ab6574553a262eccc368cb43c81ee849a746f73f5a0c1a1bf391b0e SHA512 f5c96c25bed6627d5d817a80796a78c2ff718e484fe8ae44189e7558c20817242e6525fe03d3696c24892f94b9449191cfa3a036c957d2d18a2fdf81cb2199bf
 MISC metadata.xml 321 BLAKE2B e4171574ab9b2b3ce038ad57a140049f2835aaad88c8ff7d372e3f65f2b696d27719c1dc2c1b8e98ad6dc657eae88405fb2e9d0a5c88ba48db772f30b1511e5b SHA512 2ab81bdddeec9b554082577559910d8d7f6def6aece5bc1ede46d5d74e5f1e23f86b6256f4e7b6cd55e88523261dcccda4970f26016a817c922d0249fcc30589
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
index 49455e5c9f04..83794fcd66fd 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index ad40bcac7b0f..89018b28b350 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD lxqt-meta-0.14.1-r1.ebuild 1754 BLAKE2B 83f074c61de45136ede7907e161faf08968528221961e820a65c62bf1eb508890f99f6f0b8f10fbdbea369fa8190f1d138f2c80f0aa7f447a05b5dc6c6361cf0 SHA512 3cc6b452a1d7080e2c445e8d7ac9802dad6282fa25b30ccee3b6dd887ecef6cbdb7d4123e7b6843f0bb405de3637098e23087f6af99ac9669f0f8d55e3fcf389
-EBUILD lxqt-meta-0.15.0.ebuild 1868 BLAKE2B 84e1b2f434e999878b3919810f46955ac212ec0587cdae346bd83ae8d9f8fbd683020d3c9422ac65adecd6a1eee19586eae1d683555469663a794c87e9b8bc11 SHA512 5c33c69d97f5cbb16f910ef957a879d81ac2e971094844664d9a3eaee9086066d5369538997cf11bbdbaeba2ec36331e9e938dc99cf6d9a4bceb898207cca0ea
+EBUILD lxqt-meta-0.15.0.ebuild 1866 BLAKE2B ef3fba6955394617124182d85474d71e15d023f33d3e53694379dbe2b7e3a92343f99e76d7599f252db06ebff06d6b62c4d1034bad62b05121f847241a26f3bc SHA512 f5948360935fbc1e931153f1bcdb6617ba03c392c60e583b61a6c0505c0a4dad5f2a6d9a4bb21e4eded399f667e41d2c3d888aadad053b17556a2077ba6d4782
 MISC metadata.xml 1673 BLAKE2B 287e43bf365c162a168591241ead35c89f89462780e9f1f5823d4705cb9c384f8690f173a2984455eeab814e5d18b1cd66da976150ec7dcedb6cd9cbf8dab364 SHA512 441411ce4cff50b5650563c3d061048cc661e01075afa204413438f29d1371ca9d276b465fcb1b65e4bb153f393ecfb1299433836c12acb30b8f8bd07e15fd2b
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
index 520e7e85168c..c764d554669a 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
index b03ee18b6f62..adfaab25dee3 100644
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-notificationd-0.14.1.tar.xz 47356 BLAKE2B b80febe059a17e30df4abb81e6d63271b8955211474d80853dc54ea65112081160bf270766654498b50c78c58df4444682e1e9b9cac800c4afb294fdb2fdbaeb SHA512 dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795
 DIST lxqt-notificationd-0.15.0.tar.xz 49068 BLAKE2B 00277a1ecb75a7591ad4d74156889f9fceec1f81b752f2d6dc10bc77a8dbe8406df88ff4b768dfa42efa3b50048fd757b648766fa7131f7e11b5314fc9718a9e SHA512 0febe3ff61caaf4303e3853df6bc494ce8eb4a931e6d8600a2e38c07317ecadbe3d7060ac234d139326a726c43ac555153dde6b2d4d05e95ab357873457c9632
 EBUILD lxqt-notificationd-0.14.1.ebuild 755 BLAKE2B bdae72362ac68470a04d2fd63f5592c12720f514c6c6a5296be9b0a8beb0f024da681b0aec41d54fbc078134d0544b817ea688f331d84a6d09c30019fbaf7dd0 SHA512 086442fc0a0c814310574daed7b6e5b4dc18d097c5ce1e24504e9cd3edaf8ee6ab67036f514e8ca9d72b36a7ed7e2cf8da6e6ddbd669981f2a9b1f2d0a304607
-EBUILD lxqt-notificationd-0.15.0.ebuild 771 BLAKE2B af18eeb6c7ff1989813c4d83a7120e1ce862a992ae1493179247f4838f31eb9f3cd5503bd80aded9d01ddca270cd34fc55a1aaf3e81cc254922d8f65c92d001e SHA512 436727542030afcae4e1ba037a495d676f11d36337510d2bf73613501dcfba20d33ebfd22d9e0a3d46a76e8745fe93ae12c10611d40101e3288684bbb002aba8
+EBUILD lxqt-notificationd-0.15.0.ebuild 769 BLAKE2B 706565e61570b696608be5218f73d54dda00af157206cd108f666fec98692532c43eeee349674455a7e0cecc754561f38d2ae4347022662726d6bdab7e1229b8 SHA512 643f349328ba00378f754891d669e20babd0c531ac5ad802c25288c29f4b7651a9ab8f795a500a9f9c70102b152d00d15603c58732a5edab8cfcdb60eeb111fd
 MISC metadata.xml 323 BLAKE2B cc28b17d478bed98b59743c03ceb630cc65495414d1dd5703b917643f54ff606518016358e2b0149cc25082097a1e8dd5cb2ee173c235aa6cc4197d9cc258493 SHA512 3aa6fb296384049f738b51edf21ea16a7a68cad1cf5bc79c6c34f970f12292afdb44eb34bf6b48c8e884903dfad041e1078b7409427aaeaabee48d5ee5c1bc14
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild
index a78ba273344a..ecfdd82eda63 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
index e9522f6c66e6..b609ee888260 100644
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-openssh-askpass-0.14.1.tar.xz 16848 BLAKE2B b774027c878c75324a5908244ef2cf33b0a092cbd2c0801c92c1304a6eed40fc8a18919ac25c6632ba306bd7f56cfc64cf9880cf166639cf5a8eea4a1bfad66e SHA512 ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf
 DIST lxqt-openssh-askpass-0.15.0.tar.xz 17032 BLAKE2B 3a6e235477d3499429f854351f4f8686f6aaec2c8ee114fab32acd0a6759cc6e782c5afda7e1b0e496346673838938fa083322d4dc147380a918209f5c0ab0a6 SHA512 e9dd41dd75892be234e6381670fa0b836bf040b00b7c59c7f23cadc9a916e8c646c4d44645a49183a305c6b755a01e6b8e6a3c0f84aa7c374cdb3ddd577e2f44
 EBUILD lxqt-openssh-askpass-0.14.1.ebuild 833 BLAKE2B 8533d3a15db064d4ca2bfb28b0cc15262dfa59fc032dffec4eb521948be4eb4899629b486969fd89fc95e59d81dcfd244eaf7bfcfa887ac5804e5cc423874694 SHA512 4f20fa94af6dff24e09726f82293b820c07ea091b715c61cda963f96d577d7815aa9170996bcc130b9002321a88a081e05abc68688eb8a9e8280104c9baa5739
-EBUILD lxqt-openssh-askpass-0.15.0.ebuild 827 BLAKE2B a411ea1eedd6c61e46b9b41f72814f8bfab28fd3df0940788c656e082c0f90352dcd34d36f2ffe7988aefca14b2489a83d7adb1d2aafc74cc910d559b9582816 SHA512 7c194f1a3184615c7dc62a311a68a2ad7d85209e657c4c878416ad4d6471eff2e95f0802ef33bce3698602f10db34481b92056bd59c5b784970cf147919f3301
+EBUILD lxqt-openssh-askpass-0.15.0.ebuild 825 BLAKE2B e7f3a0546dee06cb49dee16eccbd17a4a1ccf51b6827ceae9d7bb10a242f30a47e6577f93f32580bef2aaedb58d18b09ba23390660a501a667c30d045fa69923 SHA512 a941d726521cf1ac10920739c2d2beaff4c147237853b22a83835b6682da6d81b965b74362201343e810aa8d60bceee1da7ab7ca2b2591e12fa3618a7e0d2e32
 MISC metadata.xml 326 BLAKE2B 1e00f54527db197d3a43db75f66f6f3d7575560895b815593763522c4696dfc15d5293283cbbf2105747d1b367b3da0c15b1ba2d8bd8bb6905899d0ed51641d4 SHA512 b3984c193ce7a1aa091c4bc90c8933245e1479094ba3022fd9c922c89f81c53a2469542606d6e87d5d6ff78b980999a4d4fa42297363cb31daec41ec9bb0a3da
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild
index 00da38eed188..959c81cd3465 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index e0f9596a7088..5a8655341b30 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
 DIST lxqt-panel-0.15.1.tar.xz 473356 BLAKE2B 297e704c51b3c950551fd09012c0aa533fdecf3d46d0f988428ce4100b7936970c5b400c6dc77103e26c07a05d10611fcd921354063cc55252b0a9cb93b0ebe6 SHA512 8eb9856faa2ce56c56df7514772d3ae6d31339a10d16e1ed659be0a2affc57fd16e01e05cb67c4205dfb773234ca9b8a69f414f742ccc30495bf4e2acfa0513f
 EBUILD lxqt-panel-0.14.1.ebuild 2882 BLAKE2B 5cbc945a545782068cf3306e4eccb8a265bc994a6324835e6ddae3ab68f2633c2b317b5ff3babd11d87d8bf4d41da109817c989fbe3dcfeb9f523580918d2508 SHA512 ded2739b9d8b5c2752efe732c2239243a05c2827c436987d5c35362a5c449efc11caad1797c8e6ec434cce7719a89c485958bfe26f68cbc41155f2fb738f4301
-EBUILD lxqt-panel-0.15.1.ebuild 2905 BLAKE2B da22333a1d7e98c5f49a52cce5ec0b14b5857be9b1b12e6cf9003a2bcf30a4630d39fe27055bdd6243825f42399fc8d72e296a3d0ed1eb3729704fea9328f6e6 SHA512 035534cdc5001fbc6334e52146f0192afd84d13cce3673645ed28b34da6b95d1d73f3e49a234ac14b10175578907b50d439caad4f24443a1e14bafcf9962728c
+EBUILD lxqt-panel-0.15.1.ebuild 2903 BLAKE2B bcb9e2065c5a552533828d69811baaf685c3ea288c3d1d2c33fb77f44b4167bc38859db512850bb8f5fed416530b5e428c80dab79a473312fd3087980ddee6fb SHA512 e9b2e20b6bb86cf970d260c667e75a1ece43f2f30f221fb13c85a43c4442421c6ef52d0c73ca737b1ac7ffb961ed0a457efc6842bcd1837e485b377d7c90cebc
 MISC metadata.xml 1370 BLAKE2B 6f9292ad43d3b829ba3968762f767e65b91bd71156e5e81f77168eb1377d812790e087e173e2db80e30238d423cebb9909013528e8cb8e83dad22f6cf8ade9f6 SHA512 cfa369a013c942515cdb50400c03ca57089d0a81eefca77997e217928af08357f71cbb77e526815cf3bc101f597dbf813acf56fbd04e4e593fe6110e8f711747
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
index 7e0b20dfb8d9..e6c4a1354464 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
index 4d2add75b1fe..c43d79bfc308 100644
--- a/lxqt-base/lxqt-policykit/Manifest
+++ b/lxqt-base/lxqt-policykit/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-policykit-0.14.1.tar.xz 37616 BLAKE2B 05175f99bd63fae795499eff02b224a589842e6f4ce0faa66dcb949d99625d8fcdd54600d80832b5211e297e9c0da3aa33ecd6e47b5dd7b0e544a1d301e4e483 SHA512 c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940
 DIST lxqt-policykit-0.15.0.tar.xz 37712 BLAKE2B b9263234766dd9a2e89288f6668e8553e1f5deae0e306443fc3d15268f3fbbb4b9cfb81987d1e1f9c96ece4494ef700a6e40bf5e498eeb3d7377f3848d09b376 SHA512 2dbbe6d626ef5da816f080354caf564a1aa58270ae299483b9a4ce35d5f1bdb3c652dcb5f12d2668a0ea82556414b00320d2bd88fcadb37fbbdbf724a17e3c41
 EBUILD lxqt-policykit-0.14.1.ebuild 819 BLAKE2B 6bb92740622990d52ed7693ef8e9abc872ef917424da301e6ab1fd6988a20c95651a344a6d78972d51b8f805338a48c1d299ad2c76d7499f61d8f6740889b54c SHA512 4c017be2c03d618039c1b2595d994022ca45a0fdab510d1f911c5e3b7ddca06a49f19aa38728cc6606b3f6bd36497edf74cb595fb16fc27eade8d1289821b678
-EBUILD lxqt-policykit-0.15.0.ebuild 835 BLAKE2B 6203e45175101932aa0bb02eaff611a0f04f92c5b4f020a1c8f3fa975f5326772153a9107920d2fc369c9b75ea16d60a4470ec3dfae1e2f6b602b5a1901110eb SHA512 6e16454d6cabf1c6d5896c29f17f09e1c3d4107a562ea5e3a2851ade88f88009db0089d3fb7608c4d1528839fc24b4ee8fead4283c3f967d2dff7010cd6c72ec
+EBUILD lxqt-policykit-0.15.0.ebuild 833 BLAKE2B 53752b6ea0383837ce2b4e15a6e3fed789c7b7c78d75ea9e69c1abc88418c2a172bfa709d86ae43f6a28906e5500a00214c00a569d7a248e25c5b110f2ba0cb5 SHA512 758a042779115226dccd38ea4078a5d99c57bea78a233bf14a9fa56511aa99e23e9384793c6b5c211aef87183087f1fa32b4648c2f4dd85ee325b14d71d55b58
 MISC metadata.xml 320 BLAKE2B 06af6102783b41528cf4a8afd437db1524460cc47ff1004e4e45a8903673019f6c85ff948472d07f053787a767c2d5b3c1986ad20645e0418198e8b7e2d20736 SHA512 24085bd13cb0c25b25737c74a4817ab6a252079c0cd3d29f3caf1ab5e02e85f944653844059ecedf28629b38ec46a02163c806f600bcd044528d4951868e168b
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild
index daf686ddd39c..a4c029cf8b47 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest
index d3c0fc40a0f9..97e09d0a5173 100644
--- a/lxqt-base/lxqt-powermanagement/Manifest
+++ b/lxqt-base/lxqt-powermanagement/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-powermanagement-0.14.1.tar.xz 60892 BLAKE2B abaa853f6de7540dc0b0446dc442f78b59f9493fdf5565c1207080ec979f04b5e42a343d248feb99e57af32b008f49b36e3ec07e1a592eb957adf762b131761b SHA512 04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10
 DIST lxqt-powermanagement-0.15.0.tar.xz 64748 BLAKE2B 1a41e22e87c4af8b891d56d1a328d3c81ef1b5b6810fcdf392548bf497482d4c425901311f57f0a1be89e9ea49569dabb8a01be9ef90dfd8648460e2d7899507 SHA512 8ea0765bad3885e6a8e574b382d6bea0bd5065b760241b5fa641e17096fffb43c5472577729365c36918caa4ca0d058fa1a24538dfe157e32ac519d94a4db039
 EBUILD lxqt-powermanagement-0.14.1.ebuild 856 BLAKE2B fdc6a043bb08770c5e00f66f0f4008b82e012059d47619de055b1fa3ba33d5877a2b0517faa9729fb8b71c7cb12454871329896936107c41c9f81f2af31c4b5e SHA512 9891fda90a9a7407a4fe86b940b7b9e281d009cf0b8e1cf3297da9f43860ccda6c349d71bd0bfe2199d5f6eeef1e4bf6fd849b018922f2420901153973a788c8
-EBUILD lxqt-powermanagement-0.15.0.ebuild 872 BLAKE2B 3beff074cac49c46142d69c6922f2b767cc453a1785191b447fac5da23e2b636407faf79a5c3d10c22c1e0efebf8ddfbbe7166bf0e1e4022d78d2f6e7240bae3 SHA512 1394497c751f91203d03ada6e46419d6cfcc15ae06b04ebcb7290c01745011242a6e911158675e75254ce7687c5b70741c9d1e35873bdd91b42cbc36c35fc439
+EBUILD lxqt-powermanagement-0.15.0.ebuild 870 BLAKE2B e4282d9dcd8a45bc77962b98164310781037824634f7fa3f04983c2cedc00860cc4241afe26e265c69b5aad419247fe0ad96c29dac6bf0b7af1b03aa59ab7240 SHA512 c52f90b098e9978a44f7c68fd775511344f8b17b3e9ca36c7e29c28a142e083a65047d8577bf9abe59d976132fbbd8667f8f058883bb43497a545d8ec9f5d443
 MISC metadata.xml 326 BLAKE2B 488752fea9acddffc106b0d4c60fa02a3999e4fef6fd83e572f980686ae1f0bce317b0195abca851f509a2fa305d1d433471a09a8feb38094e28a1dc7a64f124 SHA512 3ac636dc74e16504678b9e95e32fff32e7338c14603576dfbaa0e6f9d69f8130cd1f78b6c122be0f2e8a8ae3dd1501baf3281b12280852d293012b6ff31ef665
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild
index 2ecf9780b428..715e5fd526e1 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index 77650203df7c..d576bf8fc2d2 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -5,5 +5,5 @@ DIST lxqt-qtplugin-0.15.0.tar.xz 22776 BLAKE2B 642270939ddaf9884da611d800c6ccae5
 DIST lxqt-qtplugin-0.15.1.tar.xz 23100 BLAKE2B 91f6a90f435a33fd19863f9989b0603590c51f5921ad0837c025437b6fbd50105c70a47028137562af1deb6892fadea05ca3924eee8e2ba8b91a41069ad2ca47 SHA512 6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f
 EBUILD lxqt-qtplugin-0.14.0.ebuild 759 BLAKE2B ab40da027a91ca08d3463b7ccd0327d35b54f7f4c31c94e1715af8be860d51ad4ec6cf78f8eb28c83bbf92ed7f7d8fff52de3a1938f89be57c2d9a1e6e2ca0a1 SHA512 1c6d44ddc628ea86b95f138177f714c8b070d85d7f4b5fbe102a4703ffb5406dd510e743e69ea07125c91b2a185a89ec350540e90a9e9c3824964790172fb617
 EBUILD lxqt-qtplugin-0.15.0-r1.ebuild 766 BLAKE2B b660e7693e7208ff939d901d27a4cd2862ed04d5a0fa1f338b7f866c7d616fccc0f3dfa99baf3622dc3fabb1040ecab8df813486338a9285c667d0f322e40844 SHA512 f76ad68199feb6054b01e50e747797e0f326ad0d55a653b3d383f6e672e1e73e942f26d1ab0c0997b6eb0e004b8fbb21f7905143835f43758eecc8d0c6c50df4
-EBUILD lxqt-qtplugin-0.15.1.ebuild 937 BLAKE2B 8bb925be7a11fa376bc6ac740ec3da5af5e1a2eeca372f5e50654742015e6743fb5b355a4654f7ce726a08b608b9cc2b078a8054d32b233646c542c86e3dbbc6 SHA512 1e0a88a9cd8d2c4fa4a19b2d74726a3d3f53abc1f2f2f3034ed9d60f042a93c24f702fde9d1d95373406d9a7ad35151d4994f1b604a63cb9fc5f7d2b939781c0
+EBUILD lxqt-qtplugin-0.15.1.ebuild 935 BLAKE2B ddcf271d937b659084d6d425093ef97d2950ffc78306c63a1b76eb99c236b9ec82f98b73e9d8f7c3d24f9b55e03a84489a6b6169c9311823b8d600dac1a90d56 SHA512 7e10ae79ed09c59e941fa7928697260cb2bdd0d1462c28f8a2433f4334707778c3ac44b7ecfcf09180c5ea31bbb52f41ef22e55c47e60d7e333f1c93a778089c
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
index 8e1b6244cc75..1c04c29f50f3 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index ad20891a9d3e..f1fe0d605213 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-runner-0.14.1.tar.xz 223628 BLAKE2B c9f5879bc4c58d0a9cbc19e6efef7fc26bd479e14b7e7109458501372e9b3e251bf87889a1913e6bbc99b68b96b450e71ca57c764aac52afedd35e9904aedd40 SHA512 62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c
 DIST lxqt-runner-0.15.0.tar.xz 223996 BLAKE2B 90e078d4a2cb93bfc9f964cf4cdcee73e4d5a390ec1383f623b96f15646dec7cff630d95dcd3613427063213c951325826c69d5bff6ee8b9b3024133ed01166c SHA512 559a5ef627f311ee4894891445a7f1bf70349d7f89ec3eb1d5550f8e87486d695d03fb70a8ec936b074e83c82c29ff26c07ee3edeebbbf8dade2d9a5f4dacdba
 EBUILD lxqt-runner-0.14.1.ebuild 922 BLAKE2B ccce09c246fcf412674c5c1337a6d92405d71072445f269edfea76d54fc0a1df92516d8aab5682cacfecfb3671175bcf53c2a38259a382d5cc8fd2ac5fdf3d11 SHA512 a0ceaa235fe889d21a562fb6a3c0accf08343ad1a4b3cef13c64ae6d0420d7b3bda8a07865909e8878f7a9d837cfb05135b1b9dcbc0200881d6fe9d5cf13b967
-EBUILD lxqt-runner-0.15.0.ebuild 908 BLAKE2B d78383b8a87c2554393f35b5f730e639822c1577418cec791b6539a20042f40efef1ed9c82fbc2b94f0fc8b915e2574254e86bc4acd2bcb87e2e233a0b8b5140 SHA512 80eae11cc602e68581830edebe001c896cf74972216cfabd476d14965ff3fd23e0d3c6c9c52774f027757e511373ee382f8704e3a01971c092e4378e78b2a96f
+EBUILD lxqt-runner-0.15.0.ebuild 906 BLAKE2B 0d6f78c1784718c1c2aa9c6df10c768d36c304a2ad67a782a535f2bb8bc7105f57307c656b0e519d6baa93a8d6931b09d86543d66799541497c28a2bf73c3da0 SHA512 f6a1b7c2ba5a0514da0e945261f0e84def3dd120095c608108037bb08154a2b360f738e53311ea09f83ee5cf05940bde3192e2087bf919429aad80b02aa997a6
 MISC metadata.xml 317 BLAKE2B 1407054872d1acf5f80332fe07317c5cd8f8a3bd44bbfb7a74a6dc7738c861a2f925387208ee12ee32e6d8c8578f03a7ae3d07ea05d65bf6ce44361be87b9f87 SHA512 7ac300651df6b6a5cd22ed838779e880ab16717d07cbe084bb7536a8c41bb092168497482688fd3e9208bf2ee6528d62b2e0f7e69c6980d520cce4838b555e77
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild
index 2d89c16b0f7a..0c27ece91318 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
index 9cf79ca2e69b..f3404afc99d2 100644
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-session-0.14.1.tar.xz 178600 BLAKE2B a4f0f096b994ea409e47d364bbde93bb66bfb4b5fb157ec1acb78a3055584dd31772ca2ed6a6592940e6fb578bbca3d0499f6eaa9775f84ce9703c39b0fc0bf3 SHA512 9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c
 DIST lxqt-session-0.15.0.tar.xz 181900 BLAKE2B 87a96f832497d235de2b86deb9b66f21bae270906c5fd17d5ea3059f6be1527502423cf55bff7b2fecfd9a881c867791dd603ce9aa1bb29b1ae1b337e05ab529 SHA512 96ef9e58ca25303ac0213f1cb5faee5efddb61ac3705484ac55b39db56c9302ff646e317dbc753b213a5e2ea38818b247244a2be5219fbe6db9e419b8c638591
 EBUILD lxqt-session-0.14.1.ebuild 1203 BLAKE2B c7964ea06647f4afe41158311b901a586ed2c852c5c119ac384e09f5e280088aff7e8ec22e369de469023cb6126815468604bdf649dcc40a1bb5629c07bfb65a SHA512 6997a0427df17f4bfbcdc3e3351495068a39caad45ea9a2c2d629e58712ada3fc796c56807456364735b022a876a4e69a7577c5cc92b82cb145e9d848835ce42
-EBUILD lxqt-session-0.15.0.ebuild 1158 BLAKE2B 9504f80c5f51a382ec21a8774545d98c4e7e8bfcc9347c7666b316724e54e02e9656f27028e04607c658f0db0dbeda7e4c8ae3193351065ff5ccdf445c11e262 SHA512 f81955e4a4bbc73e04148803e888d95d5e788089af69cd154cd7c9b1c95f177e232ce83823fbff5242577f82c1ce78a98bfac159243e6884dd67a6c46b3e59df
+EBUILD lxqt-session-0.15.0.ebuild 1156 BLAKE2B 6b5d53ce00c0834e546f6cc396964b1a87b125d8ebfc28921470df44af6db339611e7024550bbfefbe9b1f1a9025904597b9b628f17a8e3ea869e2da99fa4893 SHA512 5cbba50d62144dfef0b4ba671b5eae392846e28ed10f4304778c835c7c9b121cef4645060d95216a58aa94fed718eb6df36939bde102e322348f05ad4adcdd87
 MISC metadata.xml 395 BLAKE2B 842bf93924f29beba87d230d19017136a5d8a55d62f68a4448860641b5dc7dff042e947d3075a653baf915a14b266caec30d249d64ac2759bf54d1997223d029 SHA512 c2843aefd069f9f8c8b96137a0962a7e672b566a48960d2a24e0a6020ec01fdaec3319cab3160ac530d3a50d43c06a0f8cb59977c679aa6e072f7fd4000e34da
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild
index 0be394a3ce6a..ab8a84a5e0ce 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 IUSE="+udev"
diff --git a/lxqt-base/lxqt-sudo/Manifest b/lxqt-base/lxqt-sudo/Manifest
index 2c9a241941e3..c8ea794fad23 100644
--- a/lxqt-base/lxqt-sudo/Manifest
+++ b/lxqt-base/lxqt-sudo/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-sudo-0.14.1.tar.xz 30692 BLAKE2B 18232c3e30cb70097eeef725424065b0d4e374ed710ec34b2254bccfde9382606dfa325995d0eadabeb312d524f3afce335f69d49c986e3aaed016ef71deaf4e SHA512 b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222
 DIST lxqt-sudo-0.15.0.tar.xz 34528 BLAKE2B 50b7b699e85c52b7b55bf559f3d7e239ad5a9ee6031af1bf6e902cd4aa7399e9df88157ef48906b3343e4cf68d6e62912179a26d3fd4e3aa223849fd1088199f SHA512 94c96a1eac5d1ec6e84c99ecbd08e7ecb8184d4e1ada0bce137c2c8d9508cd840b56dae38e3f418cb208a3eae5b3420bf33e0b9a1bb96969f2bd4d207e89304c
 EBUILD lxqt-sudo-0.14.1.ebuild 661 BLAKE2B 55271b8794e4db80871243121ddc039a9dc2086e435260b0c5ef970c912eba2e5ddbcebc4868a325e354f285f46d8a8b5d489ea64a326cd1b8c8ee7fcbedbe4b SHA512 75870da485dede217c2d9886b1cff49ab018ca7abbc27decc1184da5bdd2e12b7e99f9567b268350f384366298ae765e908b0de9b6334d133164704bb08973cc
-EBUILD lxqt-sudo-0.15.0.ebuild 677 BLAKE2B 2b3ce96159af4e2e73639928b37eb31f1beb20767b1fd780fe2194bcd9aeb6b1f3361230a707d5572303b172820ce30b332b4b8f277aab1fb3f14cecd7a10837 SHA512 c0c19c5e1cdc1bc4ba7f4da1237f9933eed7b0c12fb00e175cc82d2c048406cba9d7d54f5b90b570d1e927e1c423bc44df6667486b0a6c2b51b8ac2bda033f52
+EBUILD lxqt-sudo-0.15.0.ebuild 675 BLAKE2B 232d81c4eed5ba293e6552b37a6bbc234bcf309dc4c0640c6c58d6d6fe2c0422c3f2bf077721f596f88309deb052868e882256b0ef25aceec6f6e269acc87d42 SHA512 f6f68ae500316028272744a820f77c2ad962d9bbb021c3803678fe6942913a31ae374116d641556aefeab9e9bd617bc8afd716f73403b28d76eb636c2e7a2cd9
 MISC metadata.xml 315 BLAKE2B 7e2dbd32ef59c7cbfdfd23b3dfa490445f4ad5ec7419fa83f3ed657c07580ea97df2e8f5bf54754a028517744a9230fd7d77f187ed0bab29c2822b30f00580c2 SHA512 33e754e42343bad0c2e726604c7dec977f9ae4a902af769fe0599ac8c067a6c0047794c468f30fbf6d2262c2f7830b14b913758d5398e0a57b8a29a0c4e3329e
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild
index 25b46eda6393..b820be19403f 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 8592d63ba7cc..d998ceb710ac 100644
Binary files a/mate-base/Manifest.gz and b/mate-base/Manifest.gz differ
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index a6db0d06e489..c094817770f0 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -4,6 +4,6 @@ AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
 DIST mate-session-manager-1.22.3.tar.xz 582412 BLAKE2B 9e502b356e09aa4ecebb5a75771cfed0dd16a3e44baf176fd5ba3dbf9b5bd000f6572498dfee69e794971e491eb5d9f2fa3a8c923aefe2ee6e42a086521fdd9d SHA512 2a53722c1468c244e90632e3a949c331922e018998300ee8c5de44973e17116822d2a747b4d0d315348da9a20c011f46c2b5ea569eef0b6b90785f3df55d98f6
 DIST mate-session-manager-1.24.0.tar.xz 709712 BLAKE2B 6455872dfc89cdd3ced563a877e30ef59d2c6d94bd8f3b930eb778ea6b22a52ee860d785ba13d348e37e0d74526de4aef229d5c7b022e7f974ac949f553d7704 SHA512 ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37
-EBUILD mate-session-manager-1.22.3-r2.ebuild 2015 BLAKE2B ba9bf1a3e493a51607a7ed20efd3813a8cc8c2065da337fd1c70f882ec3edfde87a974ba1692e5f0021b9b3486d99f4449787d22c966e1c42e3e8c5fc41dddfc SHA512 d536c0824f5da33bb1dadccbea862cb25b4d153ee17f7d958b77586064dac236434942e012bb2f2f20b0770bab7e6c90f8f5ec723fdb13da1acd31dc02bdd28a
-EBUILD mate-session-manager-1.24.0-r2.ebuild 1992 BLAKE2B 6b1e025ede6f31c1bc9e4d4d0c164f8f2d963e0f28ca09817fee85895b6992707a6fa374f66f6c1ba764dc3c6564bf665d644ea7d5f1b575e1e88ba1e5ed4f46 SHA512 325e684caf458eecfd9107e1f90e6dff20b5100da0cfbd56287563d65d4e0b84af5c75a7f4c342195e5790f6bace6cd76b734017aae671dfd4fb386c0a517cd9
+EBUILD mate-session-manager-1.22.3-r3.ebuild 1971 BLAKE2B 4a92c429698b43b80887121a28e4aec3dc6ee7487c69e5a44b2f5dc3a42b7eebd267808fdc76fc6f5df43f3d1c8b8f79f645369315165fb3c4e2c999ae0f625b SHA512 78cee20ee8cd3ce22e0c83ad15b1fee0494c7b6910969bf4d9df28faca12ee3a6267db51071f4d8ef123108dbe329f66580c670db0ff8b5f36c469acfabd1274
+EBUILD mate-session-manager-1.24.0-r3.ebuild 1948 BLAKE2B 3037e3935a41950b7677aa1147459adb44b354032f102bcd3ecaa72f953516c6a9ba8f413f5f143e2491bf5233b8ba9711622a878820440893e0da737c8a8e85 SHA512 0f4ef522a7f9d60283d00fa9777f9f8463bb0127d061069549499b5087efea63c81da85fac028803295ee932d74939e3ed1eea991f74ff251a585e124bb9ae27
 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
similarity index 97%
rename from mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
index 1eca4cc57b54..212c93bb5080 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)
 	xtrans? ( x11-libs/xtrans )"
 
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
similarity index 97%
rename from mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
rename to mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
index a244689335a6..426846b20ada 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
@@ -40,7 +40,6 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)
 	xtrans? ( x11-libs/xtrans )"
 
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 1d5fa7862174..bde69f4ea54f 100644
Binary files a/mate-extra/Manifest.gz and b/mate-extra/Manifest.gz differ
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 89cdfc3d1bec..ee5ebf7f7986 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,7 +1,7 @@
 DIST mate-power-manager-1.22.1.tar.xz 3188048 BLAKE2B af32a18e2561cc9689382ff9a94382180a5d2dc6ade34a6dc400a7b65730a6c26c6f32b72b6ec973210ac3baf4e8b6c54e489230e64b877cee4ffbbf1a195d28 SHA512 8eabd7f8171f0a6be610c849fad8346bb30ca2c69208e2e117f436daaa5ada3bf0fef479dc017f32f56ec6bd52a7ff7ff69d18baf01b402c5fa2747245261a81
 DIST mate-power-manager-1.22.2.tar.xz 3188752 BLAKE2B 351c18436183679b2b0ecf549a8efe16a691876b7299f06d88d7f7c3434feab1f35ac26a015b5425260dc1a41a4734f0244825a69bb77211320d60f4328ff63b SHA512 99a273558c072ce1d23c8964d9292f45a29a2d5a5e89b504e79e3686a65ad8cc7b200441ba22147d3d828f574e2cebc260c47531338e286b2c47988263763af6
 DIST mate-power-manager-1.24.1.tar.xz 6245524 BLAKE2B b9be1aab7e2f397edba9a681310a9903b11e11abf1af8557c613a1e6bf7b89d5aa495ddfcef4bc23f11aa6aca215b86e3a1c9adfdfd481f0e4353268ca5dd7cd SHA512 57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5
-EBUILD mate-power-manager-1.22.1.ebuild 1633 BLAKE2B 712bdd6d4692164e0793e8afccf4aee4e18aaec7c0b0e84b622a5acc4e60d142bcd04c91f5e57d7caf43b7ffc729de640664dcc8d90f337cb7f533717939d84b SHA512 e32ce4c63f1b1731392c00ff05eac2205b9663468df21e2fd7a8d4e076cd269f03d3e34e4b0395b8da19d0ffeba54b71fca774f638267e54cd0ae19dc42e3db0
-EBUILD mate-power-manager-1.22.2.ebuild 1633 BLAKE2B 712bdd6d4692164e0793e8afccf4aee4e18aaec7c0b0e84b622a5acc4e60d142bcd04c91f5e57d7caf43b7ffc729de640664dcc8d90f337cb7f533717939d84b SHA512 e32ce4c63f1b1731392c00ff05eac2205b9663468df21e2fd7a8d4e076cd269f03d3e34e4b0395b8da19d0ffeba54b71fca774f638267e54cd0ae19dc42e3db0
-EBUILD mate-power-manager-1.24.1.ebuild 1653 BLAKE2B e937ad4e91a884bc86dc22c90facad23b4dc70752a298bca09737c9505738f9fe29d622e95132ff730f4afc969b3d19b6ed216add2c213462d67962583015300 SHA512 f5266ad79e8cb5c23945647f35aeb598b43af820e83eacae4ff1450f16298e9b84a35ce36ac0a70a3f5477b769a6e288a4f894dfa8c07f3e888bcdc7d3d0b4dc
+EBUILD mate-power-manager-1.22.1-r1.ebuild 1589 BLAKE2B 621029918b229fc51db3db1b6a1bd3c9d58b28feddfbc7e1339f0f2af334be9b6e91ef535f0e45fed00290121dd9a7cc8d4bd2a5dd269602420c0d23ca00ef8b SHA512 42d62c1e85aadebd3f0177365cd267f395780f360b7213001e5dc195bbda4758df7eb784619ee6b3847a61136682f39feef7da31ab955ab2ac67e7c8a2888b1d
+EBUILD mate-power-manager-1.22.2-r1.ebuild 1589 BLAKE2B 621029918b229fc51db3db1b6a1bd3c9d58b28feddfbc7e1339f0f2af334be9b6e91ef535f0e45fed00290121dd9a7cc8d4bd2a5dd269602420c0d23ca00ef8b SHA512 42d62c1e85aadebd3f0177365cd267f395780f360b7213001e5dc195bbda4758df7eb784619ee6b3847a61136682f39feef7da31ab955ab2ac67e7c8a2888b1d
+EBUILD mate-power-manager-1.24.1-r1.ebuild 1609 BLAKE2B 74e8cb97733f750e228353ad8a216df6645a41d51a31230a746bd86cc1277995bad37219b587f0cb2d68781faef4c2b4b99ad1f08c728d548beaba1b8b028017 SHA512 8ad32bf0a8037a26398e11bbe80c03f6e7006444b48286318b2847e517383a022f986f6e3c1aa768f166d8e1a06d1194887116a49620951dde24e7ec5818ced7
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
similarity index 97%
rename from mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
rename to mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
similarity index 97%
rename from mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
rename to mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
index f37314be82dd..628d7105fa80 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
@@ -43,7 +43,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
similarity index 97%
rename from mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
rename to mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
index b188be8b1a4d..6db2b2e078c0 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
@@ -44,7 +44,6 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )
 	!systemd? (
 		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
 	)"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 42a67fb9b665..eb6589a85c80 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index e6edec7092a4..304bacb2bff2 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -6,5 +6,5 @@ DIST noto-20200308.tar.gz 853685953 BLAKE2B 1f25bf1b763161fc246b0a1ed532d4755e4e
 DIST noto-20200521.tar.gz 861394318 BLAKE2B e30f7ec58130786414f2dd33acaf9c75f403718612270e346fe51df0cb74088ddc34b699d4af9a494446940aa58a4c2cd043f46208aa7a3004a194703efb464a SHA512 d1090eae56c74237da4e35989d3518dfcb163deee1eb4df64a6be0ccb7e6f2a2207f0602ee5f0156efa2bdb3d105073d2e9a65c8841dbab34207c89c05aeb8bc
 EBUILD noto-20190524.ebuild 1274 BLAKE2B c5b3e243a4200f8904b79670e61fa6b867bc17da95930b12b9b7cb5e52207a40828267772abd7ce1f128d8283cce59f4c2b7e0adc6f286b380390e8fcad74bc3 SHA512 1fbb07f9edacd6d6bf70df4d949068a780c2a51db2434ed0797e70e3516bdc8c82c6aa41fba2f2dfb57aab8e91f231e2f50868f27dd4e15d95044746280e73c3
 EBUILD noto-20200308.ebuild 1390 BLAKE2B 6ca78a4d10745bd033ba6bcd0a1dac2d0f31b0cc49b67200645be7831992aa75b89202911466e4c9644973b19e8aad1e0f42625e22a39708185c055c4d026ca8 SHA512 01853ea7224c78bf3bba6b19236fa4c072064dab1f4cc8b9fa9e1f24274ad1e2c286b56b5828aad65886b322826ed09056b6ec509b8c3fc454cb853a49a6c1a5
-EBUILD noto-20200521.ebuild 1385 BLAKE2B e7ac3cce8d3b894c5358458bb01d59125af832920ed0537bb32fc0ed8f3fe2640c3cff87a8c230d3f8e7966065e866d01ae8aedeeebb746f88ba6cf6508a1fa9 SHA512 0f0ead84e45725fc75436473a4a079fccef9c06c415d784f3a86803453cfde38574d91283eaa4b87ab6b4e6e60a70420313346512f4c2fbd18520735702256b6
+EBUILD noto-20200521.ebuild 1384 BLAKE2B 2bb836e4b6226f73f31dbd3e02e1772b7f974274ea60478ac3cdcfb72fb563d3eb37775c40224015872e55d57bfb8e40e1e6e832e7f9d4a33b8e0c0972684df9 SHA512 9ffb0d85397bfc33dfa4b63ec2285c845b0d0d4b3045adf3b44e87fb7d5d0f0f4b972f61d978588b95594866bddadad8edaad33e07549440e496d3d94da9c9b6
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20200521.ebuild b/media-fonts/noto/noto-20200521.ebuild
index 402bfaf5f30d..d64c62c3af0e 100644
--- a/media-fonts/noto/noto-20200521.ebuild
+++ b/media-fonts/noto/noto-20200521.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc ~x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9739c74f03a5..ae721e94970b 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index f47ed26892eb..da9457bcdc45 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,3 @@
-DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
 DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
-EBUILD cairosvg-1.0.22.ebuild 708 BLAKE2B 0c4ae60144019c0dcb7230ca9e9c864fce160bc173a9af147329888d0c1b719e5e8b55ca6a6881b35e96063266903c0f280da85572cdf72c481e0a8d613904e5 SHA512 deb1c685e2c91a284ab591bb5ac4f4a00265564cb945d060273c9b8bddcff7d454b0557d33976119465798352ded1996bcdb6fbeb0338d328d46a82a63db26c4
 EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
deleted file mode 100644
index b51ea3c8cc8a..000000000000
--- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
+++ /dev/null
@@ -1,30 +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
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/tinycss[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( NEWS.rst README.rst TODO.rst )
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 37da0c42d90b..fa13164eae01 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,7 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
 AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
-DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
+DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B 4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b SHA512 379d319dddd49605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
 EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
-EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
+EBUILD digikam-7.0.0.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.0.0_rc.ebuild b/media-gfx/digikam/digikam-7.0.0.ebuild
similarity index 100%
rename from media-gfx/digikam/digikam-7.0.0_rc.ebuild
rename to media-gfx/digikam/digikam-7.0.0.ebuild
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index af574e61a168..d65c65ada5fd 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
+DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
 EBUILD eog-3.32.2.ebuild 1556 BLAKE2B 4a6f2ce822682b8fb164e7b95a26a16fe6bd9f1d09ac21d70a38942673370aa4b3e5007f3b41c37be9badb97f4f2080a1e8e82f0de3ee816ec7300f92d55b957 SHA512 e988399d2027b41da66b5004c9e879238799b24b12e3581229c995b39b51b7c78322a7734f1688f1b8c87f231e339d6cba8507778bd6d9ad18796b3a2e1bd5f1
+EBUILD eog-3.36.3.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.3.ebuild b/media-gfx/eog/eog-3.36.3.ebuild
new file mode 100644
index 000000000000..75800455eb94
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 7dbc20f488eb..b5c1ed70e557 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,6 @@
 AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
+DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
+EBUILD gthumb-3.10.0.ebuild 2247 BLAKE2B cdd39ee03971d4299e71b901930f1793238fe10ea007d350d85e2a833cac3173c54a0f833c94a0f5380fc67cc11f4d8024e64d40b3eab8d7465df96a702aa216 SHA512 8f97d11d156a9ff92f28d9bdb4c9373a24f0a3b2328067b67ec180f78021f790f56ad7491254ff724163932f13b3a717761de07ca3d725a70ab68084e523f3a7
 EBUILD gthumb-3.6.2-r1.ebuild 2717 BLAKE2B 62fb68e66370161eaa5cfe67eeca54eb2e3ae4d037a4f7997ebde75257a8b6ee61254641ecc3124ea03757ac6d18cae93249adccb453570a9a3a05e0c6f2cf3c SHA512 f5455213d6ee5f8613e4aed71d6b06ee7d409a984a68e463545630a566e6f83baf8ea490af97c24ab8243d72fbeaa4681d499cb8613b30a029029f95a704890a
 MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d
diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.0.ebuild
new file mode 100644
index 000000000000..92fddec51aa5
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0 )
+	raw? ( >=media-libs/libraw-0.14:= )
+	http? ( >=net-libs/libsoup-2.42.0:2.4
+		>=dev-libs/json-glib-0.15.0
+		>=net-libs/webkit-gtk-1.10.0:4 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0:= )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? ( >=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2 )
+
+	sys-libs/zlib
+	virtual/jpeg:0=
+	tiff? ( media-libs/tiff:= )
+	media-libs/libpng:0=
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use exif exiv2)
+		$(meson_use slideshow clutter)
+		$(meson_use gstreamer)
+		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+		$(meson_use colord)
+		$(meson_use tiff libtiff)
+		$(meson_use webp libwebp)
+		$(meson_use raw libraw)
+		$(meson_use svg librsvg)
+		$(meson_use gnome-keyring libsecret)
+		$(meson_use http webservices)
+		$(meson_use cdr libbrasero)
+	)
+
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		emesonargs+=( -Dlcms2=true )
+	else
+		emesonargs+=( -Dlcms2=false )
+	fi
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 469baec9341a..414fdf8a8aa1 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,5 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
 DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
 EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 6e0b004d145d58c7911121792ca6aa753082f2e837bc69e843da0ffd79f181e373be0ee30af2f83aeb0da6b108052d0aaea19bbe085dc33d63d5ce5d03714df4 SHA512 f22a745bf069d539393f4f677311cf859c92d3514a5fefa24d660118e99d83aff97553337463df7e937a3812d02821c5d7496d3fe15741e362faccc81ad3b4d8
-EBUILD lximage-qt-0.15.0.ebuild 855 BLAKE2B 17b5d05670a5f5dfc0f240ef8923c17123351974f83a1128ab4616e0b59c5be29fb3e85fc863f990f8bfc943821e725be377e57eac02fe1055d183021d1383b3 SHA512 501623d4e58afa35f7049b64bc6aa19613b7ab74b5f5759fd549fe13cf93e74ef6e334da2e56817ed97fa5f45f4637bf6ff45044e15cdacb9b58d63755dc79b3
+EBUILD lximage-qt-0.15.0.ebuild 853 BLAKE2B 02ff9e590aac19e81032e5ce7899af0c0d7fe8dc9a2dce9d38478025e4a831fa2d783e654f8740017baab772c496ff858bb9a397fe88bb355bc59de13571896b SHA512 18bbd164dc93d72bd8c523526d74b57abd1405e624f276f503e7317ec4555bdef6ade769c471cbaefe1a29d9aab0a780b2ba614c61c87f94cdfd8b24ef5b737b
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
index a0ad4a567157..27e66724b27a 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index ba4bdcd95e73..57dce906eb79 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,10 +1,11 @@
 AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
 AUX slic3r-1.3.0-boost.patch 338 BLAKE2B 8ae2f8fa44f932f3b43254c027039930a22209a31ac60fe572c0e3b883b5caf3f5b99e76acc0dd64f0b121eb31318d865bb19da1c918855910b36ac8ddb3a289 SHA512 3068908d72c3ddf54b063ac61edd01acec031462b36e25af2a69a635d286477d17f4937fc407fb1c69f6d3d2c2511c83cd40992bd3255c085deeeaa4a55b3213
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
+AUX slic3r-9999-boost-173.patch 1152 BLAKE2B 5f37ed2bff40f4f7da867ffb547e7f34f03864b313c8b085d13a8fd9bac9c3ef672e9dc730ac810ccbd5f2032e87f79a5d6d4afe0486c9feaa2fa6f57ed01c5b SHA512 f8045ca3f32a74fb2f657552ea4f85aa5e75bde84ac2db2e05810d8df934e5ce902bc45adfcc02b4ca33c759e0b7e2f6b25db941563a7d3c46ea9ca97240689d
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
 EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
-EBUILD slic3r-9999.ebuild 2646 BLAKE2B 69887be58dbafebdf1c1eb52c22db40ab4bce885634fc457d4c0ffdc3de64d378bcf8f68081e0f77ffcedb03cb2d2a3bc93101aebff24cee5d58acea2636cf07 SHA512 cc71f52231dfe4c8b10d49d232ef249b8a32ad9ec63db6d943d2ee8b2bc0b0ba028339cdc463c93e95a4d34501e8adf277f3e13f0de69940d6f50c8e6dcdd4b3
+EBUILD slic3r-9999.ebuild 2689 BLAKE2B 1aa5771deef7a1b0b475ebdfb28a1b7866be011da3207fbd7ffa3a215bb4f154afbe2a540fee751d776117be0ffef6d53ac5f837b6d0705239108ab7b5f8d73e SHA512 c96177d936221f8251b3859b24b64a9188eb814354e5a2c849ae87170c5791f8f4433bd020196f1a6c931296f3624eabbaa3b697937d1f1bee2d9b918dd519ab
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
new file mode 100644
index 000000000000..ef7289afcd8c
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
@@ -0,0 +1,39 @@
+--- a/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:40:48.867348908 -0600
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r {
+ 
+--- a/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:46:22.614152088 -0600
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r {
+ 
+--- a/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:54:17.078033850 -0600
+@@ -1,5 +1,6 @@
+ #include "SupportMaterial.hpp"
+ #include "Log.hpp"
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r
+ {
+--- a/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:32:00.045962432 -0600
++++ b/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:35:44.778426800 -0600
+@@ -15,6 +15,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include "boost/bind.hpp"
+ 
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index d4bc4f6a67a5..61ef1b641af8 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.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=6
@@ -75,6 +75,7 @@ src_prepare() {
 	pushd "${WORKDIR}/slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
 	eapply "${FILESDIR}"/${P}-no-locallib.patch
+	eapply "${FILESDIR}"/${P}-boost-173.patch
 	eapply_user
 	popd || die
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f06413ff38f1..2cc53c219432 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index a8cf5e3eb74b..21a056664db4 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -4,7 +4,7 @@ AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d01
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.1.tar.bz2 1037942 BLAKE2B 0460ec9449e3936582b29af6ef019ddbe9875090ba722e00074d3d3dfe6214f40c1d96cec8827bb724a52b06abbff1d80dc5fed46f5bb1f03bc5c46a765756fd SHA512 ed0a81371117a91a5024f3bef5a881ffa9521399eab5e016924669a3f1eba2d6a02efa284b160089bc581717d39d15325ebb2faf162e4d3dabe4c29785a5fb58
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
-EBUILD alsa-lib-1.2.2-r1.ebuild 2177 BLAKE2B 263db5805070d0c436255435b0ad6d8788f30b01b62dba79adf8705d5736760d9be0bf3f821f212406c9b353416a7125a687ef27a97b44e99fc50b6aa3a57365 SHA512 0f79c21aa74feb187d563c472d95628f7558cd2e80778a861fc220282e7ab2c1949e003a50722af9dbac5798572da2afa70da859e7bf082b7ece76672d91af01
-EBUILD alsa-lib-1.2.3.1.ebuild 2064 BLAKE2B 4454afdd4a63fa500fa00afb7b54ec4d08ee62e7481d4ee90491e1f118cb49fa0da5a0311a108854dd712b0f8589f739153e5196f1113ddf2f6611c2ae31ad8c SHA512 f416a0ab5aa031ed0cc5bf19c648318af59b47a367d3586877cabad2bfb2cdbcb904cf85d7c12358d8d68727dd506b9f4eb07cf06f7e85196cd3b7d4e0c5cb84
-EBUILD alsa-lib-1.2.3.2.ebuild 2064 BLAKE2B 4454afdd4a63fa500fa00afb7b54ec4d08ee62e7481d4ee90491e1f118cb49fa0da5a0311a108854dd712b0f8589f739153e5196f1113ddf2f6611c2ae31ad8c SHA512 f416a0ab5aa031ed0cc5bf19c648318af59b47a367d3586877cabad2bfb2cdbcb904cf85d7c12358d8d68727dd506b9f4eb07cf06f7e85196cd3b7d4e0c5cb84
+EBUILD alsa-lib-1.2.2-r1.ebuild 2167 BLAKE2B a8be7297ee529e0d99df9086bf54f1f357faaf6fb69fb1217511fba8c10128f6e20fd66ea46959eb1ab2d55c6b0b24a8baabd33f255ca80ea4efdf35dce3b921 SHA512 c90194937d98a4e740aef62d79b38f75ca9b606e37809040f9dfc410c29aa2bef2a8f52decc4510fb7ad5f40a5fc3829087cddc2237e44bbcd48a879f05e3c4c
+EBUILD alsa-lib-1.2.3.1.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000
+EBUILD alsa-lib-1.2.3.2.ebuild 2054 BLAKE2B 0ae472259dea51bc27b4cba0fe780e6df27dba7e81587f0a7d7d59d29505268140f2eb5b0c18689ff8bc5977ff0589128df7e2b20f8f17cff44ae6fdbe90bfce SHA512 0dec2b408fb7ad655bc6cce5ceef2e3f165a36d710c750d16de1f1e88a64463ab07eabad75872acb5f52b4fd6887995e042470cd76e381f7c0da9f7ffa71d000
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 4f118f5082fc..5ba025398039 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
index e11bdf33b0aa..4b268d8fb2c6 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
index e11bdf33b0aa..4b268d8fb2c6 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index d1e5eb798493..3c98e13335ca 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -5,5 +5,5 @@ AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc39
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 AUX audiofile-0.3.6-system-gtest.patch 5209 BLAKE2B fa4a40165b37a6d33b929efbd79e20a1a7b953ee6d826dfbe88907255f217dcad1f9f4b14b910abe0d60a5c6b3956c92b3a7d6df76d1a47b7e5853bd7bc1d3a9 SHA512 ae821f7e4ea1684651e430007b2b52b369769d8b60cc7180aee3c80c55c7d01ad9e97792099d2d6694eec2f090552355688e2ee3cc527d7a8989e717d3de5b5d
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r4.ebuild 1410 BLAKE2B a353524046426fd02361b9aea43154d8274b43bca996a0b2c3964fd1236ff496c84c32e38315c35a3766d87941a16ace8aeaf40944e59cd83f6ab57b64469cfa SHA512 87f31db2d7f10de9e8cb46938e7135e64f48c4d0224516f67ada1593d999c4730181ba43fd1308115c375a127e79fe859d89669251476bea92bf3cd80bd642f3
+EBUILD audiofile-0.3.6-r4.ebuild 1409 BLAKE2B 25674b0fd7d69d3fe1d44cc698d36218279156060941bdb580c59e41a08eed2a64501cc4735144a1b4649a8a06af089690c519ec97242474d312d1aa18e7c53e SHA512 6aa3b80fb36556a4ddf44415cd4d51efb5e9df639e9d140484b41a4599a9ee4309a1c763ba988e8dc96cdb0ffb87e79349d2c425b84f30fbfe86db89bd6d37b6
 MISC metadata.xml 359 BLAKE2B 3a6913b1f6e97d45f7d1c415879d82fec86642dc2a187907d1893ff9b81cf7781a5485e5140a901482913713ab4f7a5a8ce62df872fc75bf2f34f80d0dbeef9c SHA512 2f2ae33ca88cb3246c8419b88a800ba405123263a6cf2f94c9478d8303bf036ece9a6781a1fe83d8b1f329071623e76f6e909c0207289d6dad8166b163c3b897
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
index ed4def842fb9..99fb3b6f6e83 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 586f457fa5a8..c8441c34827a 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -2,5 +2,6 @@ AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bf
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-plugins-2.7.3.ebuild 4309 BLAKE2B 221f078e8a553d581c267fa8b70722d4c8bc7e3fdaeefc84d06adc832c0fb315ff396e35ac82757f0152102aa3ba09fd97b4592c9a6e5c12511cc376368274e4 SHA512 e3792244f82bef40c043258bbfc7fb0c9bc77e4aff1966926a76ab7f0693fb8c3c116f6f1fa330ea4eb4c3e45ea77295f5332b250ecedb17bec37c6edc363ff2
+EBUILD avidemux-plugins-2.7.4-r1.ebuild 4200 BLAKE2B ed5da75507e8fdbaaa792cff634ac0240a17b2fa0530e69d301184f5ca19acefb4918d870e44e912bb6e426f57fb13c54ad5237e551a2c87b61d3e386d0f1342 SHA512 86c6fedfaa7e3d0f0ea1bdac952faa3e9b84b332370d07dfc7dc550df42be2e4f2881ad5cd81ffa9ad4db5a6664f281557c685f7a30e57bb554ad90b8c5fc3f2
 EBUILD avidemux-plugins-2.7.4.ebuild 4225 BLAKE2B a4766dc2b32439917adec4a430736bbfaef169d95eec990d4769159822627cf68e852cb67e57e96b7793c3b47433da667b59287c13a4ebc7b6139d36bb36e0a2 SHA512 dc9d91e0ac345c1ea19a4f25b32b2d4012853ca22dd1cb8790a3258af6bc3926c7bad0dd81c2a474a1876e1c3148f7d1b23d8ab62ffae5615dc550f139547a0c
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
new file mode 100644
index 000000000000..ed880a38ba5f
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
+	dev-lang/spidermonkey:0=
+	dev-libs/libxml2:2
+	media-libs/a52dec
+	media-libs/libass:0=
+	media-libs/libmad
+	media-libs/libmp4v2
+	media-libs/libpng:0=
+	virtual/libiconv
+	aac? (
+		media-libs/faac
+		media-libs/faad2
+	)
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dcaenc? ( media-sound/dcaenc )
+	dts? ( media-libs/libdca )
+	fdk? ( media-libs/fdk-aac:0= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi )
+	jack? (
+		virtual/jack
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	lame? ( media-sound/lame )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:0= )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)
+	xvid? ( media-libs/xvid )
+"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	# Don't reapply PATCHES during cmake_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
+	done
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+
+		local mycmakeargs=(
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPENGL="$(usex opengl)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4=OFF
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake_src_install
+	done
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 411d4cabb17b..0ab7ca6cfe7e 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -6,5 +6,6 @@ DIST glm-0.9.9.7.tar.gz 4357077 BLAKE2B 59746a8775e0fc20fe8a8c3ae01c48841066d609
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 EBUILD glm-0.9.9.5.ebuild 888 BLAKE2B 8b24c2462309c9ee9447cb55e443f6b02971e62b038ba3147b33a66a3324c94f056acfd690c412cacaf009c21296ffe002ce1c84879dab029d3f48c3d6bfce65 SHA512 79bbe88e3487f1ea637272e74c4e81f0037c5249aead813e4ce3060adcfa3040efa2340a3fb3fa7a31fa6f8a0ae129e0b64bf8d1e5ef394d91b8fca614d830df
 EBUILD glm-0.9.9.7.ebuild 1211 BLAKE2B b567e64d07b301f9290e7ab533145497307185050b3ffea4de9fc8c27ba6c3d2f6eb3356d35b2aa1517aa1495cd2632de8afdbba0d157186246789841950f5f6 SHA512 c7ff576f73564277be087ac108e255699017ede17ead85ea50074b08bcacadf25f1bcdd6286f046893f3f4afc514ca03c7612462707cb170d8c982f409225a0a
+EBUILD glm-0.9.9.8-r1.ebuild 1374 BLAKE2B 24a84f199b266f081213972d188aec4d75f146d3b736c946080842486cb92d086b053be93f82f18cd3fa505d0188e41ba54f1ada0ba195b749bbb80521cdf1ce SHA512 4a7d8993524a8c91e8f0192becc0ac66678f757495e2867f90510e6eb7abb77255cccfebb06f77cf18cc07fd79e62968e4079f848d1f5ffd2b7f6f9f03015559
 EBUILD glm-0.9.9.8.ebuild 1229 BLAKE2B 137b4407d122ed1cabce0a0083216499fd4cad705fcc0f66bc14191b5abdac188b58746c9272f7ca316311547410d9f0eb297b437adf98f36b7a5d05d80d2d22 SHA512 3b103f7db0bd6df218109da65d17f1f323aaae481dea170ae6fc34e51aab7f802478abeba6bf5d40c848b02068f7217d4c0de5adae7667f78e98420e531b80df
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.9.8-r1.ebuild b/media-libs/glm/glm-0.9.9.8-r1.ebuild
new file mode 100644
index 000000000000..d247d9fdf8e6
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_configure() {
+	# Header-only library
+	if use test; then
+		local mycmakeargs=(
+			-DGLM_TEST_ENABLE=ON
+			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+		)
+		cmake_src_configure
+	fi
+
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:$(ver_cut 1-3):" \
+		"${FILESDIR}"/glm.pc.in \
+		> "${BUILD_DIR}/glm.pc" || die
+}
+
+src_compile() {
+	# Header-only library
+	if use test; then
+		cmake_src_compile
+	fi
+}
+
+src_install() {
+	doheader -r glm
+	insinto /usr/share/pkgconfig
+	doins "${BUILD_DIR}/glm.pc"
+	insinto /usr/share
+	doins -r cmake
+	dodoc readme.md manual.md
+}
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 73b85f907bbb..a3b9ea8f6b48 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,5 +1,4 @@
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
 EBUILD libao-1.2.2-r1.ebuild 1568 BLAKE2B 811b4280ef55faf29b54d8cbb54f98fa63948f1b3bda769beb3fa1751c2986cff50bf413424b12b720386fbe67a131a602b7860580ad30930ba3b3d1731c8e5a SHA512 d1c7352b42b631619e1112b6e576096aa7190c3f429da97eda07ae06e4782f881c5dd1dc0589ed1781a8a69234e712ae62dc78221015f7de02a6fda8c14e41eb
-EBUILD libao-1.2.2.ebuild 1511 BLAKE2B 89feb90e6d5d0eb8790680443d2dd3b46116bbff42aff706c68ab06943a5dbbf02f0c5a709b7fe48ffede4baaf82289784f1b0ccb7efe0ad1493ce610ee29a12 SHA512 77be60ea83a624088bb09be8df82f16d55e9c5c2d6626f333d90f4d8796d1ed5572131fdd607a2aabe24f536c55805b49d8ba0df7ef0ef9c960db34c0cd0ffd1
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
deleted file mode 100644
index 2571b49101e0..000000000000
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool multilib multilib-minimal
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="https://www.xiph.org/ao/"
-#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
-#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio static-libs"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-arts
-		--disable-esd
-		$(use_enable alsa alsa)
-		$(use_enable mmap alsa-mmap)
-		$(use_enable nas)
-		$(use_enable pulseaudio pulse)
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CHANGES README TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index cb38791ed326..d8b7ffbb89a5 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -2,7 +2,7 @@ AUX libmad-0.15.1b-CVE-2017-8372_CVE-2017-8373_CVE-2017-8374.patch 5122 BLAKE2B
 AUX libmad-0.15.1b-cflags-O2.patch 347 BLAKE2B 65476b488c2dca48bf983da739240651e82f448b8e6546dfb68e2a2f29e953fcb6e6b1f498d1e805ccbf32cc8914f5b49c5135eb19388c8711989312a3692e7c SHA512 13a8bac30cea4861f903b4abc8673f9a35b6253aae6a02915f99b67e5e8c56460fc1fb059a0aa52143b665f888928baba098daf0ed022420e46317be4dbc6161
 AUX libmad-0.15.1b-cflags.patch 4867 BLAKE2B adcfc2732f6b8b2310f50d234a695820d8fdd7f292de6621abfc23922cda512d26b1eb64dcb36751ea8cd34784189bcfe8be7cd46ed654f92370071df7598890 SHA512 01dc8421dba2b652aa8ca6d1f1a5c310645465b18190ebfdeaae516de881869957e8e7c0c373d0d09623da33719d01e028f2f6164790b54c43a71271f5b4dbba
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 BLAKE2B aff2507810157aec4062d157546b921a43cdf63a4e0684f5864ea71b36b4fa726f4ce33d558b7aaec8bb927876abe23c017ef3a1ba9b55715202887010cba3a3 SHA512 de08e0ce3c39b76c2838f940279a39c26e9c7e5b1e762c44f0db1ce3f65364e51036ad4f4ccdc160d80660c723a1bede70a4b505a9a01583de43ebc47aaeedb9
-AUX mad.pc 211 BLAKE2B 3b8678e667461caa6ddc2479687d92a8bab9e7e05be73640e63c9eaf070fcd69d9e26dac1d5e753171795236f5a461c7f59ad46e899ea3227902b9773f9bcfc3 SHA512 ec0b14bd0c6236a216107b507b92c06e295352f1657ba5e45f37fff220a73e1454b262ac36fc715d698c4ffd210d348fca71cf0198e2c49d16fe0ec5ea839f08
+AUX mad.pc 213 BLAKE2B c2ff4ab93b4acf0022690a74ef9c88a2b924fe8918f39a225c7684336d43cd061ec5932ccd76185d5c12fc670180d2b2d367759d166fb3b07c20d20035731b40 SHA512 0b667f39e329732d539f2f01fe9a843b1210d41dbed67e5917fdc173058f32ad0826b3657e1940c7968e073a732a6b462a75d6b8bc32dcd490bd74bb16ee7605
 DIST libmad-0.15.1b.tar.gz 502379 BLAKE2B b00de857a0634d7193f656b74cdd5c0642b674f3ee3303a642f8a6fcb64eebaf2b100c6e09d85d892880b5fc4f224c0a5d1ecf5bd95bc5caf00e959c7beac4a5 SHA512 2cad30347fb310dc605c46bacd9da117f447a5cabedd8fefdb24ab5de641429e5ec5ce8af7aefa6a75a3f545d3adfa255e3fa0a2d50971f76bc0c4fc0400cc45
-EBUILD libmad-0.15.1b-r9.ebuild 2201 BLAKE2B d67e6f7fff48e6554907d174f57ff011f46c2dee9a17cab1b3177a9b5b95be33be3a41921b02b0e13390e14dd43436f1ced2ade8561a91d1d7182b384e504412 SHA512 c2637c57fd299903efc6a6b426fa5e79e86a94e79c09c968b846e0d00bfe05fdeb819651293eb59e8ea6ffb72ad3aef7bc98d2717ec71b9237a56dbc8cf4c11b
+EBUILD libmad-0.15.1b-r10.ebuild 2270 BLAKE2B e7940d0ee46dd00b4d74c34b3011a200a2fec7bad0502449edfa211fc2062ca929255703dd2224f5d563c45cf56e981ee5f502d1c5e9330545896e454116d090 SHA512 73904c47475f5d490a86a3e69e774123be6dbf7f4c364e7cb0fe706cff640b3f2136e975528edbcd09b33435c08e1b36bccb5a7e41a7b381b8fa8083790c95cf
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-libs/libmad/files/mad.pc b/media-libs/libmad/files/mad.pc
index 14a66f552582..329276cdeec6 100644
--- a/media-libs/libmad/files/mad.pc
+++ b/media-libs/libmad/files/mad.pc
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: mad
 Description: MPEG Audio Decoder
 Requires:
-Version: 0.15.0b
+Version: %VERSION%
 Libs: -L${libdir} -lmad -lm
 Cflags: -I${includedir}
diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
similarity index 95%
rename from media-libs/libmad/libmad-0.15.1b-r9.ebuild
rename to media-libs/libmad/libmad-0.15.1b-r10.ebuild
index 856aa42c5f77..285cf5467f48 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r10.ebuild
@@ -67,7 +67,9 @@ multilib_src_install() {
 
 	# This file must be updated with each version update
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}"/mad.pc
+	cp "${FILESDIR}/mad.pc" "${S}"
+	sed -i "s/%VERSION%/${PV}/g" "${S}/mad.pc"
+	doins "${S}/mad.pc"
 
 	# Use correct libdir in pkgconfig file
 	sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index 8ed35e42a06d..e6419ca2d951 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -4,5 +4,5 @@ AUX libvisual-0.4.0-conditions.patch 889 BLAKE2B 6c197b4d47249d341efa434165c9681
 AUX libvisual-0.4.0-detect_amd64.patch 431 BLAKE2B 2be06d4606c73867b44c62c154bd0a309e76545469fee02e2840f41be9271b17b1edd26717e16f74cc63af7d4627d7792270c5cf75e89f9a8f146fe318952b72 SHA512 b102f61acf60a7faa1495087c96c8cba893c250454ea1b5ed60c14ba0578d2fb794d2722f24e9d6b5bf37369fcf83bb2bba3929fcd49e24c4078f2a9fde317f3
 AUX libvisual-0.4.0-inlinedefineconflict.patch 1870 BLAKE2B 3c20d445a0f94d81361cd12429e2572a17656cb9049bb83a25f1fb12e17606a94c1a005582c08a90bf8cd10cf25adcf9f9420e48a561bdbcb84eeb3b15399957 SHA512 2951ca778e732685409911c05f24e8e85492e5af4d8eceb0558636b4ace53b8967250250712c5995239bc5f7af01d20774042f3ccc9f90b370ca3cff673bb0b7
 DIST libvisual-0.4.0.tar.gz 583386 BLAKE2B 277348dacae1382da7e9212f7338a9cbc8aa867637d7db10ee22551c5e33b2d09870e94437958379245acf609dd70d3fa85f9ac14b40413424a7a14ca09e7360 SHA512 ab2286de30d33582a92f16e46436fcbc44b74649952df6e94d96aedc2cabb18d3361496c0b8ab6f52f7178214bf735673c8f1820c3d149304787ba8407201b95
-EBUILD libvisual-0.4.0-r3.ebuild 1256 BLAKE2B f1d0fa2d929f93097d515ccbe14fb0def4b80007d22af3944d6a921231768ed56e1d1a79d575957451cc482e81fdf44848aa2a1d3f7f3595dd0f3fd35f7e5175 SHA512 efe5081ca7b4b7056387c619ecd969ab374246d75c51f756d4889110f058d53df09eb537c41134d805f5094ef07df99d3fc26436cd26cced79d6a9b5c6530b41
+EBUILD libvisual-0.4.0-r3.ebuild 1242 BLAKE2B d15f933d83a3d259f40203dfadeed3054d2089a90cd3700aa2d53f81c997d83d8dc59f05e9fe92fd8c8d83bbedcf4aad5b721ccc14e19dbf2376a3bf8ed7c389 SHA512 50fddaff8738fe44fc7d30a9d0b5784fbbd094b5832a0989c62eca54aaf9256a3df6c6fee730fa873d74d9c1525e01da4b99b98a9e0c0a4736a344759121c367
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index cad7f9764d7e..bc2a53c276ad 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1
 inherit autotools-multilib
 
 DESCRIPTION="Libvisual is an abstraction library that comes between applications and audio visualisation plugins"
-HOMEPAGE="http://libvisual.sourceforge.net"
+HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 128deecc6223..0e213e0393c0 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,6 +1,5 @@
-AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
 DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
-EBUILD lilv-0.24.6.ebuild 1744 BLAKE2B 8215ab36a46d5e44a2efe870e719efa061bdb6b9917981671ca6889685090cdbdd1922501c8dee394b55ed6ab54769a302f1436ab033085f5783e5cce646a330 SHA512 ee36be9929f9a1cd117acc52a9fcf9e399c4c68fc11c2c1759ffe46763c3d67814e8aea2fd1bb9042888d8b8d8c558d4fbddbf998a305a502b6db18172169bb5
-EBUILD lilv-0.24.8.ebuild 1750 BLAKE2B 9a018db18b0c796d6538cc7b0d5a6ae45fba39b6acf449085392f7c3309444456aeaa4f476636deb9aabbd35ba093682b5beb5409e7940340f11b8d5e916ae3a SHA512 231ab4a99e0eecee9c7d2d93b979962f3376ec9183963dee40ea7d076f19cec151e215b5e73d55f14267fbab974a17a514cf37ed37207805256e8f2980892c76
+EBUILD lilv-0.24.6-r1.ebuild 1744 BLAKE2B 8215ab36a46d5e44a2efe870e719efa061bdb6b9917981671ca6889685090cdbdd1922501c8dee394b55ed6ab54769a302f1436ab033085f5783e5cce646a330 SHA512 ee36be9929f9a1cd117acc52a9fcf9e399c4c68fc11c2c1759ffe46763c3d67814e8aea2fd1bb9042888d8b8d8c558d4fbddbf998a305a502b6db18172169bb5
+EBUILD lilv-0.24.8-r1.ebuild 1706 BLAKE2B bbcf8c9856d714b638caaf900be37c4f69f13ad4ee189b6edd0beae73af62d4abc1aa4831be8e2ab52c3188b6b386eea6e16410e2d7d359f0b8ea9d6bfb3ab4f SHA512 0eafa79adf988939890b8b56ff3d0e0899cbf7a6c5c705f1a2adc8b2eddc7ada325d086317371b1662b0caaad61c441af4666545135bea52e601d11e510250f2
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/files/includedir.patch b/media-libs/lilv/files/includedir.patch
deleted file mode 100644
index f20357302b23..000000000000
--- a/media-libs/lilv/files/includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wscript	2017-12-19 20:47:08.288722501 -0600
-+++ b/wscript	2017-12-19 20:46:46.932616417 -0600
-@@ -196,7 +196,7 @@
- 
- def build(bld):
-     # C/C++ Headers
-+    includedir = '${INCLUDEDIR}/lilv'
--    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
-     bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
- 
diff --git a/media-libs/lilv/lilv-0.24.6.ebuild b/media-libs/lilv/lilv-0.24.6-r1.ebuild
similarity index 100%
rename from media-libs/lilv/lilv-0.24.6.ebuild
rename to media-libs/lilv/lilv-0.24.6-r1.ebuild
diff --git a/media-libs/lilv/lilv-0.24.8.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
similarity index 97%
rename from media-libs/lilv/lilv-0.24.8.ebuild
rename to media-libs/lilv/lilv-0.24.8-r1.ebuild
index 698ee9385c5b..9478c738d163 100644
--- a/media-libs/lilv/lilv-0.24.8.ebuild
+++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild
@@ -33,8 +33,6 @@ DEPEND="
 	test? ( dev-python/unittest2 )
 "
 
-PATCHES=( "${FILESDIR}/includedir.patch" )
-
 src_prepare() {
 	default
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
diff --git a/media-libs/lvtk/Manifest b/media-libs/lvtk/Manifest
index f25d08b3eeac..70aeaa2733fd 100644
--- a/media-libs/lvtk/Manifest
+++ b/media-libs/lvtk/Manifest
@@ -1,4 +1,4 @@
 AUX lvtk-1.2.0-boost-system-underlinking.patch 535 BLAKE2B 371119bce2f368e0ee5cb0db987dcf631da27b01db2a3883b1b0c4d6f9f4775bb2841a76cc540f60aea4149977eb8c304bc5788f5bae5da6c39900bdcdad7914 SHA512 80cbe3d091975120e0293c1aed26e26d579bed0ef51d4bbf30ac62d3f544a5501be01f01c24f374dab21d9c76e1d3fa64c9641a5d2b13edf136b8d8cca4bdeb0
 DIST lvtk-1.2.0.tar.gz 201146 BLAKE2B d6aa47f5d89e861393b95d60fe53a232f8047c77f8593dc7dcfc700c3933d2bc37e3e499d1d63a84854e0bcfc2232c170cc92b69fd8b01be30f0f581b216a4a9 SHA512 f193ec28103cb2f6353ff0f96f8790041baf1ae99472c5d04017c23b42d0179b1f5e1de6722e17080410311d0e7e1de4ca0ae9ab76fb3bf8a02d9dc1451d8db7
-EBUILD lvtk-1.2.0.ebuild 1445 BLAKE2B 0f29698da7296c17974eb97784471d8a440126022ae67906d8dd24d52dc3442e23d47445223e8e31952121d2e149edcbba44e00ff0bcbd01fd3d85361e384e7b SHA512 62310db51ba8e4cc1a01c55383996abfa312e44afe93881901958c13bdf153f872c5a479fbbc5c0b506d3ad7adac0d88df38de8a2f4e673cbeb05ec44f99b98d
+EBUILD lvtk-1.2.0.ebuild 1438 BLAKE2B 83c7799a1250d0946b993d90d5fb523a99e64275098ae8afed3f074ed427388e453be2424ac13a5708041ababd802b03c97b8470467a9a429ca2d57c177bf78b SHA512 02f5071cc7d197171074a0dfa071bb8eb56cb98e2b7f566bfe6a933b962a2873d493390d22be4e318f0eb95caaeb82123f0c9c14c197355de090f4f1d7076ec6
 MISC metadata.xml 502 BLAKE2B d786aa20ddf92b3f0a61bc1df1774624e17a4028bcaad6bdbf220838e0fd834281bf9c08c53ed87d2b4fd7edfb6729a22bb529f563259860ce106e8ddd712f55 SHA512 7d4eca504306d8c96bb766728cdac0f5c61c72ffa784c5923364a16d3ae7c2b9fa89e57f1e00533dc8571d01d0bfa319445f0904373e453bd66970b893fdda45
diff --git a/media-libs/lvtk/lvtk-1.2.0.ebuild b/media-libs/lvtk/lvtk-1.2.0.ebuild
index f55c8072ffcc..214b3256377f 100644
--- a/media-libs/lvtk/lvtk-1.2.0.ebuild
+++ b/media-libs/lvtk/lvtk-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_install() {
 
 	# It does not respect docdir properly, reported upstream
 	if use doc; then
-		mv "${ED}/usr/share/doc/${PF}/lvtk-1.0/html" "${ED}/usr/share/doc/${PF}/html" || die
-		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1.0" || die
+		mv "${ED}/usr/share/doc/${PF}/lvtk-1/html" "${ED}/usr/share/doc/${PF}/html" || die
+		rmdir "${ED}/usr/share/doc/${PF}/lvtk-1" || die
 	fi
 }
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index a7322c6de694..0dc621d3c741 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,5 +1,5 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-r4-python.patch 1540 BLAKE2B a5fe8c48e8d312cead822fc8893f8a610bf5cf280dd2445da04ab42ed13a5a121174afa2e8874dcf3f7a7b89cd60894a819404438c6d5cb2b99a8e2ae6f3aba8 SHA512 d7ded737346f9756450ff3eaf35daf33da941a109d7db07598ea57593ef3272213b889a9ab33bed71bead4583cb080439813bf7fc4a6d1a6cbb84ed4cd25b51f
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
-EBUILD portmidi-217-r3.ebuild 3215 BLAKE2B 253b7acdc98e1bcb7c613de8cac377322191813f99f8b4fe79faf5d7eaeb9d4814a4026585a3ccb531b00e968993fd9f5be1f6c02b850b34dd5966b194ed670e SHA512 9fe17ff05b9455a8112ce268be7d5f1edc3ca3880e977821e505a91ccac5cdc5f13189b05544af75f1e8f05b225ad6ec9b428b7f3970a45649ddb1308ad1db5c
+EBUILD portmidi-217-r3.ebuild 3214 BLAKE2B f9043554f0bcf7b3c7473d667dd5aeb830b10ec123936f00d3762879279b14f844be76f2f4dd7f29776e03f767cedf764718287a60208db10b369ee6d89b33b0 SHA512 c7c1e60142742b8d934218ee6597960ca25eeba8f8d08fa49c49ff9f0063847bd2c6737017af0c96541d5771d76ab6eeacf9f42c7b91244ebf9ef1726f2ac9cf
 MISC metadata.xml 436 BLAKE2B abc47a4c2597048c3e2037006db7811d99cb1ce5c35d83dec30fc415f6d419344bf283d580c153309bb7934b6a12fae878cd480f6c12be76deb52bd5494e2c5c SHA512 a7f6997ff7647e20526181189d5d38ebd944648a508a90ab42ada4dfec84f5165a25b07f5738880a9dcbf424e2b74ac7c3224f6b8d47d9c8a7f3fa7c02c02cbc
diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index 4bbb9856c819..84a8b974ad2f 100644
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="debug doc java python static-libs test-programs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 95fa78a4893a..b13e25492b26 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/ams-lv2/Manifest b/media-plugins/ams-lv2/Manifest
index 3fc5bafa01e1..3efd180ed503 100644
--- a/media-plugins/ams-lv2/Manifest
+++ b/media-plugins/ams-lv2/Manifest
@@ -1,5 +1,5 @@
-DIST ams-lv2-1.1.0.tar.gz 217762 BLAKE2B 97320bf8314b3f8b208cc20db03511bd456e2268acf1d9453c494311fc00f0d1dc604ac12e9bef1429b1d9b75f93672a470aed4b2c0f7192036c4fff07e8f71d SHA512 4a994d21b9078ec84cbccc99d028a75a175bfc7a6648a7daf645da7877e2fda6a3ec31b351a01fa2ddf8f6a815f79e1dc1f9bf74ea8c5b82931076ceb645bf54
 DIST ams-lv2-1.2.1.tar.gz 233118 BLAKE2B 4ec5eca89c332405d9fe2b4c9bc25246f024cb9d629c1257d5dc6ad816fd45f4b7d7fea70f84a0715d7283022f348bcc1172d6ed9824f27d7e319dea308f4058 SHA512 216435bfc8620f7138791243dee60c27f7e3a38b972dcaba4150a47e1d8d53cec807246ace658b5136b45c43fd7e533df49f8b9bce8d40dc9d148121b9388886
-EBUILD ams-lv2-1.1.0.ebuild 802 BLAKE2B d639a39ac311395778b246060187f274f047bf1da4074950923beab789f3433d02ffe4ed04646ece271d5ade0332e81ce14a97c8ab02277af9285284999fbacd SHA512 50799271b847ee0997a4ce0ea0632938ae457c17ec5938b19c55e8320b13e911fa3a2924a7236049e04159e1d1e954b88ea286bafd04fc5533bb26901ef7cd3a
+DIST ams-lv2-1.2.2.tar.gz 488234 BLAKE2B 1dfeaa2708bda64aadb00d8ec5f57fd3a7dd35a1fdce5fb2289f52f00fd73d25a11f39c91823c9322a5cd625ff369c4b05fd9de300b1635e172aefabb02825ea SHA512 6c1c6f3179a851f67e162d225a761c38678159d9f178d9bfa3991b84b84ea557f5a44882ea710626204f158c40ae18f0e87f24faec0a0bd6aa64e18eeb81c45f
 EBUILD ams-lv2-1.2.1.ebuild 768 BLAKE2B 9dc0c768df4aab5cdfd09c0251480e98818306a1f8acbbaa278ac2a494b252da54696b99dae20339e156acfffbc7fd98bd81a849f53868a36f86b4d6a2057fde SHA512 a36a0dbc3fb602f217506b0b2c0800e802d0c151dcec3cba53b6bd8df8e21c8c805c21575b10bcde36494f88c2509d8f9c1d5b67d8766ac15e91283ded3ff3cc
+EBUILD ams-lv2-1.2.2.ebuild 773 BLAKE2B c9fc5a9e090e364efd807922f850bbab3d864bbb87657a98ff4fd03ca99318e0f47756dfd514852e387a4c245ae6ed2b195f4d61c841e0d672446bc762cafbdd SHA512 3f760be51f826ca6513cfc1dee7c32000e1ccba79317e55899a7672cf3f11d2248996a1da6a766eaa9535b34993ef4620bb4034c3297dfa820fca86fd5cdcea2
 MISC metadata.xml 350 BLAKE2B c86ae42bba6890c736a3d0713e5710adb317cf8d7270bc30f836e554a367d23b19d954c74174c97de60fdd2875f2bf473a75851f1de85889568c3926c78206f7 SHA512 ffbf5d59fc926a80abcb1d099bcffa5c89fe0fd1ea3fcc3a4ee0dcf431b705ad2cdc867f28961173c5b2c62490c3cdee3b0d9cc7ecf493b1f1be6511bc9f2c27
diff --git a/media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild b/media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
similarity index 71%
rename from media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild
rename to media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
index badb755250c3..77da5260069a 100644
--- a/media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild
+++ b/media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 inherit waf-utils python-any-r1
 
 DESCRIPTION="A port of the AMS internal modules to LV2 plugins to create modular synthesizers"
 HOMEPAGE="https://objectivewave.wordpress.com/ams-lv2/"
-SRC_URI="https://github.com/blablack/ams-lv2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/blablack/ams-lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,10 +18,10 @@ IUSE=""
 RDEPEND=">=dev-cpp/gtkmm-2.24.0:2.4
 	>=media-libs/lv2-1.10.0
 	>=media-libs/lvtk-1.2.0[gtk2]
-	>=media-sound/jack-audio-connection-kit-0.120
 	>=sci-libs/fftw-3.3.3:3.0
 	>=x11-libs/cairo-1.10.0
-	>=x11-libs/gtk+-2.24:2"
+	>=x11-libs/gtk+-2.24:2
+	virtual/jack"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index 214ed82590ee..b95a430ae289 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz 1822081 BLAKE2B a4d251e46ed1f614c7ad479be5b139f872d4bfafb9f8ad16e96e5c000b96a80b42755d8710551c5e7be1a8f2a6dc02d7fe2a249a38fdeb5d186746de7260a621 SHA512 4b77c1a1680321515cf22ed269b801304a20126f237fc2151c54cd53569bcd446547478d4ff50e02175e4df689eb815af35de75848c4e2ab97451912783c49b8
 DIST kodi-audiodecoder-timidity-2.3.0-Matrix.tar.gz 1822842 BLAKE2B 92545858b9deb5fb61a05830be2b22cd96340e6e2db09bac7dfce5b16ccbd329d677013352117204609d13159d674f1bc919e8fff9cd0e2cde8eb587d83082fa SHA512 d119a50baf8e387d1212e10bf7f8dd5c22e462a85cb0dbd3df2fef7fa3490336af098b518745d4192d22703465dfbe182c5a3047db97d7beb4babfb9017eb0a9
 EBUILD kodi-audiodecoder-timidity-2.0.5.ebuild 702 BLAKE2B 6fd2ee0760d4e9dd1a4e9e8d3247837d40c53b4ae35068668fc498f90728afe4cada15668a4b1a42999c992433ed8f7fb1d0c381cbb142c6623583e7bc686acf SHA512 a69394d9e284cfd7458637b34e67b121e7729aa6997c5cf7f8be583cdb97c0d1f318f54414e086e76e88099ce584ea2d1db5b83fd7336c256a6dab298141f785
-EBUILD kodi-audiodecoder-timidity-2.3.0.ebuild 692 BLAKE2B 273117efb0fd36a663f9cf5828149999b5b3986e721e2bc0c335f96b7507488a417411b2cbc8dd330965b2faf891c337d4dd37a46a65e7f4539fb389dbb236a1 SHA512 d4484a2611e3e8b2e0413a266c6f28a6438efea296e39a7e54632b34b7b0b1807cba365f42a4455cdce26283930760f882e037ba39cdb0c9f00d0a56181d0671
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 693 BLAKE2B 2adf9ed2e7887ee7d247b37c87b85793be0d69784f937aca3f51b5914233b84d2b67134e628c30ee035e02e1042c88890d77f9e9d94a0eec6b4dd487d2c7000a SHA512 7863dc860914ff16c3fcfd772285d293b42c5c1c6c3e2b40c6b609527c2a976afaa86d6c3cf3948258110536e33fb59f9dd30757db1705f0b594db0a6fb0a0c9
+EBUILD kodi-audiodecoder-timidity-2.3.0.ebuild 821 BLAKE2B 5c83a9914d30e8b2831d4d601f8816ab3df3bd79d44d6e496c8de56dab36dc787a2cec18a6c0c73d486fc4174df04609cd11f465e179aa10313601da7e7b05ad SHA512 f62d009f4309a68b7c53baa73e06049122581f5d3ae751f6a2f24088750ea3daa40d0cd546d460f7b674316a6a526af0e23fa0d48ae3c86e6c10606fa999250c
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 822 BLAKE2B c13d2b370adca0ac9fe169470d7d13ee767a69debaed6bb07e09bcaf3405f5ef39aecf185507b5fd45365ad1bb50b2969443e45d909bf2cf7b4714e30f523ac6 SHA512 ebc415c218e6396b57d6d99dd700a99a3ee8183ca7413f8ebf97f0f8ba0846b91ef463f4b9f1c49af907c8357def13ecb113f16643b40adc4439ad2d615d3d75
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
index 5de6569fbb21..fe575b284cd9 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
@@ -33,3 +33,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_configure() {
+	append-cflags -fcommon # https://github.com/xbmc/audiodecoder.timidity/issues/32
+	kodi-addon_src_configure
+}
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
index 295f3f727169..07a5bbf12525 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -33,3 +33,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_configure() {
+	append-cflags -fcommon # https://github.com/xbmc/audiodecoder.timidity/issues/32
+	kodi-addon_src_configure
+}
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index a40206ee1cdf..6cf1b4062aef 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audioencoder-flac-2.0.6.tar.gz 21666 BLAKE2B 13c63fd4987dd4e911e3af44642dea33a7d652b5f465654e7038247000aa324ff2b2422f22d7ed88a7f956c3d15dcf960cb9e5bde4b70b3dac3604ada49a099c SHA512 7de2b0f5b36b62bc1f066e5c99fba2aa61baac5f204a75556172aa95332999806a34babef08ac5e516e62a123b83d3befaee6654d3089ebd1a305335a40d88b5
 DIST kodi-audioencoder-flac-2.1.1.tar.gz 27295 BLAKE2B d1fee7d52849389a08584e2acf72da804a410bf5b8f6d891f9ec8f47904029469fa57cd2320bf603f9ccb3e4d4e97f72593bdbcf09a4d34c67730945b7ed183c SHA512 e817592fb237cebdb87abbba4488bc25d48776ae069fda3557c08aef08cf840d5c0a8a2833cda8a6766634d42196f90f9d78eb70272f2f38a38044132e517074
+DIST kodi-audioencoder-flac-3.0.0.tar.gz 27573 BLAKE2B ccef84245eb6ce23527b33900e22e304282477eccca728f5a899db80d7b1f64a00fd1de65f4303bf4261554c038d48adf49f417a8161a9359e9ead81c7288a7b SHA512 73dd9526a498dd92076eb98044f75baaeb4dd93251f6a9a2d9e9a9a8553fb9b047b861b8518c2fe2803ce06cd794a5436f80561bedd82de1fc2df727f28d1b7c
 EBUILD kodi-audioencoder-flac-2.0.6.ebuild 822 BLAKE2B 7212e7e2546c5b98346064254db6513a7a294d71cfe7fbab0526853c9a5e4b31ca04998453ba30154439479e7523fa047681837af6daa86a9c057d88a3cd2458 SHA512 787bbc97724bbc24c2c1719a5cf226b33137fdc642ea0537205d03af5178ce7917e36048c628a03ce183be8b8a4ca44986ef9520062ced0cb9406064cfe70898
 EBUILD kodi-audioencoder-flac-2.1.1.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
+EBUILD kodi-audioencoder-flac-3.0.0.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
 EBUILD kodi-audioencoder-flac-9999.ebuild 824 BLAKE2B 897e82bd0d5d7f1ba00b20d70b913be3b200e9d4bf527bc70d73ce9b44f54462906d4bb4211a686ae1f045c20d401fee19419b7d0cb69669decd3c12ec11bdf4 SHA512 300ddeb7a8d3e0f966fe87f57f80ae2fcb2ee82ea8471e3df885b14b6f720f4c734675ffd44b4457916f5a4acba33297b0a774bebe4f04290d6c848f4d4f83cc
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild
new file mode 100644
index 000000000000..580c59f48c6e
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Flac encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 3c6c335696df..9852c592d1c4 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -2,9 +2,13 @@ DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c6510
 DIST kodi-audioencoder-lame-2.0.2.tar.gz 20286 BLAKE2B 56ebf807a40d2d77469c454db0011a4c70000bc90cb3cbd41839719e376a56b9d07733a583f551fc74eff6de42b25d6c84027e678f7d5f34bdee9fa576b0ac33 SHA512 e4a73dadba4fafc8e60c1730404f9390a191bec58823202c3193f7f0571e914151c74b6d18e7d48551ae2f493b9ef11a84ddb27976a5f766e1ba512f1a0e141b
 DIST kodi-audioencoder-lame-2.0.4.tar.gz 20819 BLAKE2B 38340fb3069cbb8539ead53e91dbcabd21e169fc5ab76d3b7142b126f192bf8a295e9d7ead2c4e68d822dc1596f0b7e83a962ef8709783979279e4a9aebb562c SHA512 8b57d20c2d02ec7148a83ab7af78eaf92b600a40faa666c4f26b5acb59838ade54f026dc3869b23fc79511fc5901acca5322d2f04336fc8d4f545f5d7c04cb2c
 DIST kodi-audioencoder-lame-2.1.1.tar.gz 26524 BLAKE2B 68f1d0f6a999b0fa8de42c1d9d3ee436eaebff9279f60c5677832f2eb5569e862cb2e11710bb04019483543939536a86e1a93fa156536806395195878393fb74 SHA512 ad8cdedc7973eeda3246428579aa27969528dee8cb4eb1c778a90bb6a537f6d448c9d8ef12af940faca5154c066107f4831bbabe7304a07cb236653e8a98be05
+DIST kodi-audioencoder-lame-3.0.0.tar.gz 28725 BLAKE2B 3dab3eef8da3979d5cf13a3542d55d0c9be6d43b5bf7a87a133c35449a8848c557792dc80e52337bf525e3f8fbb8f18dee6204b1ffba9ee2ad1d73b72724761f SHA512 98901f26d46318d35a41b6656cbe0e7b7e4f14db40af9341bc950ee33a2ffd73ad60edb77badd7d3cdabc01fb87eb573764b7736bea8a55ad0ffdd0ac0abd3d0
+DIST kodi-audioencoder-lame-3.0.1.tar.gz 28721 BLAKE2B fc5d2184ccfe29fa7c5eb148a026f3bfba40812b79a3efd45ef17e0899691a290b91e7364d5307d8aa522452590305cda2661e051ca74d9141a2b138776e5589 SHA512 4e8a3d2ea9ecbf3460e6e94cce0b1c3f425f825621e426801aff5602dbcd9cea6a079c67b9629fb95e26899b90b803e297b301a8d11506ba1d8012c5b9a231ae
 EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
 EBUILD kodi-audioencoder-lame-2.0.2.ebuild 768 BLAKE2B ef79fa480179a1a7fb588c4cc93eab55dc2c6f345b36b6d61dc072bfb2e0624d61612fa4889ba0aa64c4fc4a4801845a8ef74440e03dd18af5a08b65c5155d58 SHA512 24d2cb05f0e98803a58af2df6c92a83eb932163f56439b4a038c35ebf8b97e2d1eb9da26aa5cdeffa1229d90187f19eb5be572ae45adc03e305d96b5a2e7ac6b
 EBUILD kodi-audioencoder-lame-2.0.4.ebuild 809 BLAKE2B f5bae0aa6f2e5c298cc3bc9930e19725d7cfdc2bbf04dcb7af944ca483ea5624724a21adac553c78db31f725f34c6aa98d7b28952a364bfe234de534d823819f SHA512 c4c0ac32f2db201976da9dee39607b0ab231c66ed9d5cf83bc7b282b775dea37a321b53e88be355236ef5ec13eb2649c2b11ac393ac900e18469479f23524032
 EBUILD kodi-audioencoder-lame-2.1.1.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
+EBUILD kodi-audioencoder-lame-3.0.0.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
+EBUILD kodi-audioencoder-lame-3.0.1.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
 EBUILD kodi-audioencoder-lame-9999.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild
new file mode 100644
index 000000000000..4d887654f37c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild
new file mode 100644
index 000000000000..4d887654f37c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index 6901cea178f3..a67410e9a99c 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audioencoder-vorbis-2.0.4.tar.gz 16343 BLAKE2B 788d1a64dff47594841e129e734b8bb1f2589b18557ea78477607a265efcc34c723f8e632698bd78b46cc392489a9ef278c21da805f0545b3ebc37811cbb691e SHA512 df618e078d1b0aa3f9b6cbca87288908058f4de13e52056d66239e9606c67a31a84734d8d650520920b8a9e0dfbd1c031aa81e2d1ece1316c11fbd59a6a8d8a2
 DIST kodi-audioencoder-vorbis-2.1.1.tar.gz 21818 BLAKE2B 72f61ab6ac4a9482b8c1dc73207740f9eaa801c90cded5f690b9fcf7873fc59639f34f2aaf51c879071a4c989567fb734cf1fef485d80aa74002018693e0b739 SHA512 74b8528ee142c0e35c1c1254e40ed9d40f0021b615a96e65628e957c4d56093e889c61bf04639f0aedbb74b109eded756d428253ddda7bf094007d842967956e
+DIST kodi-audioencoder-vorbis-3.0.1.tar.gz 23518 BLAKE2B b995969f3d23ba0af692f571a7a92855b73d99f7360b169b7e69bb6e8cb6761de430a80041eef101025c9d83b05479780f3c67785161516d81934fbf07fb78e3 SHA512 f0e9e152574881943f4c8bad6e8249e502590503104e5c456858e25634004c223e9be91b274b2870dd07327254664f7ffa5549cf573241192088a3287d2511ad
 EBUILD kodi-audioencoder-vorbis-2.0.4.ebuild 846 BLAKE2B f69a215caa7973dbf3da36e7e6e97ac82105c454dae29b5e78080fb5a54a4f1cfb160ed4aae51b9829e3d593a36f09eda0b095a88b9668c95bd1be1d8accd325 SHA512 8fbee8fd1b494e8223ed8cfc2af20ca4f416f5de0e9cc02a5e04d0540ca7a7d96a67704bb0e6d3623abf69ea023dc1f397be4f5484e192c14d8cc6bfe76ae2a9
 EBUILD kodi-audioencoder-vorbis-2.1.1.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
+EBUILD kodi-audioencoder-vorbis-3.0.1.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
 EBUILD kodi-audioencoder-vorbis-9999.ebuild 848 BLAKE2B 698ad3ef068771e23e33627f6bc8c9cc9ba7f960a4204fe5c4bba07087a2f41a1e91127ff05a6372e84b4675e15e5a2cd63da1d767dba372020abe205e58331c SHA512 4f0cbb2f72456a357639f908658b1aae54a273e29a5f91c9c4f63989029675f79b96d8f000761000542346633a5574a699adf857b382fdff620267b111a6bca8
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
new file mode 100644
index 000000000000..78220ef2dae9
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	DEPEND="~media-tv/kodi-9999"
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	DEPEND="=media-tv/kodi-19*"
+	;;
+esac
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+DEPEND+="
+	>=media-libs/libogg-1.3.4
+	>=media-libs/libvorbis-1.3.6
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index a7b86d1b3ff1..6daf99f1ea90 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -2,9 +2,11 @@ DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6
 DIST kodi-audioencoder-wav-2.0.2.tar.gz 9856 BLAKE2B 105e475e996e74a70712bdcef27cbc261beeb695fe3b0dddcc0d24d7e58a1fb0543cd7e954522e27e91a8bdd2c532190865847aab917d2775742f35c5c1527e4 SHA512 8e4de58bf6b7cc79c4bb24ed9f0906632f34a20c0a17010b4a5e32934d03414840b6a9d0db5b88975b5da2dd675cd743acb64288e2a3e338090f52df9fb228c9
 DIST kodi-audioencoder-wav-2.0.3.tar.gz 10447 BLAKE2B 8ddb4ce4777f35d75e428a4565dba5a949f85a262dec300a23f7b1425eeea416d7cd601fb5b3910df263edc420ea50111393d8d00d3d5834190040f9d5f4edd3 SHA512 f6b444483808b9e75426cd8b3252c4b3ed57811d9f1433d851d3cd6b3168f376bdfa2311aa3797642450b955ff8d231e40c7c49ad03a5f2b1b3e0679ec3a8617
 DIST kodi-audioencoder-wav-2.1.1.tar.gz 16194 BLAKE2B c08d249b264e198b8e8b87fa4ac94a20090cbef458af7609d156b42dc06e49661647dec762b9647181458a6d6110b24d9170fc1c2a63a527b7d42b0d82ccc93a SHA512 8d40387b792b55fd7348c34cb9d13d34fde30698269fd4871a793143ab1f877e3aac7ab1680581227ec48f80a9c04ca94d846b86013638d5939a6103dd0b138d
+DIST kodi-audioencoder-wav-3.0.0.tar.gz 17665 BLAKE2B 048915e147bd40f03db6b1cdb02183e1c68c298fe2251cc86a86fbfe2259f70fe17ede46898d1dc5b7d0261454fe0a65d74b8ac3cb19f465ef3eb8b6c1f5be33 SHA512 68673e432d377b895172e398628c5dfd506bdb46c83c38933d0d674abaf1715d44e488d4c158d27c0480b92a947f21534502aa8ed473e9225c37f62e28b05512
 EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
 EBUILD kodi-audioencoder-wav-2.0.2.ebuild 653 BLAKE2B d9f74a7e7a7238ba8f99fc114c0594afbb81bd6b27570c5d81b6c657a7973b69425f4c82611be8212934b522e19f7b4040d2e148be1a6d6a3b08d2c94d67ed18 SHA512 03a1c495f46df359a2fb25e0ac33d6327fd5032e892de143f201a998c493ef3d89403d4177c6d66b0da8a9a4ff997961ebc7b7423d3615e00fc25fbdc3c267aa
 EBUILD kodi-audioencoder-wav-2.0.3.ebuild 653 BLAKE2B d9f74a7e7a7238ba8f99fc114c0594afbb81bd6b27570c5d81b6c657a7973b69425f4c82611be8212934b522e19f7b4040d2e148be1a6d6a3b08d2c94d67ed18 SHA512 03a1c495f46df359a2fb25e0ac33d6327fd5032e892de143f201a998c493ef3d89403d4177c6d66b0da8a9a4ff997961ebc7b7423d3615e00fc25fbdc3c267aa
 EBUILD kodi-audioencoder-wav-2.1.1.ebuild 655 BLAKE2B d999a837ab23fcd34cc52f2bba451db7617156813c206c2ce8cbf4584d4584db2d22c014bbb3ad79ccf7574dd739ba40d12d897cbc1c78cd9af8b3eb742dbf9d SHA512 b5be906101342ea837a218e71679067fe778690363f63deb805bf9b3ef83227d67a7e89c5057aabf326b2d3239625823d7e18c373161a42c65221f4311e469e7
+EBUILD kodi-audioencoder-wav-3.0.0.ebuild 655 BLAKE2B d999a837ab23fcd34cc52f2bba451db7617156813c206c2ce8cbf4584d4584db2d22c014bbb3ad79ccf7574dd739ba40d12d897cbc1c78cd9af8b3eb742dbf9d SHA512 b5be906101342ea837a218e71679067fe778690363f63deb805bf9b3ef83227d67a7e89c5057aabf326b2d3239625823d7e18c373161a42c65221f4311e469e7
 EBUILD kodi-audioencoder-wav-9999.ebuild 656 BLAKE2B 29ade224eaa01c5904207874caca846523522d8632f411900dcaed926db7e1ebe0fe295bed9e79e654179fa4bb232a48083a4932b942d35c7886ca8e52ccde15 SHA512 677d1ee2a8e56bc6b235c857f9028a4798805b4cd86ac7cf854ba6284ba1c9b58138590fcfe8afc6be6c189638832dbd4ba50bb6aaef60d5dab22f627d19df96
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
new file mode 100644
index 000000000000..7387ed345a1c
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index 0c9f3cd64213..516281216624 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-imagedecoder-heif-1.1.0.tar.gz 26928 BLAKE2B aadd843020ebc29608c53c3c3bf34d1280cdde6c8636649067a169decb2d141c6898b083d1ad7ecdaabb8c06aa1f510f87d38156c9e1a77f9844fe2a227767cd SHA512 7c3ba8851fbffab24db0951a5aaca51ec4391e1350c2d9f9317bb1d305f16c210b404299f8c20c6208f5b8dbe1f53598d2d3fbc9b2e62ccadfbb84e3936ec04b
 DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
-EBUILD kodi-imagedecoder-heif-1.1.0.ebuild 877 BLAKE2B 87bbdeae5b8b6a49313217de26a80547ee780bc48c76134ddb715e716837f39af387fd456763043dc81527573e577f44a8c8b876a46375df93630cef6ce45c91 SHA512 f189dce6ba1094d82c8369e2a5b35b04071690b892fd21594fec5dd4bb95cca2cc0f0fb843c3bb17b2c154350c9a915597e4d40f4219bdfe3007e4b583291480
+EBUILD kodi-imagedecoder-heif-1.1.0.ebuild 882 BLAKE2B 1ab3ba3e6def65fc22499c19002f8f55abca158d5d730e824fc096197f9d5320c484b6df86531c8b1103e93523af91b00601db5d871be53f13c255ef5c6213b7 SHA512 6aab4c94712ff5b548d8bc38b6eb22acd8e919236d44f9c64a9b67d9a5e5ef9b800d312ac496cbd38b0d69a48f878ac81d6b979cc9d3c6c706326965b39cc739
 EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
 EBUILD kodi-imagedecoder-heif-9999.ebuild 872 BLAKE2B 6be25f0b8c58570e85ad19127d4105f358e4dc8f4b531c8e5a94c2fb23fbaceea45bcac9f19dcbab1181c96c44dae54aa15fc2c55182d614717f17464a8805cf SHA512 f54a57869c93cdcbd2f23845c5bd1388e87cba5a204455945d5c30ee22b81da2b25707876a73f0daadd7bcc255aed6c59e0cc79e305c463ea86393bf215b48b4
 MISC metadata.xml 495 BLAKE2B 50fee8ac28478455e2f841b59e31f3dcaf5bc6a7e224ce9674f42f79b821d6c9b460705b952f42c492ec5a2ff91a8dc8cb075e1b1a3782d422bc2cc97d40ef23 SHA512 bb68b1780e35d7a9a1b194402912f60906fd6b599bfa790056af14cbd51b7196c6756fa6dccde1bf1526d910e0eae44e88a4267aaebbf91903df9bbcc48ce05d
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
index cf567b30089b..d9d8059b0b48 100644
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
+++ b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
@@ -18,7 +18,7 @@ case ${PV} in
 
 	;;
 *)
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	CODENAME="Leia"
 	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 552323a5542d..f3d7f510d6a4 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -3,6 +3,6 @@ DIST kodi-pvr-argustv-3.5.6.tar.gz 150434 BLAKE2B 9cd59c57816ae30912d6410c3a1373
 DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a4ff998747729d6ea9c8433c9c85872b51c702b0dcdaa92f487ee562fe8d167e54dcbdacb55d8df6ebda5ab6ec6c3b35b10 SHA512 103f17c503c0ef9c0e40c9ad2602bff314bce0b7f7e4dbc1f7eb66082ef5dbf0f55878be012ce4728644ba30a473d6f292c7bdeb3bf72b41928a4c7e528f83e5
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
 EBUILD kodi-pvr-argustv-3.5.6.ebuild 703 BLAKE2B 5c02b33738a4a47af00343f3379c89b816f7b033653b554971e7287a0fc4264ba17e4678ed57de5d33bd6f226fcb6450fbcd7278986d67be6fa8618ddfa4ef29 SHA512 2dfb679668f2cb382cee0754b1118290a4e49b03df71c4b5a736d4e65b8727665602b767805362eb4ee8ad7cc1b31a0b07bc461582d1a190fe69224f357a1c21
-EBUILD kodi-pvr-argustv-6.0.1.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
-EBUILD kodi-pvr-argustv-9999.ebuild 669 BLAKE2B 802dd70801dad6deae7a7e0c840b7fa047195f4c32d28ee21c26d213e01002387deb860d3704af690110f93ef204970af2db8a271d7005d43c194846b58eb9e4 SHA512 ce01f62b84b15a9ca39260ec23a25a18b0cb3a8ae165dfa1845e2e24baf1f14df10d98cbd88ed29f31090afb4bddeda27f48374abc1d77851695a4b76afe1534
+EBUILD kodi-pvr-argustv-6.0.1.ebuild 694 BLAKE2B 1fd8029faa8e1cddf6bdeabb6e9226c43ca3861fd9cfc5ea4909053698b281991ca6fa097a9d5834c0fb5b23755a027984f42f5920a630b1d52d8ebcd644293a SHA512 86ba51038e6265b422ac94fe135da3d7ad95744114210f7afb429866f27cac56efed011d17b1e4c57eda467a86123849887bbbc53a8797996bf59fe2041707e0
+EBUILD kodi-pvr-argustv-9999.ebuild 695 BLAKE2B 0c1a0530be5dbea1e1812e12e3d3a9003e15b5f1fd5da081cad63b34137ce66e720fe425e520b2cba1a38f6029a9c28a08168e8e4dfe2cc7c715ef3e3c4c8aee SHA512 3e96caf0fdebd538b7de4dc8ec766d22a34250a7266c22c60406b02c3b6e328288741f59d6e17b46253e9d06c5048073a1be23d98240515e31d39e7d782f0bc3
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
index 7661c01e1ba4..d89cc6b5da9a 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
index 9a4817d669c5..3cd2a5114177 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index 72af40676f2b..02f19867e980 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -3,6 +3,6 @@ DIST kodi-pvr-dvblink-4.7.2.tar.gz 180347 BLAKE2B 83ca3cf04de7cfda420da8f0680220
 DIST kodi-pvr-dvblink-7.0.0.tar.gz 189965 BLAKE2B 7e20cb8e0faed944b5aa617c13ff5b0e55ed58947e5dab9a49e724417074a686ae2faf59ba2e034bc2e641c3d9a467e1431fd120ffb42812bb747cb8dd6ce7f1 SHA512 d6e7690c50c8e1d9788bfe2ea067ea88f4f656897013222e3a3b9c97837bd2b00b694be97dd11290312ebd418e523bcb5080d2eba275dc91e609ad3707a88380
 EBUILD kodi-pvr-dvblink-4.7.1.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
 EBUILD kodi-pvr-dvblink-4.7.2.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
-EBUILD kodi-pvr-dvblink-7.0.0.ebuild 668 BLAKE2B 6a1d7d319e7cd8e5fab9a59d0ca2cb739d5206b2fc80bd3024507810a00beea13b6df018b52dd0963b902d68bb92d5020c6bd4f9208dd933f9607bc48274facc SHA512 f06ebe631d86d9f6d45227f3edc39cf979ad8af6ca3380ec0b73ce40118334f569cd3e151ee81a1852612d047e8b32beef8a0da62e3bc0d74e8fe89a281201dd
-EBUILD kodi-pvr-dvblink-9999.ebuild 669 BLAKE2B 72fc7719a7e1b4b5cb89c2fb95ac4c4c05aa70b8c4d3728911487b828034a48c3c570d385cf0e4515b6b13d57e6e5b8a8351a5296030a6824afdded1441ab0ea SHA512 808aedb3b858c2b302d1b9a3c9ed11379f8e9c8911d808ebdebd305e9a9ed1103d00e47f2e9da41480da672989e20aeea10956079395333cad94161c5272dbbd
+EBUILD kodi-pvr-dvblink-7.0.0.ebuild 694 BLAKE2B f9a53b83120983fbe17cd3a63413fdc56e8e24a10575ad56aa1a80c26128582164ae38e9938aa1e52cb9e9d924cf9007b9a75a50d385f873df86ef932f9628d9 SHA512 011b26e23ce9afde90f8e176efcb4cb6a724e5808d47e37561025684f6d0c1535653468aaef2f66b96d8d79ea30f9da3d5f83ec51539bd1f8ab79567dc12b5f6
+EBUILD kodi-pvr-dvblink-9999.ebuild 695 BLAKE2B 2a7374d8b7c16c84a43d84076ae7ac53e602ce4407ec8de2befd20d3dd7322fb257f8a5a6c0c5f2212ebf1bb650948dae6f79c49c4bcf838c03e93a1ff598b25 SHA512 44f1db2fec5b3a56e664abaf4fa0d0ff3c0520ac71e9cc597c9bc3c2c109b6097594d1f30bd5eb8954912ca1a80322037acd28ad0f311d11c461d4ff49d63240
 MISC metadata.xml 430 BLAKE2B 3e8e91274af301f44e000e54762c98b68a732dcb24bab5f8114df0bfa2b82485cace8c2dec1258efc202b227f946820aa0833dfd7c4647968756b84feea3311f SHA512 f5087df98e004c6319dbb7bf9b4428e5e52636e129cd34f3450d23b7b21b6dc36e7d935c3921e08796831082d4bd101d4c4b185a70236eb1a4b8c6b8522691b7
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
index 17d8ff47c378..b4558dcb6657 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
index aa3e5a28ce70..5b90cab21cf0 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml2
 	"
 
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 8e93c7e1f70d..89af2bfad430 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -5,6 +5,6 @@ DIST kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz 137151 BLAKE2B 51eb189d9a2f7a5f36f7e
 EBUILD kodi-pvr-dvbviewer-3.7.11.ebuild 724 BLAKE2B a47e2cefca993930953e681d990454e3ed7523033a12eafa3d7b1666ccaa02ce4ec463a855ab6efcaf3a0b8aa11e21fceebd0e5479e2533a2e9779221746ea57 SHA512 cd00eb63545a5786958b0c88e0f7cc95d59b1356b1a9de780a81402aa69ac9f4b4a5691d3844c7b27fc832b54d68ba0d1e7a4b13f997a12aea53770d654e8cd1
 EBUILD kodi-pvr-dvbviewer-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
 EBUILD kodi-pvr-dvbviewer-3.7.8.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
-EBUILD kodi-pvr-dvbviewer-6.0.6.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
-EBUILD kodi-pvr-dvbviewer-9999.ebuild 690 BLAKE2B 7b2c27e9088e2e5bb13ba17ce11cdafbd0ee43258b5edbd1f0fea33ec60d162ee40d4cf1cbc8b064ee989455cae2c7da2dd42749e6cdcf2bfb23c045bf14e066 SHA512 66b42c5dbc7fa9f1b94eb4a8d57af8b86c3e77f1339384e2e02ef2d83507b9b521c6c226a33ca3b11e0306ef073f226098442abb57e7ce701fd320ce2d76d85a
+EBUILD kodi-pvr-dvbviewer-6.0.6.ebuild 715 BLAKE2B a62dc022e091e40897750608e163cde3d1a008d1f546305d4b9390083fefe6bc069b7e1b1a6f3ce0a3324b9a0713c717e9db04c750177c4ffc9166e3b908de4e SHA512 7bc858a9057e624a5023b5d08b2a08e5c05f970003574f0d4c9acbb66fff3033e98bf69e25ca8b1acb199bcd664ec6bd2a94b7c96617024b95edbc1370e162c8
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 716 BLAKE2B 6d98df2f1aad511a0d54cb457289d562f07bb9f9a75af806e5c48af93a84173a2016fcc8f7129c3b8e90c7cf8ef8f662d0da0e38bdc8310f71bf93aafac884b3 SHA512 99a48f399240b0a18bea8697dce95f65311d66f725b28643db08bed908933bcd1217e799a1499defa3be233f7ecf30a4d49c00360086ea91b6097c58888ca01c
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
index 6c015a0ae550..54f5e15ff029 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
index 111083176860..0c558b474324 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 81fc9e289201..1cb4412d40a9 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-pvr-iptvsimple-3.8.8.tar.gz 125231 BLAKE2B 9e887261295f75c96095c9566e5c1a555bb62a2ad97d7527efa9d294c4e392058f99f5205b32a7b4eda949ed0f9f49a288df656777dfba87c243528e74ac5277 SHA512 32c95c2e314eba3c4871c50fdc024be276874b790339c5b558425bb960080784533dcbadbab64c7b76b598c08bfca384fb3b1fa618447eaf30870e296d4c5e46
 DIST kodi-pvr-iptvsimple-6.2.4.tar.gz 178392 BLAKE2B 5cb96bc2c13c429486c596aa5eeffa445fe1b68fbed8265626d855fdb7ab4dcac5071d8033a60621a235dcea37b206a56b9a73e0a9de1fecdfecaa7c3de0b893 SHA512 66bab95ace5d4b25fe5e24c5515674a4daf8d4a4e766f9eed67d6b98c1c0c6d64fb6a2d82b19f239a522d73e55707db4097c3cc12a1936f6f6c6bd57bfd451b7
 EBUILD kodi-pvr-iptvsimple-3.8.8.ebuild 832 BLAKE2B ac2e8e2ca456a4246a6d35f6a91c4ebddcc0d02699e3e24e75a04891ff9f828f9f5429a22ec1798e6a749b2a13680ae14156788db0927a5734b733e64c124650 SHA512 28af2a01df4189ccb4ca5f35be6a5b7e00c93cf9b0dbb457154ec7ee260ca2eb5d0689a3da4e51f33264a34c58923393fac10e1d4598327a9bebebc1d0884439
-EBUILD kodi-pvr-iptvsimple-6.2.4.ebuild 803 BLAKE2B b09a3e437f1f8cf69b00aa0a71658da6e96b390eebc591f4550c183add592d6f0ff1721aa6d66f0a8e4f901c3c78d4242aefb06bfaee46791fe3b625463e8bd4 SHA512 5b718cba06e828e6cda520486662ac3ba6383eb8464ec2ac47979382eb0e25c90f15201ca871dcc359644ca9ec75ed13e10251bcf948714a86fdc8c93409f366
-EBUILD kodi-pvr-iptvsimple-9999.ebuild 804 BLAKE2B 6936efae29f92345c0b6f586f0a887c2e8f9ae8968f434655e353188398504bfecac2e4db61e60d73fdcef1415f1035545929b3fb06147be64f404216d379949 SHA512 0c8f2373916de16ce729e065a604ab02e08213a5735abd7f23bb42fb5167b41b0e7c65b8d7758fd6524391febb676cacbd2f167ab52f1d96afbe3905b853755a
+EBUILD kodi-pvr-iptvsimple-6.2.4.ebuild 802 BLAKE2B c592515b2b56a24ea223a837e21c96b171bffe323703a8011c04741432ea0e474204701aa3ade26d0fc088dfcf6661cf775fc111d9c548200b47f9a17634b8bb SHA512 b348a54ff3daa6cc31d278a6d7cc9a44bfb8943f6d0507e5429ff9302b6864b3573457ad52ffcd41cd8015cb679dd888af520213b54c8bb7e23283dcf3bc8bc6
+EBUILD kodi-pvr-iptvsimple-9999.ebuild 803 BLAKE2B 9cd17e335f3a0bd80ba95e91f184d0126593711b14b8d7194a5ce21dcd38f6791d2df67e1c9e5dc2ddb8e37939dce2e036c460cf18e810c578667c3672d2e39e SHA512 3e67596d473a49682723e0c60ff4252ea437fa9de8e8ba40c18581dfb03030f106deaef1bd0a04da43492d19830a90a690dcfacfd46a07f1f8c7c7643adc60ef
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
index c635e082bab3..ca427448e66e 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
@@ -29,9 +29,9 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
+	dev-libs/pugixml
 	=media-tv/kodi-19*
 	sys-libs/zlib
-	dev-libs/rapidxml
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
index cbdc86557484..5770de5567db 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
@@ -29,9 +29,9 @@ IUSE=""
 
 DEPEND="
 	=dev-libs/libplatform-2*
+	dev-libs/pugixml
 	~media-tv/kodi-9999
 	sys-libs/zlib
-	dev-libs/rapidxml
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index d8b446682a4c..f7c30d171c81 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -3,6 +3,6 @@ DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77
 DIST kodi-pvr-mediaportal-tvserver-6.0.0.tar.gz 402033 BLAKE2B 7ad12b7a18e759167fe06d983ad20c0dd00f10f6a23a5f87f526835b893451110152c036bdbae565d623fd8034e6bd1780446a688a6837f30027d7412f214706 SHA512 ac1b14bb1e75e4b802c1d6eb9f94b8c437d808ff31592b3e9ed0b9c19151acde3927c1bbabd4f890cf3aff6c71b68a859abf8b2d8942e4c9df8953c934a123aa
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.16.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
 EBUILD kodi-pvr-mediaportal-tvserver-3.5.17.ebuild 767 BLAKE2B f8939465576f2c6c1fe7e4af9ddfba7a7c3f44740067fd9553ac716b2594a3d2898397efef7bfcccc815eed426a337ff74e627a9d76f0b0ef31f8f5e70515192 SHA512 7dc343fd3968611ee08aaab6dd5ce70cec1bd5f0b36bbd5be354323fcf287a3e7004119ae7a3be48953505d7c2b8ad6bf196e360275e39b0c258eaa86696b23b
-EBUILD kodi-pvr-mediaportal-tvserver-6.0.0.ebuild 732 BLAKE2B b418b324e3d00314ebc726cc5a042d14075ba071b57e0db54fab74cf43b759df075d892146c672d718fcb7681d681dbb5417b4f891488e907867881af7119ef0 SHA512 ffc5c15e74f58987a44cf7763562eca9fe2f9113e6aaab6de3f713b89aa3189dd341341831b91c98e2fa941a3571b1a11f67c24461e53d0ca33360ebe3b4e0a1
-EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 733 BLAKE2B 67a369ec52dc86587961f2513ea7a0fc543e6cf2c46c636897679673d8e338bf2569a1381e6136528020edfb4d3f14b968f271bfe2d014b0732d2d9f77304446 SHA512 8e57deabc18dc0277160de12d69ad4b9778b18e68d9f0afad6e9c65ee481ebf486d1caf885e79371b35a73a14541fad39e21e5fbb44814c5fffed627158146ff
+EBUILD kodi-pvr-mediaportal-tvserver-6.0.0.ebuild 758 BLAKE2B 4ae36c09ab363a5093e7b23cd4c087065a3795fc291b11e3c0d479420a91b880adb1c2b74cc14e28d32d28cc91ba6c3ec312deaa6243d1d99c6835354f1930a3 SHA512 9119d78331d2fa7581356080f86f5f2878b95c6de12f4e042e8a4b65c3ca223db05bf11f8d9d84df9a59b25f9c15b67f0ed154c82e9369cb3814996a7eb7ae8c
+EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 759 BLAKE2B d4bf2e93def50393fa5f7809e7a764aacb722829191ee57025872ca8c62faebd785011a2e35252c49374f268e7cab4482c587d5de908b03f4d986a7ade0e9193 SHA512 5eefdd2195f56d7e067229219c1095d20f225173ab038a1e4f9abe28e8cee3542277aa96d32f7d133c4887dacee6b0b828e0e538ba238f9c397ae6df17f42d54
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
index 5b58b26a672a..26852ce2d13a 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
index f2027dfed7f0..660cf92598a2 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index 664acb877124..fd98096eb504 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -9,6 +9,6 @@ EBUILD kodi-pvr-nextpvr-3.3.18.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4d
 EBUILD kodi-pvr-nextpvr-3.3.19.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.20.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
 EBUILD kodi-pvr-nextpvr-3.3.21.ebuild 702 BLAKE2B 0d5e16d25d33552da861e3b139fb4dedc19bcc17eab75a580b958987f4e4be2c504e9747be31190203d5be82dc83f40799490f8296106fc8e5c9cf61c6da9020 SHA512 4794cfaf2c21a3edf9c2ac78fea61d9b80994bbfbb06cbb79abd3844caac7067ad1e305d87a596ab09cfca128f98d1efd68dd527786e7126fd7cadac8b75dc8a
-EBUILD kodi-pvr-nextpvr-6.0.5.ebuild 667 BLAKE2B 3c11e48aa0b913ce03bdb7c7a60decdcd6288014e255ac8d02ca3824fa2e274e235c67cc00f00109cd043c41ec4cfe4821ddbc76bbdb09a9380e3a7cdf2cdd12 SHA512 1720135c3bbe030be5b9bd7f7508d99d583197ddab8ccebe69cd406c9bf93476800e319621dc957d35d185165681de81fc05919b0e17b3267dde1abfbc91bf70
-EBUILD kodi-pvr-nextpvr-9999.ebuild 668 BLAKE2B 9d741c30d158eec2dc76bab707ebd94daeb40783afb1e908febb4e7b542f64605b2e8f0c9977e3ff8f1ca084a84f6d88e3bde4960cc7ad81fe70dd8ed06d20e0 SHA512 af96cc358af6f414c82e85b63ecf3fbff2150158640d91426016b05f1434c93e26f40751cb204ebe749f9c6c9f6ce0d22fbd35e48f83bb4bc28c1b2b28c2c235
+EBUILD kodi-pvr-nextpvr-6.0.5.ebuild 693 BLAKE2B d10af8247c688c34f8c388f597ca8942b42fa3672bc513d959ecff05fea5ea7e745ee9de316fef3466fa688a62336dd5fb5675f795d9960224aaa1d592440e14 SHA512 5822566bc638a1ba6d906052a97b7cb83c751f3bb5b003cb25662aebb55ae18442c664c330f2f46920fd84c187939f5108a42aed11186fb36048223037e4ce98
+EBUILD kodi-pvr-nextpvr-9999.ebuild 694 BLAKE2B e6ae5463d4c9fd77fdc3407b37fa5e58208f95f8a78afe8955764c4d2ca66816dc22526ee03e8767a08b3825ce33aa8530115e841cc6a395043af7b572ee7494 SHA512 aa100751a31d80ad4246544f20e267a71cd66e6f2a319dc85a5d22a6db663355e154053792617282c705c494ef8477485e0e7e39d3c9ad045249dfb5b676c0ac
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
index 30b3b7482290..141349d2e0d9 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
index ac2a25021f8d..e1a24be35f99 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -29,6 +29,7 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index b6fe1b20fe32..f8a04e56fdb7 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -5,6 +5,6 @@ DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa81870
 EBUILD kodi-pvr-stalker-3.4.10.ebuild 793 BLAKE2B f707e953708706a90f0e3fac40e06960be4ef6940787b674b2fba939851023bdb5e104259f62b5ffe341a6944ff99f178c497f421b013bb16bcdf0f95d292d5a SHA512 5b18fd82f1267c93c4e05dabb628ecabc6582b46b7ce3be7c50e89c7ccde70cc715d729cf155a18adac88a76af18f99b77d247a500cd30e09ddc02e8ea1558ca
 EBUILD kodi-pvr-stalker-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
 EBUILD kodi-pvr-stalker-3.4.9.ebuild 720 BLAKE2B 43b023fbde024a5d62b884936eaff910983d90a3d391226b71a4f7f24903fb554fb7cea228ada1137292779c49a8a55699d96d956ab8c1bac05e9de10778d05d SHA512 327f30ae993028aa4c18c14525999ec9bb8da0bafe8567a6ad1a88b821989d84e8dffe59e8c43c239ab0e67167e3d4b0122e5cc5e033be4e4dfb1c8acca5ccbe
-EBUILD kodi-pvr-stalker-6.0.0.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
-EBUILD kodi-pvr-stalker-9999.ebuild 765 BLAKE2B 318d9c6605fbed8919332cab9fd6d12e3dc0af107c89666818d26e1325f46e0c4f86d5ba8275daccdf83df6958983fb22abac7f26d4a87e0059694ed15e29a15 SHA512 053da8b2b6eb218e1f33e1fcccb6c12ef7662530acb4cf19b20fef47005db281064167a1d68c6d2d9848f3ffbca13c63a82e4259c31ce732c91737be12acdfa8
+EBUILD kodi-pvr-stalker-6.0.0.ebuild 790 BLAKE2B a4496feeb3d9c7b45a68ad3446da701dc1a9e89994a6fce095ad350d9ebca8950f8491a52d7260f3a1a1f241462b6afab2e1c3e334e7a34f6da5ce0a7b5bb3dc SHA512 52f717dd999f9ceea6e725b091f0bec8848185af2e217cff13c5f313ff823c932411391d104d399fa6b49f4d74bb2ae484a57d3e3932cd6b038db86f2fdb96d4
+EBUILD kodi-pvr-stalker-9999.ebuild 791 BLAKE2B 5135447a4bc6ecd6805ad16bb48f3b052132547771f76f3d204546b46a3dda2c6e602d782214e681ff05a896ae2a9eb937843d18b9469440d693cc6e9a420b16 SHA512 99dc471ac1a0699096cd45204e5d89d9e102a7e9beb95d0351a85adb321ae8483a0678800beb576ad211929c9eb99296380804273dadbbe3dc5e66fb4b29e5de
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
index 72e70d8feae4..fd220bfdc74f 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	=media-tv/kodi-19*
 	dev-libs/jsoncpp
 	dev-libs/tinyxml
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
index fc4ddf88443e..134a230b5aca 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	~media-tv/kodi-9999
 	dev-libs/jsoncpp
 	dev-libs/tinyxml
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 9af6b868d910..74db6e4e2d87 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -11,6 +11,6 @@ EBUILD kodi-pvr-vbox-4.4.8.ebuild 708 BLAKE2B 82da36b12438ffe48516af25339aaca3ec
 EBUILD kodi-pvr-vbox-4.5.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
 EBUILD kodi-pvr-vbox-4.6.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
 EBUILD kodi-pvr-vbox-4.7.0.ebuild 702 BLAKE2B 50693d53e28e88c2713b96531ba2f3487359263fd007f318dfb037b2d8272740635a0b67e4d7b93754979021ec5a896ca70bc6529236df4c2331c4ec8a25f8dc SHA512 275e316e0e93901696fbad09fabff8c742bf915217a029a49124c3d908d94a3b3b2a86e11ebf3e9debf51289acf3ef5a623fe752ee1829b2edbd7a73d59c3c66
-EBUILD kodi-pvr-vbox-7.0.0.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
-EBUILD kodi-pvr-vbox-9999.ebuild 674 BLAKE2B b592bbd6fe222c5d78f91cffef013fda2b46bcb9f973f0d28271d176551c00aa4aa17f93af173109243fd0848301fb013adb2243b622a55a58c5fe3c86ac16f3 SHA512 07a6264c0db07e3f8d6bf45c206de39f737ff185548c669d6c84e2b2c1193169027145a2cafdfb37ff72ffeb33ea5f714a8d45f86869bbe9cda53f95aaf4666d
+EBUILD kodi-pvr-vbox-7.0.0.ebuild 699 BLAKE2B 3ca6d54444eeb7e3107e725698ca26ccbc881b4f836ef001099aa38858bfb18d6b9efb2696f76eed9ac4c2068a3c04d361306a65ac4db2f1666494a3b32ec2ac SHA512 d977479ac9890ac3a1fd2206aa27bb27b2fd3a109a3ab9c57c8910d738e517168553891e9e80563493ce855ffab589316cbad3acb9d43abc10173c9fdde719cc
+EBUILD kodi-pvr-vbox-9999.ebuild 700 BLAKE2B 2fed6293948107ccc6e1dfb479ab84efae836e976de3520456c0c7cdd6f890d70710553b6777f480b7294726a4b337d0a596e57e4d95bc059953bfd563d60da4 SHA512 71c8171a88aa0f3d2c5e1d395030d54ace79c17f53e0999f4df0a6970c0875c141be538638743e8cf32e552493f747c58f884168636ad5c41bdb3f1a658d75ac
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
index 9ffd4c8c835d..482dc7190457 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
@@ -30,6 +30,7 @@ IUSE=""
 DEPEND="
 	=media-tv/kodi-19*
 	dev-libs/tinyxml2
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
index 2ae1037ab173..0a2ee36fd45e 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -30,6 +30,7 @@ IUSE=""
 DEPEND="
 	~media-tv/kodi-9999
 	dev-libs/tinyxml2
+	=dev-libs/libplatform-2*
 	"
 
 RDEPEND="
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 4f5d4abce978..6db520821c7d 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,6 +1,6 @@
 DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69 SHA512 61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
 DIST kodi-screensaver-asteroids-2.4.2.tar.gz 120463 BLAKE2B 3ec2c8142f8d763e85095f6c89c59583fb0ca309c18a57407fe456113dd8964f6bd896c23fc6d86b9a4d1aacb25e097202e52844faf9272e08d507e50f523ca5 SHA512 795c7ef2eaab9e1801d48430b9544a7f721d45ad5aed79ca2e361b16186043dd2ac9dc2b47ddf459744717f4704c9212d23c18df9da6c1bd158e6e6e9ef76fc5
 EBUILD kodi-screensaver-asteroids-2.1.0.ebuild 659 BLAKE2B b7b187fc3f12ebcafa40a29f58707a472761e8e3a0bd36fa4c38b2d700493696816c928a5e7e79dbf080e9a7de57c721ed31c937885aa3b88526b2aaa1196cb6 SHA512 3511ec63d44bb7f1123c4a564fee3e21ce121b6f01d167b9a552de6c0d2a7522305c314f5a0bd2cd1b11460b339839ef62661eac701487d13265d8492e4c7eeb
-EBUILD kodi-screensaver-asteroids-2.4.2.ebuild 655 BLAKE2B ee9ba2553fe36a406f23e95c8e8289bfd2dfddedeffed9517156210cb8c619a6d4fb3a66d849249794d420a240306945259c0f78c9829530511c21b8121d5586 SHA512 9517ce2e374602e29b556b10f0d04c38eb1db4230aa85d2b636eeab1bfc2d263a9fadbe500fe51da6a8614573e35a0029f25e34f25d6ae58889f696f4e3e811e
-EBUILD kodi-screensaver-asteroids-9999.ebuild 656 BLAKE2B 0f7e0f0bebb67edb6f753f857d98349f2b2e90d774c32c34b884c76553fc33c92943e0fa5d15a54811ceb4c7955fccc1d086c0fefe47b0809d2e85aea4f506e5 SHA512 59d3c34148aa44b1abeccb81a09c666071ed68135df0ae9b54a93370bbe2259fa028e3db9909716e76098779690715e57118fee220e2f1c749a29e18c0f7d778
+EBUILD kodi-screensaver-asteroids-2.4.2.ebuild 685 BLAKE2B cf03c9569fa82bd0734ae2d5a05c57cb9441fa57cc1c56a7e525b6e3eb74360e7bec4a70f4cba9032d10d03e234d840a85896539f5d28120d553040fe2e78b9a SHA512 758b4ab1ec79139fff43fd71146a37cecc9b33a7090368ff2606483cf313cfff40db7625c3ec73146146e28f8afe29d93c812a6904a83b563eb9325b4e7c43c9
+EBUILD kodi-screensaver-asteroids-9999.ebuild 686 BLAKE2B ec713b1ac3e9a949ce19d9c8cefe01829ddda373ff561e81c1ecd0f354a363ba6251643574bf6fc2d5f808bed2e58f15fcececa27e44616f719daffc0874242f SHA512 1ea74781f3190f77d7f1e35e94e824967a0afd0231a489dbeeaaa7d5c96ba2b2ce42ec91c784ed5d1d041c0969af93f480abbc690c93f5515756a2ef7ee430f6
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
index e007b1fe609f..dc97eaddcea5 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
@@ -29,4 +29,5 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
-	"
+	media-libs/glm
+	virtual/opengl"
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
index 3465b7a302d8..4094eae1fd58 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -29,4 +29,5 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	"
+	media-libs/glm
+	virtual/opengl"
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index e77372bff1d6..5c9cd6e525f9 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -3,6 +3,6 @@ DIST kodi-screensaver-greynetic-2.0.0.tar.gz 6608 BLAKE2B bb48adc922d3949670d368
 DIST kodi-screensaver-greynetic-2.3.1.tar.gz 336191 BLAKE2B 54cc3f93bb18c315e75faca68dd7683e7afb50ebadcad01c33e60457958702205d51321b665ac72c95f4d758ddf896b9bb120e4a9a9315be33d24f9c1707989b SHA512 e4e6e513c4b2c7476ee0f29a436abf102a196e5c307c17e9b197572cc7eb7a12890033250a8115ea4bc43baec0f5cb87f1103413a7d6b852235f0710b4086279
 EBUILD kodi-screensaver-greynetic-1.1.0.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
 EBUILD kodi-screensaver-greynetic-2.0.0.ebuild 659 BLAKE2B 8175e6f35ff1710cca777c1f3450404f1e91c722239090bae403964432c9c15abbcb7085dcc4283c4e3f6c9186d184e2d4b591dc102afb939dde526a56751a05 SHA512 3cd27f42ffda2a43db0362e01ce7ecab2c092702412cc3995f17baedb91a51b6eaa13c4a5da3363eaa8f24da4be735e083d8fe28b042a63b60c8e42b2bc85570
-EBUILD kodi-screensaver-greynetic-2.3.1.ebuild 655 BLAKE2B e6ce3a3c3329a74b4ab87da8fb9dc9c3c5d7499bb244e55ad662e7ebc71f1bf1bf6c8209f245ebce19d36019aa35fd98067e1fdf21e2eb2ca37174a8028113c9 SHA512 f904b5571d565604552dec15ccc84206b6f7933d51bf83dda0a4fd9c2799a66c8dbca321366dac1f8d32fc290e829e437fbf062880ca5a888dea3b945639cdc3
-EBUILD kodi-screensaver-greynetic-9999.ebuild 656 BLAKE2B 897a8ce1bd71b40b1657c56007ee3521c495812e7a365edfc1e70c4336126af8dbb5880486b87331f51a191aad01813f4ac102c02fb8e44d271db929c4b3949f SHA512 02815811cba42edd5765ced7da061f11b2b7315cfc940abc569bfa57f80bfa0222946ef44e742e6d19796f6f35838e02f1a9e7d03192de042320f19207527e85
+EBUILD kodi-screensaver-greynetic-2.3.1.ebuild 687 BLAKE2B c428c4ace17487b33cb8edc93cd29046457be7622df63f0c44f37720c921e580d5510bf8cee5023f5a4b3a867f124d724a8af1a5aac2790a8183fbd9d09cd523 SHA512 66de2a94fec145501332316a1249e5b674d41d1fb5a7969b631c97f2bd718eb242cd5b96e8ef823835ddfafde8b6d70f80fbfbd3d67e8d6941a5a27d71e0e0e6
+EBUILD kodi-screensaver-greynetic-9999.ebuild 688 BLAKE2B e04d05c8d5bbb52005fef87ed06f3ed60945ef4e86d42c98f51be4ea5f8fb003b6d816be807123a78a69c9f6ad6c4e004e298fcf72376e9d5c114c90b686bb25 SHA512 e27a09a434cb7baa633728b1570d6292404427c41bcea2d49c08fbb602e3e9a81fc1b7af5265bb0ef44b722ce0291fb9f4e208dd50e17367a5317aab7a237608
 MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
index 82a460bf6239..dd0202a1506c 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
@@ -28,5 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	media-libs/glm
 	=media-tv/kodi-19*
+	virtual/opengl
 	"
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
index fb705bb8ee8f..14ed23a2e0ef 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -28,5 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	media-libs/glm
 	~media-tv/kodi-9999
+	virtual/opengl
 	"
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index cf25f2939a63..535791d97a73 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -3,6 +3,6 @@ DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec7
 DIST kodi-screensaver-pingpong-2.2.2.tar.gz 25546 BLAKE2B b396f1e7e167c46b1acc49587b25bbb95b7310b5f10ec4a35daeaa752cd65fc3919811453c5be0b93ac807b6775db27f4f4be9be1183766eabe287e4b1b16a16 SHA512 bf7df6298a182479c676434ec23a20c120e2483a921ed7bc059f0712d7b0e1a8e97e2c140205a243321eef755cfb6e346aba9122924b59dea29ff386a94173ee
 EBUILD kodi-screensaver-pingpong-1.1.0.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
 EBUILD kodi-screensaver-pingpong-2.0.0.ebuild 655 BLAKE2B 609c646adb52ee425e66f4dcef2a3e1512e0631e2833c6331351b9db4e43fe1c51160a994287d5047e591919de71f552b1ac8cfd63792b5944a1ef227ec7c009 SHA512 c76cb1d6db4bb84d464735d6bbce7cac16e70329479a0a47d966d1ac78dad8850a28d6c7b45b553bfe7dfd0e999042837dd33c00b7a39715ea48d96be29baee8
-EBUILD kodi-screensaver-pingpong-2.2.2.ebuild 651 BLAKE2B 614b90dd660ea86f6b341738fe516e444c31e9b3f554454921104276adf90863b38df0fdf763a7f196522137236ad1b11ce66de8b5ba5ff6c467b285cf18055e SHA512 5e4958b4742687ea8706e98a6ba576635f363134d37ea3d0066a325de1eab16cb80190570f1c49945d29f9ea616121ed14e26091db2527d3eaf3ce06b887eca0
-EBUILD kodi-screensaver-pingpong-9999.ebuild 652 BLAKE2B 81284350f9eeaa4e1ad4c680721b99913c670bb09824034a1a08436bd3877d8fbf635c8ccfd4bbc9e8ef6e584040b76852ff7f9c9d7e726621caf65f7722b452 SHA512 6f91d4515f32dd0263f0b809fa605cf3e0cea49f4a68f7760bcbef81ab52c6d463dd4dfebd81bf5b3f2a986b8c39ab61a96e7a1cace7019f93106a1e48053eed
+EBUILD kodi-screensaver-pingpong-2.2.2.ebuild 683 BLAKE2B dc0de79e3eb2f70bac87eb49b63a3ec92c35030d24c6767cd4795300d4ace9b0a4fa6a8bb88979540cfaec2b747f289ff13fbd431280b4661103f36effde7a21 SHA512 19a5715ab99cfe56c774c3d65b3f81f5641e80a73e11f5824ee931a5a82d96f9dddfd2a5cca5c49e0a74175e84a1af2e29650d80d9e68961fba1236656be8292
+EBUILD kodi-screensaver-pingpong-9999.ebuild 684 BLAKE2B 66efc703eb176d3d6886c87e2dce2428a327a07257ae34f21c14e2c8d23cb4c0df42f5f4766df0fc41948a02c2852c277259837d6bae574aea97726d8797c46a SHA512 ec6d1a08fe91f33aad7a5db4c896706f4d91ed553cdc4f792b457642ea7c06781ab19befbc77aec5451c2f07410ab39987a812b934a18045381b30730f0e22c3
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
index 72ce188c5b7c..bec402307a6d 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
@@ -29,4 +29,6 @@ IUSE=""
 
 DEPEND="
 	=media-tv/kodi-19*
+	media-libs/glm
+	virtual/opengl
 	"
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
index 1b7ff548edcf..cd8a1082b48f 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -29,4 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
+	media-libs/glm
+	virtual/opengl
 	"
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index a8c7bccb17e0..3c5612a5120e 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -1,5 +1,7 @@
+AUX libvisual-plugins-0.4.0-fno-common.patch 627 BLAKE2B 507b9da964a1f636adedfcb5df07466ebd3d360ed91507239c8fb8f8197b0d1afc58c35ee8113deb9c507b9f3f329e3f9671e4e9f8b23e7842dfcede1f1fc801 SHA512 820682ec181739a060adbe9be2dbc704259a99cf2e30840008fd39afd0344bdc33b6486ecdec7478d56c81f08172172ca2fcade4b1384954b2334e5f978fd73f
 DIST libvisual-plugins-0.4.0-m4-1.tar.bz2 1872 BLAKE2B 438fa805e4dccde1f446d3e78e6d3578bbf8ada8ab664bc6e408be1a32edacdf4cb587c213300022cece442c63e88258f2d189d0b35dec9ac1a9b8de826a84db SHA512 6522491f0797d0d442e1839fcfad985fcdba4a6d43ec94eb6edf13cea09a0b187b1e7c09b0c3b2f7b8f22d9b41f9cfb1f5b3559fed00b9dc3935fdf37bf7c08a
 DIST libvisual-plugins-0.4.0-patches-4.tar.bz2 10814 BLAKE2B 75e1df7ebbd7455475a9035fe5fd1249117728c74e27ff17407ae9b941bc2e4bfe3cf890ed72bb389a8be27906b7b2ec2dce61403fde8831c127198d663b3666 SHA512 e6c20ebad338c300e1c049d33241daab3d6cd25a73be3402aedb13bb3cf6a84112e074fc2d57f9a7a158d12addd0d320a94d1690ed789f3a90e9cb14cfb966d2
 DIST libvisual-plugins-0.4.0.tar.gz 828631 BLAKE2B a3afdb65b5da4cd19d9793fe8da3b14e99df77e21fb888b9f26b9c60af6b71e331b7250029144cb56281e77d2b579ce45d2be1445cab96bc8dc99dbd40794275 SHA512 f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901
-EBUILD libvisual-plugins-0.4.0-r3.ebuild 1930 BLAKE2B 2d872c1048c37789e9665cad56bf6f123bfcb75334474e4e9f132cfab1a4e46f2b60ed424a0eb14410e0ddc0c3a22c128b6bb41f60dabae9bc7ca89f5b6c7bd1 SHA512 23dd9a279c1a9c4b3043cb568b80e9127f5295a233e333c9a8ca1bb9f7e8c8ada6290b3046ebdb99396e261109f06fe6cef4c4a4aba4ed69db036668532b158a
+EBUILD libvisual-plugins-0.4.0-r3.ebuild 1962 BLAKE2B 068bd77ccdcd44315420489e973481e7c4308aacb84995b8da8500818c74f90687b6e0ab3d37b41458d23bb76e71239cc4468b861a7018723abcf19b954211ad SHA512 2160bf96d38216ca0260981b3f649f5c12fdd6d48f9eaafa2b3fd4595791631fbd59c0b1c8078b05403f644e34bbcff6afa7454a7e8c9e46cf422dbc9664c08e
+EBUILD libvisual-plugins-0.4.0-r4.ebuild 2615 BLAKE2B 4f7829dc79230b7001dedee33c6783576b2d1be9a0f64e9a2278d00d263b426626c1adbdf1b3996990274797f3aa7f847eb9cac2b84ac3a80771fe694539a6a7 SHA512 b1c8bc3d143744b6a79c159bf9051f6232a9a4ee0f4949324a17f3593506d3b7bf563c634fa9575a8a72bf03e6d1962ef186b5189489b91690af8a1f4ad31527
 MISC metadata.xml 332 BLAKE2B c29c386b29c500e0f8a7827985e0c26ee50f9f0465b92c42feed113b3b1fdceae581a6b8d7089ba2d304428f604b531d8e8833da12f2d44e8a1643d952b11445 SHA512 62db2eb31068dc2c0adf100ff0a9782bf9f92118fb2c2322fbde5fff6a22dfe16ff826b22218b44a86b7350ffbbc3e9fc6f0135f0a43feff8f83e3e6365b7288
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
new file mode 100644
index 000000000000..5544d1895e02
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.4.0-fno-common.patch
@@ -0,0 +1,17 @@
+--- a/plugins/actor/oinksie/table.h
++++ b/plugins/actor/oinksie/table.h
+@@ -27,10 +27,10 @@
+ #define OINK_TABLE_NORMAL_SIZE	1200
+ #define OINK_TABLE_LARGE_SIZE	12000
+ 
+-float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
+-float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
+-float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_sin[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_cos[OINK_TABLE_NORMAL_SIZE];
++extern float _oink_table_sinlarge[OINK_TABLE_LARGE_SIZE];
++extern float _oink_table_coslarge[OINK_TABLE_LARGE_SIZE];
+ 
+ void _oink_table_init ();
+ 
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
index 2ebdcaae9d40..b15a83b81fde 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils ltprune multilib-minimal
 PATCHLEVEL=4
 
 DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
-HOMEPAGE="http://libvisual.sourceforge.net/"
+HOMEPAGE="http://libvisual.org/"
 SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
 	mirror://gentoo/${P}-m4-1.tar.bz2"
@@ -37,6 +37,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_prepare() {
 	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patches
+	epatch "${FILESDIR}/${P}-fno-common.patch"
 	AT_M4DIR=${WORKDIR}/m4 eautoreconf
 
 	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..8c664230ca52
--- /dev/null
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils multilib-minimal
+
+PATCHLEVEL=4
+
+DESCRIPTION="collection of visualization plugins for use with the libvisual framework"
+HOMEPAGE="http://libvisual.org/"
+SRC_URI="mirror://sourceforge/libvisual/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
+	mirror://gentoo/${P}-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug gtk jack mplayer opengl"
+
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	~media-libs/libvisual-${PV}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1"
+
+DEPEND="${RDEPEND}
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fno-common.patch"
+)
+
+src_prepare() {
+	# Can't use eapply on ${WORKDIR}/patches since the patches use different
+	# values for -p. epatch handled that automatically, eapply doesn't
+	eapply -p1 "${WORKDIR}"/patches/005_all_cxxflags.patch
+	eapply -p1 "${WORKDIR}"/patches/010_all_LIBADD.patch
+	eapply -p1 "${WORKDIR}"/patches/020_all_64bit.patch
+	eapply -p1 "${WORKDIR}"/patches/030_all_analyser.patch
+	eapply -p1 "${WORKDIR}"/patches/040_all_gforce.patch
+	eapply -p0 "${WORKDIR}"/patches/050_all_automagic.patch
+	eapply -p0 "${WORKDIR}"/patches/060_all_gstreamer.patch
+	eapply -p1 "${WORKDIR}"/patches/070_all_gforce-fbsd.patch
+	eapply -p1 "${WORKDIR}"/patches/080_all_qa.patch
+	eapply -p1 "${WORKDIR}"/patches/090_all_nastyfft.patch
+	default
+
+	AT_M4DIR=${WORKDIR}/m4 eautoreconf
+
+	sed -i -e "s:@MKINSTALLDIRS@:${S}/mkinstalldirs:" po/Makefile.* || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-esd \
+		$(use_enable jack) \
+		$(use_enable gtk gdkpixbuf-plugin) \
+		--disable-gstreamer-plugin \
+		$(use_enable alsa) \
+		$(use_enable mplayer) \
+		$(use_enable debug inputdebug) \
+		$(use_enable opengl gltest) \
+		$(use_enable opengl nastyfft) \
+		$(use_enable opengl madspin) \
+		$(use_enable opengl flower) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index daeb7f65608f..01e373db4a6b 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 9ed0e456eee4..8ad6ca12b642 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -5,13 +5,16 @@ AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fc
 AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
 AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2
 AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700
-DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83ec310d7609b6989749f42b3b6304feb9d62c02436b0c4d62116b145d44d1a0ddeaf38c86794ef449393c998f5b5a062e408ed3f SHA512 d19082009dc915b28f02e3451f06e5041b68159af138ecad10641f3c59526b4ab2873e6e676b87dff0e54320b48a6254a0da434566855605ca81b747a732e952
+AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200
+AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
+DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
+DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b
-EBUILD audacity-2.3.2.ebuild 3254 BLAKE2B 7ee66453862ceb01265f240daad2eb197f0cc9ec1d6f138e79ab377c318c958c67eb9cb5c2cc46d0d92797d833f13c9b15e53599018d0171021288bab5976e0f SHA512 856e6846a7339ac05e9437953456702bc4505aa6826be9a231e4b3ad9ab045ce5a3ef5c16473195d02988dd20fd3d348a9be3c9f643fc41dc3f20a1c923e1bd6
 EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b
-MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
+EBUILD audacity-2.4.2.ebuild 3596 BLAKE2B 4402ee893c154baf6acef6ac4f9773dd7a9f397208cc0e0c83245d8e192faf720b5b2705a3cef94a4dd2c4906dbb2cb38071afc957ccd4593795946d77882ed6 SHA512 bc89f6b4d33ff8cc0a2acb3a893c12c3cc56b28c058fdc0888f3867f2a540f59d0a38a4b112d10c307964f08a31917c0cb1fec3ff4c0d21e5bfaa4d68cb9022a
+MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
deleted file mode 100644
index a3ac1df60e7e..000000000000
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
-# wget doesn't seem to work on FossHub links, so we mirror
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/portaudio-19.06.00-r2[alsa?]
-	<media-libs/portaudio-20
-	media-libs/soxr
-	x11-libs/wxGTK:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? (
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/suil
-	)
-	mad? ( >=media-libs/libmad-0.14.2b )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
-	"${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
-)
-
-src_prepare() {
-	default
-
-	use midi || sed -i \
-		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
-		src/Experimental.h || die
-}
-
-src_configure() {
-	local WX_GTK_VER="3.0"
-	setup-wxwidgets
-	append-cxxflags -std=gnu++14
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist=local
-		--enable-unicode
-		--with-expat
-		--with-lib-preference=system
-		--with-libsndfile
-		--with-libsoxr
-		--with-mod-script-pipe
-		--with-mod-nyq-bench
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi portmidi local)
-		$(use_with midi "" local)
-		$(use_with portmixer)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	# Install our docs
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/audacity/audacity-2.4.2.ebuild b/media-sound/audacity/audacity-2.4.2.ebuild
new file mode 100644
index 000000000000..833ff268bdcd
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/"
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+	doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+	+lv2 mad midi nls ogg oss portmidi +portmixer portsmf sbsms +soundtouch twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/portaudio[alsa?]
+	media-libs/soxr
+	media-sound/lame
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( >=media-libs/libmad-0.15.1b )
+	ogg? ( media-libs/libogg )
+	portmidi? ( media-libs/portmidi )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+	"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
+	"${FILESDIR}/${P}-fix-gettimeofday.patch"
+	"${FILESDIR}/${P}-fix-metainfo.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	setup-wxwidgets
+	append-cxxflags -std=gnu++14
+
+	# * always use system libraries if possible
+	# * options listed in the order that cmake-gui lists them
+	local mycmakeargs=(
+#		--disable-dynamic-loading
+		-Daudacity_lib_preference=system
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_flac=$(usex flac system off)
+		-Daudacity_use_id3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_mad=$(usex mad system off)
+		-Daudacity_use_midi=$(usex portmidi system off)
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_ogg=$(usex ogg system off)
+		-Daudacity_use_pa_alsa=$(usex alsa)
+		-Daudacity_use_pa_jack=$(usex jack linked off)
+		-Daudacity_use_pa_oss=$(usex oss)
+		-Daudacity_use_pch=ON
+		-Daudacity_use_portaudio=local # only 'local' option is present
+		-Daudacity_use_portmixer=$(usex portmixer local off)
+		-Daudacity_use_portsmf=$(usex portsmf local off)
+		-Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
+		-Daudacity_use_sndfile=system
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_vorbis=$(usex vorbis system off)
+		-Daudacity_use_vst=$(usex vst)
+		-Daudacity_use_wxwidgets=system
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+	fi
+}
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
new file mode 100644
index 000000000000..0e6e3e5d8cb1
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
@@ -0,0 +1,12 @@
+diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
+index 0187e39..28a5348 100644
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -427,6 +427,7 @@ time warp info and AudioIOListener and whether the playback is looped.
+ #include <math.h>
+ #include <stdlib.h>
+ #include <algorithm>
++#include <sys/time.h>
+ 
+ #ifdef __WXMSW__
+ #include <malloc.h>
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
new file mode 100644
index 000000000000..09b9fd0e868b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
@@ -0,0 +1,12 @@
+diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
+index 43a7714..0e8a3d8 100755
+--- a/help/CMakeLists.txt
++++ b/help/CMakeLists.txt
+@@ -40,6 +40,6 @@ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
+    install( FILES "${_SRCDIR}/audacity.1"
+             DESTINATION "${_MANDIR}/man1" )
+    install( FILES "${_SRCDIR}/audacity.appdata.xml"
+-            DESTINATION "${_DATADIR}/appdata" )
++            DESTINATION "${_DATADIR}/metainfo" )
+ endif()
+ 
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
new file mode 100644
index 000000000000..71160b4365eb
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
@@ -0,0 +1,14 @@
+--- a/src/menus/ViewMenus.cpp	2020-05-27 17:49:20.645538517 +0500
++++ b/src/menus/ViewMenus.cpp	2020-05-27 17:49:26.844538493 +0500
+@@ -4,10 +4,10 @@
+ #include "../CommonCommandFlags.h"
+ #include "../Menus.h"
+ #include "../Prefs.h"
++#include "../ProjectWindow.h"
+ #include "../Project.h"
+ #include "../ProjectHistory.h"
+ #include "../ProjectSettings.h"
+-#include "../ProjectWindow.h"
+ #include "../Track.h"
+ #include "../TrackInfo.h"
+ #include "../TrackPanel.h"
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index b7c2db3a2bd7..7f3a6ec835ae 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,7 +14,9 @@
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="lv2">Add support for Ladspa V2</flag>
     <flag name="midi">Enables MIDI support</flag>
+    <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</flag>
     <flag name="portmixer">Enable the internal portmixer feature</flag>
+    <flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
     <flag name="sbsms">Enables sbsms library support for slower, more accurate
       pitch and tempo changing</flag>
     <flag name="soundtouch">Enables soundtouch library support for pitch and
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index fd5867cded77..b75e818e91ff 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,7 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 929 BLAKE2B 1bb70bc169faf5138b3e0d4b60c60366bc6e60a366f2eee3d18c3093b5f2d99e821e0fc948b6a79205500884b8babd12a6676d31c65435f37bf73dedbf5aec74 SHA512 4ceda974263f3a043f187f7d95aae7a16fc65936c7a687f6fa0003a51493caa6eebc8e932075a274373fd319a1c0fb329e1764fc756c4b1691c1dfd8443be836
 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1
+DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
 EBUILD chuck-1.4.0.0.ebuild 1865 BLAKE2B 4a083c5e4faf4b8130d33207188984123a72308367c55a08ff8dd3d922d3936b4357bb0198c58fe38189b54d5ecc0d8efc4c396c30f508b97cb82c7760001d95 SHA512 f7b47dad21f650d22db788e9016207ce77623b1a3a6dd1a11be8acf7b35d65fd54122bea2a08b8f6052a8d3fe1cc2160a9b2b96a7010f5687c5309ad72fcdb6b
+EBUILD chuck-1.4.0.1.ebuild 1865 BLAKE2B 3f23893fdd7b75ce1ec7b0fa564e8458ebce4d0b57611e00b9cfd9a37f812687397f8a7eacc1fba74379bfb0e5a2d17d273d2cffc94a02000e5ef24a23c3f92e SHA512 540b2e1faa688eb089666eb2cf79a9bd762b4c165526da7388a5fcc25f1e56ea178044e3831d2d21a5fd3136c53d5a5c146978aec78b72a24b2f2ba5035c6f80
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.0.1.ebuild b/media-sound/chuck/chuck-1.4.0.1.ebuild
new file mode 100644
index 000000000000..81fd7cd02477
--- /dev/null
+++ b/media-sound/chuck/chuck-1.4.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	if use examples; then
+		docinto /usr/share/doc/${PF}/
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 8d5101665fda..bb9f4bd65c0a 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -2,5 +2,5 @@ AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc1
 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
-EBUILD darkice-1.3.ebuild 1258 BLAKE2B f45e5570b5b9fc147617602ff2fbccb43a672b813e48c7ca0a5d79e29d8ff4282e3ae8ac7dbe1da76719044ec2e9e474d0d955e50e9c36d05100cdc7a2c0872c SHA512 9af70f5938cda673d468edc24c5968b047e6b8d30134bb5a60c7ed32e080ce0553c5594d61b06a435b0838691afd8c26f8a7f04d000ab50eb411fcda551b36f8
+EBUILD darkice-1.3.ebuild 1257 BLAKE2B 027117e47505abf7c0433953abe71c25f1d2abe658501ee972f414bc9d80348e6b6e7c96e7d2a7f3d7149671db440db9146c320491ec25c7fc04393849b79e93 SHA512 0ea41c7ccb8ad071207fd1fc064abdb09f0ca4f2050e6807ee749fca0dae9ed302d0e7583776131fc2aa62003094877ad3868d024882ccf938f45c9dc2c2e883
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index aba277257e7b..7965e18aaba3 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.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=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc sparc ~x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 960f2f04272a..87208b154b40 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -2,4 +2,4 @@ DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
 EBUILD dir2ogg-0.12-r1.ebuild 1203 BLAKE2B c9bb4c7f19debf5df3596a25a2e1ddee88953e4da4922602479974bc8cb9b9dd98b08316d6977c0109353f3cd095cdb05b6135700cd6557079a33e97930975b1 SHA512 d74ec08611f7f191bc23d1ecb7888cba382452f021a8cd82e09ce9e851faecbec4b74e708700f917efe6c13f743726fcd15e353dfddcc101014cfe4cb4febc31
 EBUILD dir2ogg-0.13-r1.ebuild 1212 BLAKE2B cdde97feefa67efc9b7eaee724d3671cb378c24db63fa5b68180042d8f873127ad9182921f8d6b50a7a7e7d659fb65d0653541e282f1f444c1cfa7d3e7a9ebb6 SHA512 adfb89aeee4d5e14ed92b30f70077ff12a78aa09a2cd2b69727473ca0248a85503ac9408b918115ef80fda98e013ea5e13e8c6a6cbec058579e415cb877bbaa8
-MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
+MISC metadata.xml 445 BLAKE2B 4c9df40d55c76b73a306d4545da2f0f9a96eec30eb595f7c3646473ea19d487d3e493f9993a201a49710e6b636a58a7689d32a0bf8d0c9b3e305b3084fbc3438 SHA512 4f334533b08adb0b5e100b7facd73dc45e358f4d22739b26e897ff8fd899f07dba1f1d2b27acf3443b72c0306b644334ea392edc5fb2139252cccf253aa28f9c
diff --git a/media-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml
index 46aecfa8ee87..c64e4b75686a 100644
--- a/media-sound/dir2ogg/metadata.xml
+++ b/media-sound/dir2ogg/metadata.xml
@@ -5,6 +5,7 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="mac">Add support for decoding Monkey's Audio files</flag>
     <flag name="wma">Add support for wma files through mplayer</flag>
diff --git a/media-sound/guimup/Manifest b/media-sound/guimup/Manifest
deleted file mode 100644
index 8b25699429bb..000000000000
--- a/media-sound/guimup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST guimup_0.3.2_src.tar.gz 587543 BLAKE2B 8b8cfc3c6a42360320b44b42710b29ef0038de535d9f1004d19cbfb7d326a8e0f6e87ff1274791dac9960e4ca306299008f3324075c1f2374ce1a46749c757b0 SHA512 64f56b189e17c60432199d72e658ac2091d051d9cde7e53da7f89b96aadb006121a123bdde7ec80634c0b263e3d68ca1517592dda5a55cddf747c8ce85a535e2
-EBUILD guimup-0.3.2.ebuild 660 BLAKE2B bdb8c2e1c1aafecc84f3530377eed9ad1548e8b2913d0b3c958520f662a864d33d2b6da42278cc81fad26e1e4119c2b52cf864a4dc495d7f5b7dd0c3a63250a7 SHA512 c893349ceaf1e6c08a03b6f350f3742d20538462337fbeca29773744070b5dd94e21a55ff717d8bd600098212459b8223c8939597f6076aa61ee73ffde447e3c
-MISC metadata.xml 242 BLAKE2B 46ccd4c22db60541120e422bf9e5f14889e9f15b0c49657d126b6b33d54429f7088a08d6bfa38ff17024e783ac34e85bf5921eedd4cacc71c8094061b2f49965 SHA512 6247324f1ca339f695c8043cfbe7b785db9d44146bdce490738a4ff1a093f3f2db4591e1b42fc12b5865379caeb871be5f549bbb5b1cfa758bb99abb1f114af8
diff --git a/media-sound/guimup/guimup-0.3.2.ebuild b/media-sound/guimup/guimup-0.3.2.ebuild
deleted file mode 100644
index fc0433c7c556..000000000000
--- a/media-sound/guimup/guimup-0.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-MY_P=${P/-/_}
-
-DESCRIPTION="A client for MPD with a clean, GTK interface"
-HOMEPAGE="http://coonsden.com"
-SRC_URI="mirror://sourceforge/musicpd/${MY_P}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-cpp/gtkmm-3.2.0:3.0
-	dev-libs/libunique:3
-	>=media-libs/libmpdclient-2.3
-	>=net-libs/libsoup-2.36
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	append-cxxflags -std=c++11
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/doc/ || die
-	make_desktop_entry guimup Guimup
-}
diff --git a/media-sound/guimup/metadata.xml b/media-sound/guimup/metadata.xml
deleted file mode 100644
index b16fad84e68a..000000000000
--- a/media-sound/guimup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="sourceforge">musicpd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 47e51004f923..f318da29a3fa 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -4,6 +4,5 @@ AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcb
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
-EBUILD lame-3.100-r1.ebuild 2092 BLAKE2B dff3a596145c0ef57d5c323704717b11baca01d4da1864f8f7fb858e7c7700b6092fec3b76fd1e43b97a1872d88c1d64002de6a3d0c44ae30960dfd058f43450 SHA512 9ae764c45602865c1163250cbb3aea07c36d6cffbeaea25a73a9dea9411a5cc458b67a99c35b9a7a960d179d4ba6a6d5db5bc994837670aa9e9f84a383474bef
 EBUILD lame-3.100-r2.ebuild 2205 BLAKE2B f1741d6dedb2b174cef82d7f79709f5d80a958c0d4fdfd07e429a89082fc4f44af9cccd7095524059cd50d36d795c8bce145df410f01d64bff14622674f3edff SHA512 5155a795b437c9036b45d718ce26442641367d2cfb6e16a0c7805edc883d58a96b8dedf203f138ae031375239a489c4c74f88431b8c996a3755ba2f01074edb5
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r1.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
deleted file mode 100644
index ede672f73047..000000000000
--- a/media-sound/lame/lame-3.100-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
-
-# These deps are without MULTILIB_USEDEP and are correct since we only build
-# libmp3lame for multilib and these deps apply to the lame frontend executable.
-RDEPEND="
-	frontend? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		sndfile? ( >=media-libs/libsndfile-1.0.2 )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.96-ccc.patch
-	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
-	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
-	"${FILESDIR}"/${PN}-3.99.5-msse.patch
-)
-
-src_prepare() {
-	default
-
-	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
-
-	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
-
-	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
-
-	AT_M4DIR=. eautoreconf
-}
-
-multilib_src_configure() {
-	# Only build the frontend for the default ABI.
-	local myconf=(
-		--disable-mp3x
-		--enable-dynamic-frontends
-		$(multilib_native_use_enable frontend)
-		$(multilib_native_use_enable mp3rtp)
-		$(multilib_native_usex sndfile '--with-fileio=sndfile' '')
-		$(use_enable debug debug norm)
-		$(use_enable static-libs static)
-		$(usex cpu_flags_x86_mmx '--enable-nasm' '') #361879
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
-	docinto html
-	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
index 93426dbe3af3..d911bc8e6158 100644
--- a/media-sound/music-file-organizer/Manifest
+++ b/media-sound/music-file-organizer/Manifest
@@ -1,3 +1,3 @@
-DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0
-EBUILD music-file-organizer-1.0.2.ebuild 883 BLAKE2B 7875d0bdc46ed83f10c21b33ff846329db268dc7a01748e07e79c0f35df83555290b6cd3c04bfc9d63fa9b38ac4b3569cfcdb5a90862fb9a3d18ff64a4e440ae SHA512 0870d8fc9655ad3ffa9360b2376d897789dfec70bb37c73e0432608909b5aa4b5c4746d27faf937cff636f305055f6b890152cf679f8b2b4b38f96aa128af4f7
+DIST music-file-organizer-1.0.3.tar.xz 501856 BLAKE2B 17ceda10c7afa7902272d76b7fa547c13da6aa21d106d2de8c125a48746da310e40d315854874fa182b22318574905199d0b2143e7cd5e9bb9fa64aa4a5ac498 SHA512 9a219af094475c93b0a156c1ba01643c603a598283bf12d7d05c6ee2da96ee8055d0bd7d1ae047651a72e347a4e5580f324acc6466df13495e3c3ab2e6baceef
+EBUILD music-file-organizer-1.0.3.ebuild 845 BLAKE2B bc08f03607ee9294b57bb2a5388e6a603db33bf3253a23cc062b8c1f97f2caa91426bfcfe3988876d810c348fd80a4d9bbb84641533c5224ada6f0e992291446 SHA512 1ce321db4198abaa8d128e6e32278b0162ccd562d36e4b14ec56ecee94f229f497d01beb73dbf2e8f69606e367c34bffcb3832c9abaa90cabc9f876d8c4d63e5
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
similarity index 93%
rename from media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
rename to media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
index 3906dd2747e7..8dc5c9a5cd75 100644
--- a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-DESCRIPTION="Organizes audio files into directories based on metadata tags,
-along with other metadata utilities."
+DESCRIPTION="Organizes audio files into directories based on metadata tags"
 HOMEPAGE="https://git.zx2c4.com/music-file-organizer/about/"
 SRC_URI="https://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
 
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index eba4f29b87cc..5e0d5c795584 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
 DIST pavucontrol-qt-0.15.0.tar.xz 97480 BLAKE2B 183c3cbbe87b6867bb116041d41dd29f5ba72156e9078a4f09e5ffcbd3e123f6511cb06c99ce3cc8ce243a0551b132438bad7b14ae759cc775974c2ad3388bf3 SHA512 c77b0c7403c24df7839598aa46a6076e9ce84a102866a8917c6b8535f1a2b15baacd63e9ddf6bf0b7e914e7c681f0e10bbe378a641bc71144c1b22bc918e4600
 EBUILD pavucontrol-qt-0.14.1.ebuild 716 BLAKE2B d14a074430d0a4f7e16c100eefb33bfc8d2f1229b7703f9f97ea0c93329c383dd24faccbaf7f52096611f9f0b98b8d4f3c75cb10195121c77593adc7be19af7f SHA512 174a40dd903d9ee855c96d0330d142383707bcd0c5e3ebeed459540ccc3221f5d3813a935b6a499903040e5a53aa37571b435dc6cea3ac78ae38b51e512d9afd
-EBUILD pavucontrol-qt-0.15.0.ebuild 706 BLAKE2B 6d86b57145a2297d3fa0a1b45b57747afd46aa960466641feb1760d02739f0aa600f5d2c77a7822febce022a1b9c5f73b74ff9fcb828c4e644e1e5bf89784cbf SHA512 27be50a4834172e15041681b6b6987d30e393b74e1c63f2d31aff2ccf7b07e4b470d42b3ad4c82d11a7695e775fc7bcf9dfc17788551d35460f99fa10aa5d85c
+EBUILD pavucontrol-qt-0.15.0.ebuild 704 BLAKE2B b2a1d666b2849b8f11e52d605e29b002e96e52ddaeb91819ad95350df2b9fe87cad729adfcb600c4008b7b378cf433a5a4dbe042309c13dabdd906b7c5769928 SHA512 b0351da1c8083bcc130c4ff560185a4dae136eb5a45071de6bb8a07703fa1de9a390f7a28d1acc00ba235a800bd612bcc2a23fe7659adc3412c3c2c4eea058d3
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
index 21b7b2ce6716..70f14e9e590c 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index 736e76535b66..c9cf9a26404d 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -2,5 +2,5 @@ AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
 DIST twolame-0.4.0.tar.gz 890908 BLAKE2B f61a49aed06dcd2a60744dd758b480670f14f0eece0586b62a0b21fe2d9ff8280f8f7324b7daf88e85675c6200a1c68815ddd6bafa308b503a52df4552031bb1 SHA512 cc594bc8d2322922280f915a3c0aa52540cca0350d6498bc96f3f60fd6e53f951e775ea015a44bdb29ec883b46b31a0e5483f6a5c188b02e30008289273c7d03
 EBUILD twolame-0.3.13-r2.ebuild 1246 BLAKE2B 16e43d7796cb506a1173f6ea691474227745f4f89b07068b093df9816b88b4f39cf04ec4ab07148c7425acfe155a70285bc3af2f2836eb70450556e4bbfeab3d SHA512 9b91fb852268aa8cfeeba8a38530a3f1d9b057c269a5d687ece955fa445c5cd5cc5dcd0a850f2341872290939d78324d826ee01ba0fde032136d97ef528b049f
-EBUILD twolame-0.4.0.ebuild 1336 BLAKE2B f54e9a1ddcc10cb163a83c13da7a5a64f21aa15bd759f780039596b1ca831914cc76f7def9d8f8e53f25f2e4cf7e0e3de4eee6e25e813abb7cea302c77111c19 SHA512 a48e54f9f611f9465ac66a4599a4d8a69cfce64b884eff9f35ce50ebd43cb80ec84eea14d690658fa01c8acb2fedcf95d849ac6064fd2f45eee282b593e58a2f
+EBUILD twolame-0.4.0.ebuild 1331 BLAKE2B ea493d20af4f1eb50a92a50b3e8bd194bcd7a73b9de577334e6fe14d72918d239757f5c3b69f5e17327e8dcd1a8bcd464c40b822292de9fb94656f274fe4134a SHA512 fe96395ca2cd1159657d6d166f62fe7467054a6f7d3b78e6be4a46c8e042d0f024affb352751470f4d077f78556f890dcf849d81c704c57580587b240ff78975
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.4.0.ebuild b/media-sound/twolame/twolame-0.4.0.ebuild
index f00c324ce36a..cd1e1bf82266 100644
--- a/media-sound/twolame/twolame-0.4.0.ebuild
+++ b/media-sound/twolame/twolame-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+sndfile static-libs test"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
index 0b50ce149c80..724a5136f0a2 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1,3 +1,5 @@
 DIST vmpk-0.6.2a.tar.bz2 452963 BLAKE2B 490a8f39d2a9f9eeef51abe4d090942a26aa9b84514da8b8852b3abf23bec1c5b8d71c48e456be6a6ac17ae20609440e40dc7a9b62bb4e24e495fe952e608f87 SHA512 89ba161c3ca7ae260d02c175d1116bea7cdfdfddb0f303d8b9177eeb3d77ded8f6126bed43efa6c279daec0a987d0be30c280d59f42a7c145167fb54a7b8db16
+DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
 EBUILD vmpk-0.6.2a.ebuild 815 BLAKE2B d29a65c957c21bcd009b8ce5d38161fe47bfa33836f0f599ab006cc30c46bc102dbbf177ec12a6f1046562f32690e4152be12bae440c206b9a0371478e5f80de SHA512 c13c575df4d08c4bb139245c9c0874de9f517d7a5c3338cc645e2b723cb92afe0b0b9ae1a3c8e5e73eaf574aa4d7ea8f2914f949f39386398843a5e025ab80d2
+EBUILD vmpk-0.7.2.ebuild 848 BLAKE2B c3f0cb551fd71c6f14335189b9c2d7904b931abd63e2acaae9041548805e5d60c42357561a762b081bb43c40a4ce275bc89bb047a8c1b895284e589c5cc3104b SHA512 f74f22b0f41c3f75077e2dadfefb0cbd13b2e1cbf64a1dee59f7ec649a7907f56e48c4db944e59537df3c8ff8b82f9a23aa291ad31cf4be6db1d5ce51f9235e1
 MISC metadata.xml 856 BLAKE2B 53282a0d72578eb72aa6d3ae3704e915626f12b88315be54f0342cd9b97312fed2c3628871fe7c1215d29b6984c9b829b0718d124effa46eeaf52dd6509e35be SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0
diff --git a/media-sound/vmpk/vmpk-0.7.2.ebuild b/media-sound/vmpk/vmpk-0.7.2.ebuild
new file mode 100644
index 000000000000..12365dd4917c
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.7.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="http://vmpk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=media-sound/drumstick-1.0.0
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -rf "${D}/usr/share/doc/packages" || die
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 64d8645fff7a..01aca9dbbcc9 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 79fabc2cc4b3..9940816adb1b 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -18,5 +18,5 @@ DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 EBUILD mythtv-30.0_p20190808-r3.ebuild 12593 BLAKE2B 4b147dc08cb1b1113536e6c95d3e07f683f7d3e750b3e9871d60ff8b784306573d6c7e1e226ac52d0b0f984ad90e400e1051973f5b73f5ac66ebb8fa6c5f2e6a SHA512 11b498e4664204ccbd15210cdb7a5790930111bfee2ca54cd2457380b3a041c55706d9ee67fd6f8d8297e8a2fc729291e952326302e4e74d58451ed410e43557
 EBUILD mythtv-31.0-r1.ebuild 12345 BLAKE2B cb5a9fbf31781d2d024ff1ef83136da8105b5bb6216b4deab3271195ec9cbc909eb6d252042998164751523430d34ef3e8cdc79b3c90812117712d631abe1b3c SHA512 3dca774f047b5ac1b8f095316fa90429002fec668abe7f67d89cb7a92688efe60725c73e306b8ad257942fb775ceb34e44557e2c0093628f4767b2aae9712b79
-EBUILD mythtv-31.0.ebuild 12341 BLAKE2B 62be6f93ca622f9061abf11a43e8eb8f31ad37472a87c3b6671457033c743f14e4440c2ea3383afd7656a08a4e8f405ff987a8ef6bd9f311044e8fc544fc1b29 SHA512 1700da0bf4ca829c6f5828fde429aa217660e75b6f6d30e7ac6c0d573045e99b240e4d7d67da8e04c7b9d9b05be6ecd1e33dc1e722607015769026a68c660661
+EBUILD mythtv-31.0-r2.ebuild 12454 BLAKE2B e38590cc4034291d3852f8c66b7d568784aaddf409c0dfc3b563cd75560d4ab5fc5a7ed1518250db1d1db1558287e926c6ddcdf8f0118add15d3f998259d6e28 SHA512 754b6adf5d2f5e9671c9b738e6a379e41a0b389d471296f5e0ed7181201b16584fa6ac4ddcb6a2e3160d03da56cbb1dd9fbedf8d23091a74c4566de31604afb9
 MISC metadata.xml 2285 BLAKE2B cbc924af3ac54973580a7ab7f73669d24da3b1da9edfc8717fb1996ee59193337b1490a909ef0ab8ef400e323120dedab938d79564b306d196c167ca22a9476c SHA512 8bd3b71213ebf3bced2aa83cc85d3117e200138b64217eb40d8c73c84290c00c0fca7f6b18801fbc7a07f9d55234dfd01da33a47b2ea5b561329200260284983
diff --git a/media-tv/mythtv/mythtv-31.0.ebuild b/media-tv/mythtv/mythtv-31.0-r2.ebuild
similarity index 98%
rename from media-tv/mythtv/mythtv-31.0.ebuild
rename to media-tv/mythtv/mythtv-31.0-r2.ebuild
index 9d3ead365ea8..8c2640774db3 100644
--- a/media-tv/mythtv/mythtv-31.0.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r2.ebuild
@@ -137,6 +137,7 @@ DEPEND="
 			dev-python/future[${PYTHON_USEDEP}]
 			dev-python/lxml[${PYTHON_USEDEP}]
 			dev-python/mysqlclient[${PYTHON_USEDEP}]
+			dev-python/requests-cache[${PYTHON_USEDEP}]
 			dev-python/simplejson[${PYTHON_USEDEP}]
 		')
 	)
@@ -146,6 +147,7 @@ python_check_deps() {
 	has_version "dev-python/future[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/lxml[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/requests-cache[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
 }
 
@@ -385,11 +387,11 @@ src_install() {
 
 	insinto /usr/share/mythtv/contrib
 	# Ensure we don't install scripts needing the perl bindings (bug #516968) Finding none is OK.
-	if use perl; then
+	if ! use perl; then
 		find contrib/ -name '*.pl' -exec rm {} \;
 	fi
 	# Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK.
-	if use python; then
+	if ! use python; then
 		find contrib/ -name '*.py' -exec rm {} \;
 	fi
 	doins -r contrib/*
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 060ed3b1632d..340fe8a703bc 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index 0d2349fb1b62..44318367463c 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -3,4 +3,4 @@ DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3
 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060
 EBUILD subliminal-2.1.0.ebuild 2734 BLAKE2B 3f8f3ecab0d6c7ebe3bfde78a5d153f756088fa28769ed8bcd781976778bff03f471e1cfc9b68778bc6745265848a50aaef2bc2898ca3d80901c638ae25cb794 SHA512 f19d33f491fd65c3dd8e7880356a72051a09b0f68c46b0a81eb15f965b4c5cb167a35d872e1cb47ec8f96970ea748b4b447badf31e32ee209a20c6d56b9279a2
 EBUILD subliminal-9999.ebuild 2719 BLAKE2B bc1135d128c01069313c58fb91e434468042d27f29fb70a1c2eac10b8416d21e2f9b73094143e1e721ce7873599d937924f4359c7292ea93bbfface88c520ecd SHA512 4a2dbf310039818a90cb12b9be5c67089ea1c11ebe82059798cf0fb9f98599475851a1651da8d2939b27fbbce5db17a296c258577b6af3718345b5c142abb5b5
-MISC metadata.xml 422 BLAKE2B 1cd74b0b317afb66700624021694c87220aeba3eeac824809d603f753c0f352b826fe2f09911e5e69709bb86e7212a50c32f7ae6309dd621a3e002a4a2ca6ed2 SHA512 7b212d1c46b59ae068b95fdd610c34885c943e9207b099c5bd1e84f40a44fa0c759760ca6beb2674bba74f291573eba77f2eba89e91ff8abbfb4e25abc8a06e6
+MISC metadata.xml 446 BLAKE2B 41fe81b3e05395bd7e23e081358069335f4ea6eb7aea9c345de035c5595985a76153ca0f7792be40ec0f039e09905bd788043ed2b6efdcadc5b1d8742cdc21a6 SHA512 22f6b1198815e6ed85456fa498a8b3b2fbb5649b872482ab6b78dff643e3fd2a24a99594685504e4491772be67dae2bda08852dbe9a89de7f2f6a3435357301a
diff --git a/media-video/subliminal/metadata.xml b/media-video/subliminal/metadata.xml
index b79d34d9c55a..cd2bfaa916c2 100644
--- a/media-video/subliminal/metadata.xml
+++ b/media-video/subliminal/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/subliminal</remote-id>
 		<remote-id type="pypi">subliminal</remote-id>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2ed5645658c9..cd151b2d2467 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 30e067bf5c12..ae36b5122e01 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Jul 2020 09:38:23 +0000
+Sun, 02 Aug 2020 16:08:25 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ceca7bfd4af6..b7864c5a4e9c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 478757 BLAKE2B 2a9c2565920dd108cc5f8de5ef6788811b60e84e714d0e1601b878e9bb44b3551b04aeec5d39fddc7ac0948519a93bbfd93853ccd9e757e58631d5b79fa97b2e SHA512 1a06a6cd4388525b4eadcbf1c6ecda1626cceb7cb107b45561393aacfa8a48a562fceed3bb0af6040d816fbe9f33273726fa02d16f8acb8ab606b04ba155ade8
-TIMESTAMP 2020-07-31T09:38:27Z
+MANIFEST Manifest.files.gz 479714 BLAKE2B 9fec2adcb28a1a10e8e230fb5401d7d2f547a1f4c3f1614193e3351b7af6104c9d6c6b5a13450280869c485a145a2b82bfd89b7b370b7a2c895c2dac712260a1 SHA512 63829d8de6a119fd02d7152afae99a8e50947ca2161063d447b0b1d0bca3a41cc0ad7316f46ce74e6c2b0c1fa5952dca015ea2d25ab3038a6a5697b6d1862223
+TIMESTAMP 2020-08-02T16:08:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8j5pNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8m5PxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5iBAAq77JTVWL+fPqcSXvecbQkMHajyheE/L1ilU670L+qVOKNY7MtfJ8pU7N
-/5lLu1WoFHUVDhzInslg/3CF+SzssQD9dVxo0jwVxt+GIIkwYEqua3yw3ZoeTmDY
-ZbMU0hxz7vYoh4isHyWAnG5x9z3ZTB9zRHUT5ehXOTqxbRgVhkGSn67P4CYYSki2
-WSRmYZSJSjTUPkAYa2vX2lMNkYI+i+sRE6lydskKz5xwYMbxJxgEpVzPcSENjb8E
-nDK+Ji8LQLAXwnrlZTY/isrrGWtbpx9Uex1Mbsd3/9ST36XGHX9kVXSzHodGz5yN
-QTMkxkZ2Y/TFFAnQyuh5WBj3O9yswRGQwPjYXwOBpn3Ws5i58C4mt7F4AGYKS8Pm
-fUVS3z27Znr4QirYJoVkKTGgLNUbvaBTUwlUit+oJL6Uf8S+zFxXMR+TP5JoLjBT
-7ohLHgzSbKsk0U4XRnCB+LytFwlRwsqOac0xgdUXVvoucuEl6a0NlR+x5t4Ng2u3
-DTiSWVWcpwOvrbpIRLblGPWUUXhl1Sf2BLU+gIo72lKrPw3vYRHDwcVYiE1mmBCY
-8SdAVuLvzYHc1qRw73OZBzYDN8W+pmPFr1Ic0CyBdrFGJMWmbNJfw5snnyw4NTQ4
-3SZRL79FKaC2lBQe32RpPsoCMDOoqjL9UNGgoukFsYEGAHmO+Zs=
-=C/Yn
+klBcEA//b92rJs/d9tmoCt6b9ipeQw5eVADXK4ccuhFSi0J2pjM7UGdIBnMYBbwh
+awl5asTOv2FfXo+MJECC80FDpmpPLXqtQTA2XNi6E/vF4xZqJYdSo/XY9NhzT7Sh
+3Tg45KoK2/Rp5XbZi4Ir8eJ+zdq6JMLzzmBjDIPxvBTT7/he2XoWyGC16KixWUfM
+voDhUYaKxpRvWq+mUU+fjUS6GEwDimURfxx9Byu8oBCmKPAZVxDFsDbehl25ZwbJ
+UHGT2xe7YcaOoFJe4yKoPLv5avXsbRjQwwNInEyfAKUyP3e2jWLUfPiN9AH7aY2X
+9Sqlxag/X0QpgF0weoDsLzGyVTxtS4jG2u/IHyaOZ8qp6tOor6XpJ3KWiv0g15kJ
+YEA1bNyYH7+42LyL5lNnEYWQ6+EISxfO7esUOyHNXsbh/zu6n3rWmw4qMxtk5MQW
+NIDI6WSP0SNaiwawF6T2yim3HUfOfavuQPASuZg7Xd2UMnnjDF4E/h/4yqFXyfWM
+LGOjRg9o1HHLcX2meUOoSLL1+lnChR4DRh8MeXWwUxBymzBRBH7UIDBtCDZChfBE
+vebTrLawNDGUISh6lT33SNlonYxqjs0BoMUcfFj6Q/6PYUKQPp6hbiCvFm1jdVen
+Ld38YpdG+uS1NlAe4ZP6bgU0nhSkybUVpjnOyuLM3/saAuQ+jtA=
+=M+eo
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index a9d0eb23a7db..7ad9467b03e1 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202007-61.xml b/metadata/glsa/glsa-202007-61.xml
new file mode 100644
index 000000000000..1b54bb27dfc9
--- /dev/null
+++ b/metadata/glsa/glsa-202007-61.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202007-61">
+  <title>WebKitGTK+: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in WebKitGTK+, the worst
+    of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">webkitgtk+</product>
+  <announced>2020-07-31</announced>
+  <revised count="1">2020-07-31</revised>
+  <bug>734584</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/webkit-gtk" auto="yes" arch="*">
+      <unaffected range="ge">2.28.4</unaffected>
+      <vulnerable range="lt">2.28.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>WebKitGTK+ is a full-featured port of the WebKit rendering engine,
+      suitable for projects requiring any kind of web integration, from hybrid
+      HTML/CSS applications to full-fledged web browsers.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in WebKitGTK+. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All WebKitGTK+ users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-libs/webkit-gtk-2.28.4"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9862">CVE-2020-9862</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9893">CVE-2020-9893</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9894">CVE-2020-9894</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9895">CVE-2020-9895</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9915">CVE-2020-9915</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-9925">CVE-2020-9925</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-29T18:52:03Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-07-31T17:08:46Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202007-62.xml b/metadata/glsa/glsa-202007-62.xml
new file mode 100644
index 000000000000..6186762c7c92
--- /dev/null
+++ b/metadata/glsa/glsa-202007-62.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202007-62">
+  <title>PyCrypto: Weak key generation</title>
+  <synopsis>A flaw in PyCrypto allow remote attackers to obtain sensitive
+    information.
+  </synopsis>
+  <product type="ebuild">pycrypto</product>
+  <announced>2020-07-31</announced>
+  <revised count="1">2020-07-31</revised>
+  <bug>703682</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-python/pycrypto" auto="yes" arch="*">
+      <vulnerable range="le">2.6.1-r2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PyCrypto is the Python Cryptography Toolkit.</p>
+  </background>
+  <description>
+    <p>It was discovered that PyCrypto incorrectly generated ElGamal key
+      parameters.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Attackers may be able to obtain sensitive information by reading
+      ciphertext data.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for PyCrypto. We recommend that users
+      unmerge PyCrypto:
+    </p>
+    
+    <p># emerge --unmerge “dev-python/pycrypto”</p>
+    
+    <p>NOTE: The Gentoo developer(s) maintaining PyCrypto have discontinued
+      support at this time. PyCryptodome is the canonical successor to
+      PyCrypto.
+    </p>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-6594">CVE-2018-6594</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-30T01:21:33Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-07-31T17:10:46Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202007-63.xml b/metadata/glsa/glsa-202007-63.xml
new file mode 100644
index 000000000000..c9a34b4d517c
--- /dev/null
+++ b/metadata/glsa/glsa-202007-63.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202007-63">
+  <title>SNMP Trap Translator: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in SNMP Trap Translator,
+    the worst of which could allow attackers to execute arbitrary shell code.
+  </synopsis>
+  <product type="ebuild">snmptt</product>
+  <announced>2020-07-31</announced>
+  <revised count="1">2020-07-31</revised>
+  <bug>733478</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-analyzer/snmptt" auto="yes" arch="*">
+      <unaffected range="ge">1.4.1</unaffected>
+      <vulnerable range="lt">1.4.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>SNMP Trap Translator (SNMPTT) is an SNMP trap handler written in Perl.</p>
+  </background>
+  <description>
+    <p>It was found that SNMP Trap Translator does not drop privileges as
+      configured and does not properly escape shell commands in certain
+      functions.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker, by sending a malicious crafted SNMP trap, could
+      possibly execute arbitrary shell code with the privileges of the process
+      or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All SNMP Trap Translator users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-analyzer/snmptt-1.4.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://sourceforge.net/p/snmptt/git/ci/snmptt_1-4-1/tree/snmptt/ChangeLog">
+      SNMPTT 1.4.1 ChangeLog
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-26T15:27:28Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-07-31T17:11:01Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202007-64.xml b/metadata/glsa/glsa-202007-64.xml
new file mode 100644
index 000000000000..1267eab96bc4
--- /dev/null
+++ b/metadata/glsa/glsa-202007-64.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202007-64">
+  <title>Mozilla Thunderbird: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Mozilla Thunderbird,
+    the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">thunderbird</product>
+  <announced>2020-07-31</announced>
+  <revised count="2">2020-07-31</revised>
+  <bug>734978</bug>
+  <access>remote</access>
+  <affected>
+    <package name="mail-client/thunderbird" auto="yes" arch="*">
+      <unaffected range="ge">68.11.0</unaffected>
+      <vulnerable range="lt">68.11.0</vulnerable>
+    </package>
+    <package name="mail-client/thunderbird-bin" auto="yes" arch="*">
+      <unaffected range="ge">68.11.0</unaffected>
+      <vulnerable range="lt">68.11.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Mozilla Thunderbird is a popular open-source email client from the
+      Mozilla project.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Mozilla Thunderbird.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Mozilla Thunderbird users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=mail-client/thunderbird-68.11.0"
+    </code>
+    
+    <p>All Mozilla Thunderbird binary users should upgrade to the latest
+      version:
+    </p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=mail-client/thunderbird-bin-68.11.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15652">CVE-2020-15652</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15659">CVE-2020-15659</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6463">CVE-2020-6463</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-6514">CVE-2020-6514</uri>
+    <uri link="https://www.mozilla.org/en-US/security/advisories/mfsa2020-35/">
+      MFSA-2020-35
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-31T17:27:15Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-07-31T19:04:30Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202007-65.xml b/metadata/glsa/glsa-202007-65.xml
new file mode 100644
index 000000000000..afb2aede7b0c
--- /dev/null
+++ b/metadata/glsa/glsa-202007-65.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202007-65">
+  <title>libsndfile: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libsndfile, the worst
+    of which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">libsndfile</product>
+  <announced>2020-07-31</announced>
+  <revised count="1">2020-07-31</revised>
+  <bug>631674</bug>
+  <bug>671834</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/libsndfile" auto="yes" arch="*">
+      <unaffected range="ge">1.0.29_pre2_p20191024</unaffected>
+      <vulnerable range="lt">1.0.29_pre2_p20191024</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libsndfile is a C library for reading and writing files containing
+      sampled sound.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libsndfile. Please
+      review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libsndfile users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=media-libs/libsndfile-1.0.29_pre2_p20191024"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14245">CVE-2017-14245</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14246">CVE-2017-14246</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-3832">CVE-2019-3832</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-16T01:07:57Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-07-31T19:55:37Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202008-01.xml b/metadata/glsa/glsa-202008-01.xml
new file mode 100644
index 000000000000..3027067a0ec7
--- /dev/null
+++ b/metadata/glsa/glsa-202008-01.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202008-01">
+  <title>Python: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Python, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">python</product>
+  <announced>2020-08-02</announced>
+  <revised count="1">2020-08-02</revised>
+  <bug>728668</bug>
+  <bug>732498</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-lang/python" auto="yes" arch="*">
+      <unaffected range="ge" slot="2.7">2.7.18-r1</unaffected>
+      <unaffected range="ge" slot="3.6">3.6.11-r2</unaffected>
+      <unaffected range="ge" slot="3.7">3.7.8-r2</unaffected>
+      <unaffected range="ge" slot="3.8">3.8.4-r1</unaffected>
+      <vulnerable range="lt" slot="2.7">2.7.18-r1</vulnerable>
+      <vulnerable range="lt" slot="3.6">3.6.11-r2</vulnerable>
+      <vulnerable range="lt" slot="3.7">3.7.8-r2</vulnerable>
+      <vulnerable range="lt" slot="3.8">3.8.4-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Python is an interpreted, interactive, object-oriented programming
+      language.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Python. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Python 2.7 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-2.7.18-r1"
+    </code>
+    
+    <p>All Python 3.6 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.6.11-r2"
+    </code>
+    
+    <p>All Python 3.7 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.7.8-r2"
+    </code>
+    
+    <p>All Python 3.8 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/python-3.8.4-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-20907">CVE-2019-20907</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-14422">CVE-2020-14422</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-07-31T17:34:38Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-08-02T03:19:15Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cafc35c5c511..ae36b5122e01 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Jul 2020 09:38:24 +0000
+Sun, 02 Aug 2020 16:08:25 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 2634df397f18..131ba47d204b 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-dc581b7292457905893a3717d10290f36c4784e0 1596079297 2020-07-30T03:21:37+00:00
+faa06d7064a73216c4b046c9cb518f095e7cfac8 1596338441 2020-08-02T03:20:41+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5a621d6e314b..242392f03983 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index f5902b2030c1..ac9b76a73143 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/accerciser-3.22.0 b/metadata/md5-cache/app-accessibility/accerciser-3.22.0
deleted file mode 100644
index 3f89545a27e8..000000000000
--- a/metadata/md5-cache/app-accessibility/accerciser-3.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= >=dev-python/ipython-0.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-text/yelp-tools >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Interactive Python accessibility explorer
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Accerciser
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD CC-BY-SA-3.0
-RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.1.13:3[introspection] dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= >=dev-python/ipython-0.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d1dcb6311e7e939df36ecfcc4f7cc11
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 70b0533e5946..25ab35b6df40 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/consul-1.8.1 b/metadata/md5-cache/app-admin/consul-1.8.1
new file mode 100644
index 000000000000..2689ac7d639c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.8.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.8.1.tar.gz -> consul-1.8.1.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v40.3.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.3.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.10.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/auth/@v/v0.4.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/azure/cli/@v/v0.3.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v3.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.3.3.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.zip -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.zip -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20200313221541-5f7e5dd04533.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod mirror://goproxy//github.com/cockroachdb/apd/@v/v1.1.0.mod -> github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.5.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.zip -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.zip mirror://goproxy//github.com/google/tcpproxy/@v/v0.0.0-20180808230851-dfa16c61dad2.mod -> github.com%2Fgoogle%2Ftcpproxy%2F@v%2Fv0.0.0-20180808230851-dfa16c61dad2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20200501174627-ad1e96bde088.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20200501174627-ad1e96bde088.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.3.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jackc/fake/@v/v0.0.0-20150926172116-812a484cc733.mod -> github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod mirror://goproxy//github.com/jackc/pgx/@v/v3.3.0+incompatible.mod -> github.com%2Fjackc%2Fpgx%2F@v%2Fv3.3.0+incompatible.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.zip mirror://goproxy//github.com/joyent/triton-go/@v/v1.7.1-0.20200416154420-6801d15b779f.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.7.1-0.20200416154420-6801d15b779f.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.zip -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.1.1.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.14.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.3.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/pointerstructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20180130162743-b8a9be070da4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20180130162743-b8a9be070da4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.zip -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/patrickmn/go-cache/@v/v2.1.0+incompatible.mod -> github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rs/zerolog/@v/v1.4.0.mod -> github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/conswriter/@v/v0.0.0-20180208195008-f5ae3917a627.mod -> github.com%2Fsean-%2Fconswriter%2F@v%2Fv0.0.0-20180208195008-f5ae3917a627.mod mirror://goproxy//github.com/sean-/pager/@v/v0.0.0-20180208200047-666be9bf53b5.mod -> github.com%2Fsean-%2Fpager%2F@v%2Fv0.0.0-20180208200047-666be9bf53b5.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/shopspring/decimal/@v/v0.0.0-20180709203117-cd690d0c9e24.mod -> github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.1.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.zip -> go.opencensus.io%2F@v%2Fv0.22.0.zip mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip mirror://goproxy//go.uber.org/goleak/@v/v1.0.0.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190515120540-06a5c4944438.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190425155659-357c62f0e4bb.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190502173448-54afdca5d873.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190819201941-24fa4b261c55.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.16.9.zip -> k8s.io%2Fapi%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/api/@v/v0.16.9.mod -> k8s.io%2Fapi%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.16.9.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/client-go/@v/v0.16.9.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.zip mirror://goproxy//k8s.io/client-go/@v/v0.16.9.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.16.9.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b9f77fae27ce2095eeb9adc3650c2873
diff --git a/metadata/md5-cache/app-admin/logrotate-3.17.0 b/metadata/md5-cache/app-admin/logrotate-3.17.0
new file mode 100644
index 000000000000..f07e8c0a0c4e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logrotate-3.17.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4
+DESCRIPTION=Rotates, compresses, and mails system logs
+EAPI=7
+HOMEPAGE=https://github.com/logrotate/logrotate
+IUSE=acl +cron selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
+SLOT=0
+SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=394db8a52bdd60d8fb1010c46f530eab
diff --git a/metadata/md5-cache/app-admin/sshguard-2.4.1 b/metadata/md5-cache/app-admin/sshguard-2.4.1
new file mode 100644
index 000000000000..da12f0c1edbc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sshguard-2.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-devel/flex
+DESCRIPTION=protects hosts from brute force attacks against ssh
+EAPI=7
+HOMEPAGE=https://www.sshguard.net/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=virtual/logger
+SLOT=0
+SRC_URI=mirror://sourceforge/sshguard/sshguard-2.4.1.tar.gz
+_md5_=748be88fb5f69f2ecb2acd67478b93f4
diff --git a/metadata/md5-cache/app-admin/vault-1.4.3 b/metadata/md5-cache/app-admin/vault-1.4.3
new file mode 100644
index 000000000000..fca5cd12b299
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.4.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.4.3.tar.gz -> vault-1.4.3.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.4.3-webui.tar.xz )
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3cc0fdd45a4bf7f11f29d9f68e124ed
diff --git a/metadata/md5-cache/app-admin/vault-1.5.0 b/metadata/md5-cache/app-admin/vault-1.5.0
new file mode 100644
index 000000000000..3aec4fb14df6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.5.0.tar.gz -> vault-1.5.0.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.5.0-webui.tar.xz )
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d3cc0fdd45a4bf7f11f29d9f68e124ed
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9481a3ced431..a1abe501bf61 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/libarchive-3.4.3 b/metadata/md5-cache/app-arch/libarchive-3.4.3
index a92adefdc531..8d6df3fb1a83 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.4.3
+++ b/metadata/md5-cache/app-arch/libarchive-3.4.3
@@ -5,10 +5,10 @@ DESCRIPTION=Multi-format archive and compression library
 EAPI=7
 HOMEPAGE=https://www.libarchive.org/
 IUSE=acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 BSD-4 public-domain
 RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=https://www.libarchive.org/downloads/libarchive-3.4.3.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1cf07b2edb6e19acaa9c48bbccc73d6b
+_md5_=41aac90c444f55bf2bcc3b7ae34b77a8
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
index a262d14d731d..bae9bef58897 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-
 DESCRIPTION=Qt GUI File Archiver
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.15.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.2.0/lxqt-archiver-0.2.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=587d7ff65133ce2950e8fa3251041e8f
+_md5_=6741aca735cacd08ea733f278dbef95e
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.15 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
index 39bf9c4007c1..f164c0c8620e 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.15
@@ -5,10 +5,10 @@ DESCRIPTION=A GTK+ archive manager that can be used with Thunar
 EAPI=7
 HOMEPAGE=https://github.com/ib/xarchiver
 IUSE=doc
-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
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.15.tar.gz -> xarchiver-0.5.4.15.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=010436a22f0822204a2d7cd0ac8c11f5
+_md5_=0925c41b4fedc66bfdfbbf4c20888306
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index fbff785b7d07..8d329a722212 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.9 b/metadata/md5-cache/app-backup/bareos-17.2.10
similarity index 68%
rename from metadata/md5-cache/app-backup/bareos-17.2.9
rename to metadata/md5-cache/app-backup/bareos-17.2.10
index 4592709af9ab..1e57add75f66 100644
--- a/metadata/md5-cache/app-backup/bareos-17.2.9
+++ b/metadata/md5-cache/app-backup/bareos-17.2.10
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib )
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=7
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
+RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.9.tar.gz -> bareos-17.2.9.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb5996469466276a5940d1e537ab0884
+SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.10.tar.gz -> bareos-17.2.10.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b617a02cdc52405ce010563d94e5788b
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.8 b/metadata/md5-cache/app-backup/bareos-18.2.9
similarity index 63%
rename from metadata/md5-cache/app-backup/bareos-18.2.8
rename to metadata/md5-cache/app-backup/bareos-18.2.9
index 14886e0da262..3337c4f7c4bb 100644
--- a/metadata/md5-cache/app-backup/bareos-18.2.8
+++ b/metadata/md5-cache/app-backup/bareos-18.2.9
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib )
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=7
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
+RDEPEND=!app-backup/bacula acct-group/bareos cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=static? ( clientonly )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.8.tar.gz -> bareos-18.2.8.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=858e9c324ad3acbeb85cb3b6ec7a2d90
+SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.9.tar.gz -> bareos-18.2.9.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56a6836522df4a023f4bbc50dcff245c
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.7 b/metadata/md5-cache/app-backup/bareos-19.2.8
similarity index 74%
rename from metadata/md5-cache/app-backup/bareos-19.2.7
rename to metadata/md5-cache/app-backup/bareos-19.2.8
index bc74048f205e..15a5ce47b57d 100644
--- a/metadata/md5-cache/app-backup/bareos-19.2.7
+++ b/metadata/md5-cache/app-backup/bareos-19.2.8
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph ) ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( acct-user/bareos postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:= sys-libs/zlib )
 DESCRIPTION=Featureful client/server network backup suite
@@ -11,6 +11,6 @@ RDEPEND=!app-backup/bacula acct-group/bareos !x86? ( ceph? ( sys-cluster/ceph )
 REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly ) x86? ( !ceph )
 RESTRICT=mirror
 SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.7.tar.gz -> bareos-19.2.7.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa7682a34d9a7c1c427810f295c41139
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.8.tar.gz -> bareos-19.2.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3df0454ee0294aebd8df8443aed05e6
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 007e81dc9d59..4d7152bbcf2a 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/pius-2.2.4 b/metadata/md5-cache/app-crypt/pius-2.2.4
deleted file mode 100644
index 12c3df4f5772..000000000000
--- a/metadata/md5-cache/app-crypt/pius-2.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/gnupg-2.0.0
-DESCRIPTION=A tool for signing and email all UIDs on a set of PGP keys
-EAPI=7
-HOMEPAGE=https://www.phildev.net/pius/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/jaymzh/pius/releases/download/v2.2.4/pius-2.2.4.tar.bz2
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2f1d9819ff1dfae6fd0197e86f8960ce
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 7f592a6ddb60..56ea08e5207c 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5 b/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
new file mode 100644
index 000000000000..ea74a11b86a6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=German Albrecht Neues Testament und Psalmen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAlbrecht
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerAlbrecht.zip -> GerAlbrecht-1.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c83a578f4f74613bfffb2ea718722dee
diff --git a/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5 b/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
new file mode 100644
index 000000000000..df1b2d559415
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Augustines Confessions (German)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAugustinus
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.3
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerAugustinus.zip -> GerAugustinus-1.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=dc6e91e076cfc721bb27840a9bffc311
diff --git a/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5 b/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
new file mode 100644
index 000000000000..930bc63f5be5
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1924 Grünewaldbibel
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerGruenewald
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerGruenewald.zip -> GerGruenewald-1.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=259bdb5519f6bc7e90c40445c763a33c
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1 b/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
new file mode 100644
index 000000000000..08a179058a3d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Hoffnung fuer alle - Die Bibel
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.6
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerHfa2002.zip -> GerHfa2002-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c4b2317b411d55bb8ca0f41aa077cabb
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1 b/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
new file mode 100644
index 000000000000..d862c3caaeed
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Hoffnung fuer alle - Worterklaerungen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.6
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerHfaLex2002.zip -> GerHfaLex2002-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=acd0a582aff0f69358de31e4a7785b61
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1 b/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
new file mode 100644
index 000000000000..da067ce6c0c4
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Leonberger Bibel, NT (NA28)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoNA28
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-NC-ND-4.0
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLeoNA28.zip -> GerLeoNA28-1.2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b6dd98b192fbf80e171d80344d8d9394
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2 b/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
new file mode 100644
index 000000000000..903fb0b3c9bf
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Leonberger Bibel, NT (RP19)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoRP18
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-NC-ND-4.0
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLeoRP18.zip -> GerLeoRP18-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e3b28818193b38e9d490ea5e00a84cb8
diff --git a/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7 b/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
new file mode 100644
index 000000000000..7c26f9c076f9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Eine Sammlung von Lutherpredigten
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLutherpredigten
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.4
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerLutherpredigten.zip -> GerLutherpredigten-1.7.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1380620437c13d1ae66eab3f0e2fd7de
diff --git a/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7 b/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
new file mode 100644
index 000000000000..6291a2146b5c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Neue evangelistische Übersetzung der Bibel
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerNeUe
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerNeUe.zip -> GerNeUe-2.7.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=79806bc44e3d29e604e8a5f70e2da3e7
diff --git a/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6 b/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
new file mode 100644
index 000000000000..f99f5ef745fd
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=German Reinhardt Evangelien
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerReinhardt
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerReinhardt.zip -> GerReinhardt-1.6.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d4f010cbe4453a81635c5b8a2a2d85a8
diff --git a/metadata/md5-cache/app-dicts/sword-GerTafel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
new file mode 100644
index 000000000000..f8178873b2e6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=German Tafelbibel (1911)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTafel
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerTafel.zip -> GerTafel-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=918e3790fb5a7a8a3b6b16515ff2273a
diff --git a/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
new file mode 100644
index 000000000000..84d3b5cb3fce
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=German Textbibel AT (1906)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTextbibel
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerTextbibel.zip -> GerTextbibel-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=25b24088efc7a4a6a178155f50312aff
diff --git a/metadata/md5-cache/app-dicts/sword-Godbey-1.0 b/metadata/md5-cache/app-dicts/sword-Godbey-1.0
new file mode 100644
index 000000000000..ce8d3a8ad2d1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Godbey-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1902 William Baxter Godbey NT
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Godbey
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Godbey.zip -> Godbey-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b8813f072101e7a86de48caaa4b67024
diff --git a/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1 b/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
new file mode 100644
index 000000000000..a5b92b58dd38
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=God'S Word to the Nations
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GodsWord
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GodsWord.zip -> GodsWord-1.3.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=220a11efe5c40b3370ee441f8a1c6b9f
diff --git a/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2 b/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
new file mode 100644
index 000000000000..0e54c248b7f3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Neophytos Vamvas's translation of the Holy Bible into modern Greek (1850)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreVamvas
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GreVamvas.zip -> GreVamvas-1.0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a8fd9be715482f6b77c9c7184f7bab8e
diff --git a/metadata/md5-cache/app-dicts/sword-Haitian-1.5 b/metadata/md5-cache/app-dicts/sword-Haitian-1.5
new file mode 100644
index 000000000000..65dcc6410273
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Haitian-1.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Haitian Creole Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Haitian
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Haitian.zip -> Haitian-1.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ab29ece8fe6c7c5acf9c2209c88a0555
diff --git a/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2 b/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
new file mode 100644
index 000000000000..f0a682057fb1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Hebrew New Testament with Niqqud, based on Delitzsch's translation
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebDelitzsch
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HebDelitzsch.zip -> HebDelitzsch-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e1e67f8ee528ec36aacb78214bdbd401
diff --git a/metadata/md5-cache/app-dicts/sword-HebModern-1.2 b/metadata/md5-cache/app-dicts/sword-HebModern-1.2
new file mode 100644
index 000000000000..93469c84980e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-HebModern-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Modern Hebrew Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HebModern.zip -> HebModern-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=872cacea86c0f6815f091e8ee588606f
diff --git a/metadata/md5-cache/app-dicts/sword-HinERV-1.1 b/metadata/md5-cache/app-dicts/sword-HinERV-1.1
new file mode 100644
index 000000000000..d56a575eef3c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-HinERV-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Holy Bible: Easy-to-Read Version (Hindi ERV)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HinERV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HinERV.zip -> HinERV-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ed0c9b9dc24d2df17ebd800e146f56dd
diff --git a/metadata/md5-cache/app-dicts/sword-HunUj-1.7.3 b/metadata/md5-cache/app-dicts/sword-HunUj-1.7.3
new file mode 100644
index 000000000000..7845380c9869
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-HunUj-1.7.3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The New Translation Bible of the Hungarian Bible Society
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HunUj.zip -> HunUj-1.7.3.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c5eb9b317a533c6d839eecca7c54981e
diff --git a/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1 b/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
new file mode 100644
index 000000000000..992e84360d18
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Imitation of Christ by Thomas a Kempis
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Imitation
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Imitation.zip -> Imitation-1.7.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b03eb3845ba901871afab3df6d1e43de
diff --git a/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0 b/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
new file mode 100644
index 000000000000..e081e3a1b5fd
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=A modern Irish New Testament (Luke preview)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=IriODomhnuill
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/IriODomhnuill.zip -> IriODomhnuill-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=697403fe5783fcc3d9ebf606f10824cc
diff --git a/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2 b/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
new file mode 100644
index 000000000000..cc85f68ea11a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Greek-Italian Dictionary of the New Testament
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItDizGreco
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItDizGreco.zip -> ItDizGreco-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=fb1b51254c4109d14ed8737273b8de05
diff --git a/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0 b/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
new file mode 100644
index 000000000000..c713f9de0f51
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Dizionario dei nomi della Bibbia
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItNomiBibbia
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.7.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ItNomiBibbia.zip -> ItNomiBibbia-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1a22ce3a6ed0959258d1ea11787c4632
diff --git a/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0 b/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
new file mode 100644
index 000000000000..4486129d4c30
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Holiness by J. C. Ryle
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JCRHoliness
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JCRHoliness.zip -> JCRHoliness-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=7cc8f5d801acf00a74b21a8e09668209
diff --git a/metadata/md5-cache/app-dicts/sword-JEAffections-1.0 b/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
new file mode 100644
index 000000000000..8b4eaff6df5e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Religious Affections by Jonathan Edwards
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JEAffections
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JEAffections.zip -> JEAffections-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=5c8723436a10b55e39c25c95d2fbc975
diff --git a/metadata/md5-cache/app-dicts/sword-JESermons-1.0 b/metadata/md5-cache/app-dicts/sword-JESermons-1.0
new file mode 100644
index 000000000000..de11797275d2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JESermons-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Select Sermons of Jonathan Edwards
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JESermons
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JESermons.zip -> JESermons-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=f89742a6457adc318245082c362a279b
diff --git a/metadata/md5-cache/app-dicts/sword-JOChrist-0.5 b/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
new file mode 100644
index 000000000000..47481704b2e9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Christologia by John Owen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOChrist
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOChrist.zip -> JOChrist-0.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=6a1fa45eea842947ff65e52a8ceaef1e
diff --git a/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1 b/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
new file mode 100644
index 000000000000..e41d84d8a651
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Communion with God the Father, Son and Holy Ghost by John Owen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOCommGod
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOCommGod.zip -> JOCommGod-0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ffd95f5fb1b0b00b5bbfe373e80d76b4
diff --git a/metadata/md5-cache/app-dicts/sword-JOGlory-0.5 b/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
new file mode 100644
index 000000000000..71afda9f9533
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Glory of Christ by John Owen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOGlory
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOGlory.zip -> JOGlory-0.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=cd7298126d88e4e4da531189c94c9709
diff --git a/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0 b/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
new file mode 100644
index 000000000000..9b00842cacd1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Mortification of Sin by John Owen
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOMortSin
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JOMortSin.zip -> JOMortSin-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b7cf36efdbc45ccb39a2371c11b305dc
diff --git a/metadata/md5-cache/app-dicts/sword-JapBungo-1.0 b/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
new file mode 100644
index 000000000000..a0201e0ed8be
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Classical Japanese Bible (Bungo-yaku/Taisho-kaiyaku), 1950 edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapBungo
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.12
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapBungo.zip -> JapBungo-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=619a1c23cc251dfff0733e9c732ecaad
diff --git a/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1 b/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
new file mode 100644
index 000000000000..b61ee0957826
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Japanese Electronic Network Bible (Denmo)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapDenmo
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapDenmo.zip -> JapDenmo-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=7926584057a6e786aa2090707285a06c
diff --git a/metadata/md5-cache/app-dicts/sword-JapKougo-1.1 b/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
new file mode 100644
index 000000000000..a373c41b77e0
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Colloquial Japanese Bible (Kougo-yaku), published 1954/1955
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapKougo
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.12
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapKougo.zip -> JapKougo-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e894e00ce3752cd026dddffe178f1f49
diff --git a/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0 b/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
new file mode 100644
index 000000000000..20400812cbd9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Japanese Bible translation from the Meiji period, version from 1953
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapMeiji
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.12
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapMeiji.zip -> JapMeiji-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=23be8a4a9e948165b7a2abd2e1046c13
diff --git a/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0 b/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
new file mode 100644
index 000000000000..35c65e14566a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Raguet-yaku - Japanese translation of the Bible by Emile Raguet (1910)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapRaguet
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.12
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JapRaguet.zip -> JapRaguet-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=fa6978bf26a0f8021dcfbd7465eec4b7
diff --git a/metadata/md5-cache/app-dicts/sword-KD-1.0 b/metadata/md5-cache/app-dicts/sword-KD-1.0
new file mode 100644
index 000000000000..ba652bb0573a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KD-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Keil and Delitzsch Biblical Commentary on the Old Testament
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KD.zip -> KD-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d1253ed266562d6d24027fd95e0e0de6
diff --git a/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0 b/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
new file mode 100644
index 000000000000..63568177598d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=King James Version: Pure Cambridge Edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVPCE
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJVPCE.zip -> KJVPCE-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=93a977d8e07d55eb71a829a8df78d584
diff --git a/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1 b/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
new file mode 100644
index 000000000000..395751b920b6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The New Testament in the Kapingamarangi language
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kapingamarangi
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kapingamarangi.zip -> Kapingamarangi-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=8ff50d1e3a1ff3c24143aaa5f25c4ed4
diff --git a/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1 b/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
new file mode 100644
index 000000000000..0920779490b2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bible translation into Kazakh
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kaz
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kaz.zip -> Kaz-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=db5612036b32f74b93b826fa82091c15
diff --git a/metadata/md5-cache/app-dicts/sword-Kekchi-1.5 b/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
new file mode 100644
index 000000000000..3099161ecd94
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=K'ekchi' Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Kekchi.zip -> Kekchi-1.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=71fa08a91e567d7c2d9c4ff24b9ca4fd
diff --git a/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1 b/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
new file mode 100644
index 000000000000..acf4b1d8d6fb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Khmer Christian Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KhmerNT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KhmerNT.zip -> KhmerNT-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=8bcabdbf59e67a2bc93638db955f4808
diff --git a/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0 b/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
new file mode 100644
index 000000000000..d4539f36765f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Korean Hangul King James Version
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorHKJV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KorHKJV.zip -> KorHKJV-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=0849164405dfa33bea03fef2aad5570a
diff --git a/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1 b/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
new file mode 100644
index 000000000000..be0ba3942f24
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Korean Revised Version 1952/1961
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorRV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KorRV.zip -> KorRV-2.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=708876c71e0c8fa59b32335d509eaabd
diff --git a/metadata/md5-cache/app-dicts/sword-KtuVb-3.1 b/metadata/md5-cache/app-dicts/sword-KtuVb-3.1
new file mode 100644
index 000000000000..3b1117bec174
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KtuVb-3.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Masonama ya Santu par le Père Widart et l’équipe de Verbum Bible Kinshasa
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KtuVb
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KtuVb.zip -> KtuVb-3.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=f5c99fea3e4537d903f946d11adcf202
diff --git a/metadata/md5-cache/app-dicts/sword-LEB-2.7 b/metadata/md5-cache/app-dicts/sword-LEB-2.7
new file mode 100644
index 000000000000..68c469089910
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LEB-2.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Lexham English Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LEB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LEB.zip -> LEB-2.7.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=8687885cfe059103e77e0f6eee051313
diff --git a/metadata/md5-cache/app-dicts/sword-LO-1.1 b/metadata/md5-cache/app-dicts/sword-LO-1.1
new file mode 100644
index 000000000000..445b9e50755f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LO-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Living Oracles NT
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LO
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LO.zip -> LO-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=aab33beee7177d31ddff85b97edef96d
diff --git a/metadata/md5-cache/app-dicts/sword-LXX-2.5 b/metadata/md5-cache/app-dicts/sword-LXX-2.5
new file mode 100644
index 000000000000..e1a231b7da3b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LXX-2.5
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Septuagint, Morphologically Tagged Rahlfs'
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LXX
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LXX.zip -> LXX-2.5.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=153c533476e76cb81bc07fbe6ca3ba8b
diff --git a/metadata/md5-cache/app-dicts/sword-Latvian-1.4 b/metadata/md5-cache/app-dicts/sword-Latvian-1.4
new file mode 100644
index 000000000000..ec490b56841d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Latvian-1.4
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Latvian New Testament
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Latvian.zip -> Latvian-1.4.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=2e079be6001e22c131483d6584e28759
diff --git a/metadata/md5-cache/app-dicts/sword-LawGospel-2.1 b/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
new file mode 100644
index 000000000000..85dd816ea5a8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Walther's Law and Gospel
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LawGospel
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.10
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LawGospel.zip -> LawGospel-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ef65029d6e6081aad016bb38c9376129
diff --git a/metadata/md5-cache/app-dicts/sword-Leeser-1.2 b/metadata/md5-cache/app-dicts/sword-Leeser-1.2
new file mode 100644
index 000000000000..e0149ec5fc8a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Leeser-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1853 Leeser Old Testament
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Leeser
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Leeser.zip -> Leeser-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d37fa3f0a66b70a246c3cb95c345d9e4
diff --git a/metadata/md5-cache/app-dicts/sword-LinVB-1.0 b/metadata/md5-cache/app-dicts/sword-LinVB-1.0
new file mode 100644
index 000000000000..e85ea06b528a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LinVB-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Liloba lya Nzambe, édition Verbum Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LinVB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LinVB.zip -> LinVB-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=051e3519837177121a278bb705c5a252
diff --git a/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2 b/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
new file mode 100644
index 000000000000..ab42efa87942
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Lithuanian Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LtKBB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LtKBB.zip -> LtKBB-1.7.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=70ffe6b3b377e0cf3a5ee6362e01f3f5
diff --git a/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1 b/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
new file mode 100644
index 000000000000..9abed3e78941
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Latvian Glück 8th edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LvGluck8
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LvGluck8.zip -> LvGluck8-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1ce2139f7ab28dd93815f396916e71bd
diff --git a/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1 b/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
new file mode 100644
index 000000000000..f56569f70376
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=An Intermediate Greek-English Lexicon Keyed to Strong's Numbers
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MLStrong
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MLStrong.zip -> MLStrong-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=00a6b22612e466ad68126b5b62ce3423
diff --git a/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1 b/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
new file mode 100644
index 000000000000..8d1ac49c45af
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Sathyavedapusthakam (Malayalam Bible) published in 1910
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mal1910
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mal1910.zip -> Mal1910-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=14749d062f625574fcc0376232aaf58f
diff --git a/metadata/md5-cache/app-dicts/sword-Maori-1.1 b/metadata/md5-cache/app-dicts/sword-Maori-1.1
new file mode 100644
index 000000000000..5318380a0f6e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Maori-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Maori Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Maori.zip -> Maori-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=93f6d89d472f9436b70726b98369dc3e
diff --git a/metadata/md5-cache/app-dicts/sword-MapM-1.0 b/metadata/md5-cache/app-dicts/sword-MapM-1.0
new file mode 100644
index 000000000000..01fae0c188a0
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-MapM-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Miqra according to the Mesorah
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MapM
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=app-text/sword-1.7.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MapM.zip -> MapM-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=fc1774e6edbf42bf8632d8d7535b6868
diff --git a/metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1 b/metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1
new file mode 100644
index 000000000000..1534f0998feb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Malagasy Bible (1865)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mg1865
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mg1865.zip -> Mg1865-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=f3aaf8e1c19aad296c5b05358102f4e7
diff --git a/metadata/md5-cache/app-dicts/sword-MollColossians-1.0 b/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
new file mode 100644
index 000000000000..ea2692964bc3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Paul's Letter to the Believers at Colosse - A Series of Devotions by Pastor Randy Moll
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MollColossians
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MollColossians.zip -> MollColossians-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4608f7d8b9a8beac359fdd4027de985a
diff --git a/metadata/md5-cache/app-dicts/sword-MonKJV-1.4 b/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
new file mode 100644
index 000000000000..58400edbfe1b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Mongolian King James Version
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MonKJV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MonKJV.zip -> MonKJV-1.4.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=6a943aa60b95390ffe4baff7bbe0c4d4
diff --git a/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0 b/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
new file mode 100644
index 000000000000..c41f3bd30604
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Morphologically Parsed Greek New Testament based on the SBLGNT
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MorphGNT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MorphGNT.zip -> MorphGNT-2.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a6546b59da254b4dc7dca24f0f240743
diff --git a/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
new file mode 100644
index 000000000000..aedd55a9ff59
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Free version of New English Translation with limited notes
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETfree
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETfree.zip -> NETfree-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c2d570902f7f272c3a00b78b4022ddc8
diff --git a/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
new file mode 100644
index 000000000000..1746e0c9e780
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Free version of NET Bible Footnotes with limited notes
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETnotesfree
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETnotesfree.zip -> NETnotesfree-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d8ab2a9190f56f74c77f14f36d754737
diff --git a/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0 b/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
new file mode 100644
index 000000000000..d7d0efa78e4a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=New English Translation text only with footnote markers
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETtext
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NETtext.zip -> NETtext-1.0.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=f09d9d69b1112d1918ee8b199bd26224
diff --git a/metadata/md5-cache/app-dicts/sword-NHEB-2.1 b/metadata/md5-cache/app-dicts/sword-NHEB-2.1
new file mode 100644
index 000000000000..f723dc0fdc48
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NHEB-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=New Heart English Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEB.zip -> NHEB-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=add47aab9674e7c2ca1aee3eedde2736
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
new file mode 100644
index 000000000000..b635cf9e1f2d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=New Heart English Bible: Jehovah Edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBJE
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEBJE.zip -> NHEBJE-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=11b0c0052991532711394600c6e6116a
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBME-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
new file mode 100644
index 000000000000..e3385c174dfc
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=New Heart English Bible: Messianic Edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBME
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NHEBME.zip -> NHEBME-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=26f1422cef5c3c7dc731fb66fb4f64e3
diff --git a/metadata/md5-cache/app-dicts/sword-Ndebele-1.2 b/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
new file mode 100644
index 000000000000..7c48461977a5
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Ndebele Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ndebele
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=FDL-1.3+
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Ndebele.zip -> Ndebele-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=9bf075de9294a2cc33647852da288217
diff --git a/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3 b/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
new file mode 100644
index 000000000000..bdf1584b05dc
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Nestle GNT 1904
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nestle1904
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Nestle1904.zip -> Nestle1904-1.3.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=eb883277c7ef3f1055d578d6c0104671
diff --git a/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0 b/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
new file mode 100644
index 000000000000..8f32dfc0441a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Petrus Canisius Translation
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NlCanisius1939
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NlCanisius1939.zip -> NlCanisius1939-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=60942a2d1960229b3bf28b5bf75ec251
diff --git a/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
new file mode 100644
index 000000000000..75fb205b2193
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bread Norwegian NT
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorBroed
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorBroed.zip -> NorBroed-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=40551643f481ed96d4b3e225245116a3
diff --git a/metadata/md5-cache/app-dicts/sword-NorSMB-1.0 b/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
new file mode 100644
index 000000000000..4a70b7c30cab
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Studentmållagsbibelen, first complete Nynorsk Bible translation (1921)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorSMB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorSMB.zip -> NorSMB-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=0e50784b8e8a6bb1c45a89c0bda9ac0a
diff --git a/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
new file mode 100644
index 000000000000..9b2072c5d6cc
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Northern Azeri Translation
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorthernAzeri
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.10
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/NorthernAzeri.zip -> NorthernAzeri-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e0679f759ed9e3cdef708b28c884a59e
diff --git a/metadata/md5-cache/app-dicts/sword-Noyes-1.2 b/metadata/md5-cache/app-dicts/sword-Noyes-1.2
new file mode 100644
index 000000000000..60002171f2bd
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Noyes-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1869 Noyes Translation
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Noyes
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Noyes.zip -> Noyes-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c354af0275787c23593ea1903954d59d
diff --git a/metadata/md5-cache/app-dicts/sword-OEB-1.1 b/metadata/md5-cache/app-dicts/sword-OEB-1.1
new file mode 100644
index 000000000000..d5c2e1d72459
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OEB-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Open English Bible (US Spelling)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC0-1.0
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OEB.zip -> OEB-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=9308d7c287ba2e180787ef8f2ebca708
diff --git a/metadata/md5-cache/app-dicts/sword-OEBcth-1.1 b/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
new file mode 100644
index 000000000000..4960635b82fc
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Open English Bible (Commonwealth Spelling)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEBcth
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC0-1.0
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OEBcth.zip -> OEBcth-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=989f34904fec1f2205a5753bc0ca33d1
diff --git a/metadata/md5-cache/app-dicts/sword-OSHB-1.4 b/metadata/md5-cache/app-dicts/sword-OSHB-1.4
new file mode 100644
index 000000000000..10f55404fca8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OSHB-1.4
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Open Scriptures Hebrew Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHB.zip -> OSHB-1.4.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4be5a644574a3f7dbe0c6d47334055ea
diff --git a/metadata/md5-cache/app-dicts/sword-OSHM-1.4 b/metadata/md5-cache/app-dicts/sword-OSHM-1.4
new file mode 100644
index 000000000000..820584ea1fbf
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OSHM-1.4
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Open Scriptures Hebrew Morphology Key
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHM
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-4.0
+RDEPEND=>=app-text/sword-1.7.4
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHM.zip -> OSHM-1.4.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=54de3e78db7a7c74469986524d584c43
diff --git a/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1 b/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
new file mode 100644
index 000000000000..39c8846d7d96
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Orthodox Jewish Brit Chadasha
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OrthJBC
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OrthJBC.zip -> OrthJBC-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d597308311d9e80c82ee9547bf4d92ba
diff --git a/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0 b/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
new file mode 100644
index 000000000000..c2e609355895
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1873 Oxford Textus Receptus Gospel of John
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OxfordTR
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OxfordTR.zip -> OxfordTR-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=55448d1b7c698f7371d8fadab36bed2d
diff --git a/metadata/md5-cache/app-dicts/sword-Passion-1.0 b/metadata/md5-cache/app-dicts/sword-Passion-1.0
new file mode 100644
index 000000000000..2c0ddff711cf
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Passion-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Dolorous Passion of Our Lord Jesus Christ
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Passion
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Passion.zip -> Passion-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b379a1d105dc0c7bc1d00a614867e2d6
diff --git a/metadata/md5-cache/app-dicts/sword-Phaistos-1.0 b/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
new file mode 100644
index 000000000000..ddeaf15adbca
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Phaistos Disk
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Phaistos
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Phaistos.zip -> Phaistos-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=65ea39cc1953796be7dfdd5ff5a57a73
diff --git a/metadata/md5-cache/app-dicts/sword-PohnOld-1.01 b/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
new file mode 100644
index 000000000000..16fb07a80bfe
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Old Public Domain Pohnpeian Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PohnOld
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PohnOld.zip -> PohnOld-1.01.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=664b5c7ac526ba590c4654063f3e7d5b
diff --git a/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1 b/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
new file mode 100644
index 000000000000..e49775113953
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bible in Pohnpeian language
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pohnpeian
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Pohnpeian.zip -> Pohnpeian-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=090bc74b1bd19bfb182561e7d55bc62a
diff --git a/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0 b/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
new file mode 100644
index 000000000000..ef2c701ce9ff
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Polish Biblia Gdanska (1881)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolGdanska
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PolGdanska.zip -> PolGdanska-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=db3c0504ea82345ceeda56b573cc6bd5
diff --git a/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1 b/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
new file mode 100644
index 000000000000..a66ffc1b68b3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Updated Polish Gdansk Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolUGdanska
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PolUGdanska.zip -> PolUGdanska-2.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=6a0233509960d5465b2ced0a6cd80454
diff --git a/metadata/md5-cache/app-dicts/sword-PorAR-1.3 b/metadata/md5-cache/app-dicts/sword-PorAR-1.3
new file mode 100644
index 000000000000..ea97b68c3797
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorAR-1.3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bíblia Almeida Recebida (AR)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAR
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-ND-4.0
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorAR.zip -> PorAR-1.3.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=88305a03b3786e1b528fc0d0473558fe
diff --git a/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2 b/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
new file mode 100644
index 000000000000..891f38a1e94f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=De 1911 Biblia Sagrada Traduzida em Portuguez Por João Ferreeira D'Almeida
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAlmeida1911
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorAlmeida1911.zip -> PorAlmeida1911-0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=6ceb0b314afd54b0ef311c9551a26878
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
new file mode 100644
index 000000000000..b5eb6fef1531
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bíblia Livre
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivre
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-3.0
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorBLivre.zip -> PorBLivre-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=d2b64a71adec2ff1d93661ea4eb7452b
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
new file mode 100644
index 000000000000..e9233687354f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bíblia Livre - Textus Receptus
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivreTR
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-3.0
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorBLivreTR.zip -> PorBLivreTR-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=31860a7e4fb55ecd348c820eb0d64264
diff --git a/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1 b/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
new file mode 100644
index 000000000000..364955568379
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bíblia Sagrada (Capuchinhos)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorCap
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire free-noncomm
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorCap.zip -> PorCap-2.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a245fae4d64361ae2b7e0388a65657c4
diff --git a/metadata/md5-cache/app-dicts/sword-PorIBP-1.0 b/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
new file mode 100644
index 000000000000..44f09fc945cb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Índice Bíblico-Pastoral da Bíblia dos Capuchinhos
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorIBP
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PorIBP.zip -> PorIBP-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=90367c7bc79a3bb707f494dace24e0d8
diff --git a/metadata/md5-cache/app-dicts/sword-PotLykins-1.0 b/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
new file mode 100644
index 000000000000..7bdf900c2377
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1833 Potawatomi Matthew and Acts
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PotLykins
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/PotLykins.zip -> PotLykins-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4bd7467273bb39992bae0655e207af1c
diff --git a/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2 b/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
new file mode 100644
index 000000000000..205c08cc82b8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Scripture Passages Quoting Scripture
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=QuotingPassages
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/QuotingPassages.zip -> QuotingPassages-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=8ee36001e553f807bfdb9382eba1bc11
diff --git a/metadata/md5-cache/app-dicts/sword-RecVer-1.0 b/metadata/md5-cache/app-dicts/sword-RecVer-1.0
new file mode 100644
index 000000000000..35980a740693
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RecVer-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Text Only Recovery Version (no outlines)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RecVer
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RecVer.zip -> RecVer-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=7a27300c239813d272a196fe03684d9c
diff --git a/metadata/md5-cache/app-dicts/sword-Rieger-1.0 b/metadata/md5-cache/app-dicts/sword-Rieger-1.0
new file mode 100644
index 000000000000..f75ef560c891
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Rieger-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Carl Heinrich Riegers Kommentar
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rieger
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Rieger.zip -> Rieger-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=10df5bc428786044c06cfeb7cbc2ed19
diff --git a/metadata/md5-cache/app-dicts/sword-RomCor-2.1 b/metadata/md5-cache/app-dicts/sword-RomCor-2.1
new file mode 100644
index 000000000000..7e98db96cbbc
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RomCor-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Cornilescu Bible in Romanian language
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RomCor.zip -> RomCor-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=fb5ac67008dc5b43c64b5c4164a58bcb
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1 b/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
new file mode 100644
index 000000000000..eb76d4fbef79
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARS
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARS.zip -> RusCARS-4.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a43f58010b4fc775ce15e445742b6383
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
new file mode 100644
index 000000000000..3cbcf31d8e96
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSA
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSA.zip -> RusCARSA-4.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ffdb201b5b4eb54bdd61a9771af4a58c
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
new file mode 100644
index 000000000000..e0a91be7459d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARSA
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSADICT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSADICT.zip -> RusCARSADICT-4.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=107ef5a118788b61007b4a96fe3511e1
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0 b/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
new file mode 100644
index 000000000000..889ac8aa7a44
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARS
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSDict
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSDict.zip -> RusCARSDict-4.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=11d215b05d7099b44564727883146689
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARST-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
new file mode 100644
index 000000000000..58ddfafd350d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Смысловой перевод Таврота, Книги Пророков, Забура и Инджила
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARST
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARST.zip -> RusCARST-4.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=dd12a4cf14b1cc72d72fff95e8ab553b
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
new file mode 100644
index 000000000000..e9e506cd77a7
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARST
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSTDICT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusCARSTDICT.zip -> RusCARSTDICT-4.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=5e7775d5eafd24a29c8b1433e0cd4176
diff --git a/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2 b/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
new file mode 100644
index 000000000000..907f7c9f726a
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Russian Synodal Bible, Licht im Osten Edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodalLIO
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusSynodalLIO.zip -> RusSynodalLIO-1.0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=af479250d6804d3e32ae0915e553fdf9
diff --git a/metadata/md5-cache/app-dicts/sword-RusVZh-1.0 b/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
new file mode 100644
index 000000000000..cdd90d20ccc8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Russian New Testament with Strong's Numbers under edition of Victor R. Zhuromsky
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusVZh
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.3
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusVZh.zip -> RusVZh-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=108df75c1b295f51e041efa4cba45dc0
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1 b/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
new file mode 100644
index 000000000000..15cc2c73c0ef
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Greek New Testament: SBL Edition
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SBLGNT.zip -> SBLGNT-1.3.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=31f710227e130936d1bcf64fe8e9aa0f
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3 b/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
new file mode 100644
index 000000000000..cccad1459c5b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Greek New Testament: SBL Edition, Apparatus
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNTApp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SBLGNTApp.zip -> SBLGNTApp-1.3.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=9c8cb1a5c2e6907bd2bc54b039ba8010
diff --git a/metadata/md5-cache/app-dicts/sword-SP-1.0 b/metadata/md5-cache/app-dicts/sword-SP-1.0
new file mode 100644
index 000000000000..f76235fc29f1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SP-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Samaritan Pentateuch
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SP
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.6.3
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SP.zip -> SP-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=7a5bd6b3b57b7a13e4922241c712078f
diff --git a/metadata/md5-cache/app-dicts/sword-SPDSS-1.0 b/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
new file mode 100644
index 000000000000..4d7278bb032d
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Dead Sea Scrolls variants parallel to the Samaritan Pentateuch
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPDSS
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.6.3
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPDSS.zip -> SPDSS-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=81ccf8cb234fae6afbc5ffc0e1dd24f6
diff --git a/metadata/md5-cache/app-dicts/sword-SPE-1.0 b/metadata/md5-cache/app-dicts/sword-SPE-1.0
new file mode 100644
index 000000000000..7f3003823bb2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SPE-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Samaritan Pentateuch in English
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPE
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPE.zip -> SPE-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=62eb41ca31c50b316b2c838df91a7b92
diff --git a/metadata/md5-cache/app-dicts/sword-SPMT-1.0 b/metadata/md5-cache/app-dicts/sword-SPMT-1.0
new file mode 100644
index 000000000000..32363f060bbb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SPMT-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Masoretic Text parallel to the Samaritan Pentateuch
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPMT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.6.3
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPMT.zip -> SPMT-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=efe309feaa0171c2990cef12a912577b
diff --git a/metadata/md5-cache/app-dicts/sword-SPVar-1.0 b/metadata/md5-cache/app-dicts/sword-SPVar-1.0
new file mode 100644
index 000000000000..269d47037136
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SPVar-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Samaritan Pentateuch with variant readings
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPVar
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SPVar.zip -> SPVar-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=57c63370e14014fe425349d275557f43
diff --git a/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1 b/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
new file mode 100644
index 000000000000..ec5f80469c71
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Sahidic Bible - Askeland / Schulz
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SahidicBible
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=app-text/sword-1.7.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SahidicBible.zip -> SahidicBible-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=975c1a2ae2397b8e6cdb364bbfb80d05
diff --git a/metadata/md5-cache/app-dicts/sword-Sentiment-1.0 b/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
new file mode 100644
index 000000000000..e49d57810040
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Sentiment Analysis of the Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sentiment
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-4.0
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Sentiment.zip -> Sentiment-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=2a6300bca5b56d4156a54c1fd29a60a3
diff --git a/metadata/md5-cache/app-dicts/sword-Shona-2.1 b/metadata/md5-cache/app-dicts/sword-Shona-2.1
new file mode 100644
index 000000000000..930a217316e3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Shona-2.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Shona Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Shona
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=FDL-1.3+
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Shona.zip -> Shona-2.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=464a19c82f422bf22f09a14d540d5fd9
diff --git a/metadata/md5-cache/app-dicts/sword-SloKJV-11.0 b/metadata/md5-cache/app-dicts/sword-SloKJV-11.0
new file mode 100644
index 000000000000..e18b6de0ebf3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SloKJV-11.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Slovenian translation of Holy Bible King James Version (1769)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-NC-ND-4.0
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloKJV.zip -> SloKJV-11.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a31b3c50e029b3b384fdf766243bfab4
diff --git a/metadata/md5-cache/app-dicts/sword-SloKJVA-0.3.41 b/metadata/md5-cache/app-dicts/sword-SloKJVA-0.3.41
new file mode 100644
index 000000000000..0be2a42c29a3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SloKJVA-0.3.41
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Sveto pismo Kralja Jakoba (1769)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJVA
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloKJVA.zip -> SloKJVA-0.3.41.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=79372d2437944b0369842129cbf316b2
diff --git a/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0 b/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
new file mode 100644
index 000000000000..b7e7d9557fad
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Ojačano Sveto pismo (Ps + Gal)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloOjacano
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloOjacano.zip -> SloOjacano-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=9cbd5aef6038c0ad89b27136e864235e
diff --git a/metadata/md5-cache/app-dicts/sword-SloStritar-1.1 b/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
new file mode 100644
index 000000000000..d66ff49abf61
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Novi testament in Psalmi Davidovi Josipa Stritarja (1882)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloStritar
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloStritar.zip -> SloStritar-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=cd1aa03aa5ae07ff55dc7200d58421a8
diff --git a/metadata/md5-cache/app-dicts/sword-SomKQA-2.0 b/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
new file mode 100644
index 000000000000..1e581c59da33
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Kitaabka Quduuska Ah (Somali Bible)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SomKQA
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SomKQA.zip -> SomKQA-2.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e868b974c694921cf199f5db6b52a7b6
diff --git a/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1 b/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
new file mode 100644
index 000000000000..08286ff20696
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Bible in Sorani Kurdish language
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sorani
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Sorani.zip -> Sorani-2.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=11554ddb599ce2bdb3e45c307627e40a
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
new file mode 100644
index 000000000000..b7c0c5fd36e0
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Spanish Reina-Valera Bible (1865) with updated orthography
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1865
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRV1865.zip -> SpaRV1865-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=748d4121e9a47c64b3f4475521fa747a
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
new file mode 100644
index 000000000000..77450bf64807
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Spanish Reina-Valera 1909 with Strong's numbers
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1909
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaRV1909.zip -> SpaRV1909-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=79c4b49378f005af06eeeb18a81a9579
diff --git a/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0 b/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
new file mode 100644
index 000000000000..47b6b46a7df2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Spanish Traducción de dominio público (Mateo a Romanos)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaTDP
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SpaTDP.zip -> SpaTDP-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4d78c27a62efcb8ac05d647d674094e2
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
new file mode 100644
index 000000000000..c02dd74b004f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Serbian Bible Daničić-Karadžić Ekavski, NRSV versification
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDEkavski
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SrKDEkavski.zip -> SrKDEkavski-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=b1d93dbf6a5267626acf3aaf5767433c
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
new file mode 100644
index 000000000000..1144a4467638
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Serbian Bible Daničić-Karadžić Ijekavski, Calvin versification
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDIjekav
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.8.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SrKDIjekav.zip -> SrKDIjekav-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1d79439b88a50bbd4ee9b85c214802ff
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917-2.0 b/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
new file mode 100644
index 000000000000..c2c64343fd19
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Swedish Bible (1917)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Swe1917.zip -> Swe1917-2.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=6f90c224704527d51eaff1094f01f49d
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1 b/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
new file mode 100644
index 000000000000..c8723c2e9aff
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Ordförklaringar och sakupplysningar från 1917 års översättning av bibeln
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917Of
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Swe1917Of.zip -> Swe1917Of-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=acd1b7d73a2945cd17b57634248c8ab3
diff --git a/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2 b/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
new file mode 100644
index 000000000000..069097bb4324
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Svenska Folkbibeln (1998)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweFolk1998
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweFolk1998.zip -> SweFolk1998-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=0f9847fca629d4eab81c11254a10f0e1
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
new file mode 100644
index 000000000000..eeaef133cc85
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Svenska Karl XII:s Bibel (1703)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweKarlXII.zip -> SweKarlXII-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=926b92d46d71dfd7bd4eeee3a75cb7ad
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
new file mode 100644
index 000000000000..441d4217f159
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Svenska Karl XII:s Bibel (1873)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII1873
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SweKarlXII1873.zip -> SweKarlXII1873-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=dbce9c532b225b1ac78acc55a99257e1
diff --git a/metadata/md5-cache/app-dicts/sword-TNT-2.0 b/metadata/md5-cache/app-dicts/sword-TNT-2.0
new file mode 100644
index 000000000000..c3929ed75cbe
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-TNT-2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Tregelles' Greek New Testament
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TNT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-NC-SA-4.0
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TNT.zip -> TNT-2.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a08f044202f88a08b748894a3cfcb26e
diff --git a/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2 b/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
new file mode 100644
index 000000000000..b0a614181a4e
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION='Ang Biblia' in Tagalog by Philippine Bible Society, 1905
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TagAngBiblia
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TagAngBiblia.zip -> TagAngBiblia-1.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=5908ca664d8082991bbe279e7a00cb24
diff --git a/metadata/md5-cache/app-dicts/sword-Tausug-1.1 b/metadata/md5-cache/app-dicts/sword-Tausug-1.1
new file mode 100644
index 000000000000..2c7fc046a5e6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Tausug-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Tausug Kitab Injil
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tausug
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-ND-3.0
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Tausug.zip -> Tausug-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=e2ed8c45bc5b0bf2c4ade9625f2f0bf2
diff --git a/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0 b/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
new file mode 100644
index 000000000000..5daa671e8387
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Thai King James Version
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ThaiKJV
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ThaiKJV.zip -> ThaiKJV-2.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=dc594bdc43ec47c40f24c273dd874623
diff --git a/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1 b/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
new file mode 100644
index 000000000000..7261b8bbaec8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Turkish Easy-to-Read Translation (HADI)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurHADI
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TurHADI.zip -> TurHADI-1.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=3749ebff557bd071d878f956ad621f2a
diff --git a/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1 b/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
new file mode 100644
index 000000000000..22053c09880f
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Kutsal Kitap (New Turkish Bible)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurNTB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/TurNTB.zip -> TurNTB-2.1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ab41a6d185a45f80a4b2d0dc8dd4060c
diff --git a/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1 b/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
new file mode 100644
index 000000000000..010eaa5555c6
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Ukrainian New Testament translated by P. Kulish (1871)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UkrKulish
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UkrKulish.zip -> UkrKulish-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=dd78300a9ca5e0bfe102333c698743ae
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeo-1.6 b/metadata/md5-cache/app-dicts/sword-UrduGeo-1.6
new file mode 100644
index 000000000000..f2da12d42cf9
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeo-1.6
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Urdu script
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeo
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeo.zip -> UrduGeo-1.6.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=7792f717471ee9f30c74c06c00a9d9cc
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7 b/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7
new file mode 100644
index 000000000000..633e97a80175
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Urdu Geo Version (UGV) Bible, Devanagari script
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoDeva
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoDeva.zip -> UrduGeoDeva-1.7.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=92de941fc4b78ece413b1fbe2ffb4bb0
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1 b/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1
new file mode 100644
index 000000000000..c69b1a1995fb
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Latin script
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoRoman
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoRoman.zip -> UrduGeoRoman-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a473bc7e3d2afc537597baf03b2d2e53
diff --git a/metadata/md5-cache/app-dicts/sword-UyCyr-1.1 b/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
new file mode 100644
index 000000000000..333dd36b9b67
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Modern Uyghur Cyrillic translation of the Bible
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UyCyr
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.7.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UyCyr.zip -> UyCyr-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ea126e7b0de5ab6b1eda994ed4e56b00
diff --git a/metadata/md5-cache/app-dicts/sword-VarApp-1.0 b/metadata/md5-cache/app-dicts/sword-VarApp-1.0
new file mode 100644
index 000000000000..01afa81d5e27
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VarApp-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=NT Manuscript Variant Apparatus
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VarApp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC0-1.0
+RDEPEND=>=app-text/sword-1.6.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VarApp.zip -> VarApp-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ca6245b6b7601a0c3ce59c111fbbcb74
diff --git a/metadata/md5-cache/app-dicts/sword-Viet-1.4.1 b/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
new file mode 100644
index 000000000000..39952e16dae2
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Vietnamese Bible (1934)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Viet
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Viet.zip -> Viet-1.4.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=29c7bfefa9bcf74447d8caa678f0e669
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
new file mode 100644
index 000000000000..0f4b7e9c7eed
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Lời Chúa Cho Mọi Người
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMN
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietLCCMN.zip -> VietLCCMN-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=c55d24b3546bf90f7d6d85919a05b6e2
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
new file mode 100644
index 000000000000..ce1f179be1a1
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Lời Chúa Cho Mọi Người Chú Thích
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMNCT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietLCCMNCT.zip -> VietLCCMNCT-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4e8ab4591823a2161c2748bfcb569f14
diff --git a/metadata/md5-cache/app-dicts/sword-VietNVB-1.4 b/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
new file mode 100644
index 000000000000..9f80a894fcd8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=New Vietnamese Bible (2002)
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietNVB
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VietNVB.zip -> VietNVB-1.4.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1a2ce43b06105d9aead33eadcbb1bc69
diff --git a/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1 b/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
new file mode 100644
index 000000000000..49c7fd91a648
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Clementine Vulgate
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgClementine
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgClementine.zip -> VulgClementine-2.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=30bdd16ceb660ece372ec1a0c9e910b5
diff --git a/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
new file mode 100644
index 000000000000..d9de62bd0615
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Vulgata Clementina, Conte editore
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgConte
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgConte.zip -> VulgConte-1.0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=2c4a31126147be366e95ce56f7853954
diff --git a/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1 b/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
new file mode 100644
index 000000000000..e706491c2d37
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Glossa ordinaria, ed. Migne
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgGlossa
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgGlossa.zip -> VulgGlossa-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=47a2adec0ba66c57795d87c5950c8642
diff --git a/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
new file mode 100644
index 000000000000..f57eb9dfbaf3
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Vulgata Clementina, Hetzenauer editore
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgHetzenauer
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgHetzenauer.zip -> VulgHetzenauer-1.0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=25b7d1647056e098b284730790c5cef9
diff --git a/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
new file mode 100644
index 000000000000..5439eb96d140
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Vulgata Sistina
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgSistine
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/VulgSistine.zip -> VulgSistine-1.0.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=297b6c5d5c2e569fd999830571d1293d
diff --git a/metadata/md5-cache/app-dicts/sword-Webster1806-1.0 b/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
new file mode 100644
index 000000000000..980d58734349
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Webster's 1806 A Compendious Dictionary of the English Language
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1806
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.11
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Webster1806.zip -> Webster1806-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=edc55483a6c464d188a3259ff3bf7bd8
diff --git a/metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1 b/metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1
new file mode 100644
index 000000000000..849cf3274e17
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=beibl.net translation of the Bible into colloquial Welsh by Arfon Jones
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WelBeiblNet
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crosswire
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WelBeiblNet.zip -> WelBeiblNet-2.5.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=8076c7a0804e1ba3ed423e029154ef5b
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1 b/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
new file mode 100644
index 000000000000..e0f17d16a375
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Westminster Confession & Catechisms
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.9
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Westminster.zip -> Westminster-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=4b9a6938d574412b5e2a37cc9a4aeb23
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster21-1.0 b/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
new file mode 100644
index 000000000000..474885e9239c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The Westminster Standards translated into twenty-first century American English
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster21
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Westminster21.zip -> Westminster21-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=553a44e948f7850bf0f1271884757ae2
diff --git a/metadata/md5-cache/app-dicts/sword-Worsley-1.6 b/metadata/md5-cache/app-dicts/sword-Worsley-1.6
new file mode 100644
index 000000000000..9ab8d4bd311b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-Worsley-1.6
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=1770 John Worsley NT
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Worsley
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.1
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Worsley.zip -> Worsley-1.6.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=44eddc0e66a5423e801113f1d146084c
diff --git a/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1 b/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
new file mode 100644
index 000000000000..20998b5d9f21
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=CEDICT English/Chinese Dictionary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhEnglish
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CEDICT
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhEnglish.zip -> ZhEnglish-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=5d1eb3ebd59458b3aca1b3fe085ea251
diff --git a/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0 b/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
new file mode 100644
index 000000000000..7b0a73ac7988
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=CEDICT Chinese (Hanzi)/English Dictionary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhHanzi
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CEDICT
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhHanzi.zip -> ZhHanzi-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=0894d3a15a068b1e9631b4c30c6cdca7
diff --git a/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0 b/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
new file mode 100644
index 000000000000..67633319d777
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=CEDICT Chinese (Pinyin)/English Dictionary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhPinyin
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CEDICT
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ZhPinyin.zip -> ZhPinyin-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=cbf42abad4314ffaa02e6f1acefcc570
diff --git a/metadata/md5-cache/app-dicts/sword-alzat-1.0 b/metadata/md5-cache/app-dicts/sword-alzat-1.0
new file mode 100644
index 000000000000..51e46f2985f8
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-alzat-1.0
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=الذات للبابا شنودة الثالث
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=alzat
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=free-noncomm
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/alzat.zip -> alzat-1.0.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=5c370552699018ca81d3a98929f75c7b
diff --git a/metadata/md5-cache/app-dicts/sword-br_en-1.1 b/metadata/md5-cache/app-dicts/sword-br_en-1.1
new file mode 100644
index 000000000000..5e0cfd31a420
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-br_en-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Breton to English Glossary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/br_en.zip -> br_en-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=1f1ccda9e38a6e80d64dfce47149b22d
diff --git a/metadata/md5-cache/app-dicts/sword-en_eu-1.1 b/metadata/md5-cache/app-dicts/sword-en_eu-1.1
new file mode 100644
index 000000000000..e792c4347048
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-en_eu-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=English to Basque Glossary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=en_eu
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/en_eu.zip -> en_eu-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=de789cefb4572d39a239cf862a74fb1e
diff --git a/metadata/md5-cache/app-dicts/sword-f35-1.0.1 b/metadata/md5-cache/app-dicts/sword-f35-1.0.1
new file mode 100644
index 000000000000..3474e993b137
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-f35-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Wilbur Pickering's Greek New Testament According to Family 35
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=f35
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-NC-SA-4.0
+RDEPEND=>=app-text/sword-1.7.2
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/f35.zip -> f35-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ddfa2735bda9ec945a0fc011a1c1e98a
diff --git a/metadata/md5-cache/app-dicts/sword-la_en-1.1 b/metadata/md5-cache/app-dicts/sword-la_en-1.1
new file mode 100644
index 000000000000..c7fe483f7490
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-la_en-1.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Latin to English Glossary
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/la_en.zip -> la_en-1.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=ee7acdfa08e8f966a4c9d47c5ef1af7f
diff --git a/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1 b/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
new file mode 100644
index 000000000000..4277f3bc5614
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Kitab Awal-Jaman maka Kitab Injil
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=sml_BL_2008
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=CC-BY-ND-3.0
+RDEPEND=>=app-text/sword-1.5.1a
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/sml_BL_2008.zip -> sml_BL_2008-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=a3ccc2eadbeb6e3ad5c75be69d9493aa
diff --git a/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
new file mode 100644
index 000000000000..18a4e22a1c39
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=Het Nieuwe Testament by Nicolaas De Jonge
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=vlsJoNT
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=app-text/sword-1.6.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/vlsJoNT.zip -> vlsJoNT-1.0.1.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=9b577d6c552db977b96889a303b8539e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3a8066157d76..d7d9e3032f16 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223 b/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
deleted file mode 100644
index a0aeaade204a..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-RESTRICT=test
-SLOT=27-vcs
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.50_pre20191223.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.50_pre20191223.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f4e42c5d3c29b99c7dbc099dd043c56
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.90 b/metadata/md5-cache/app-editors/emacs-27.0.90
deleted file mode 100644
index a34ddba75034..000000000000
--- a/metadata/md5-cache/app-editors/emacs-27.0.90
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
-REQUIRED_USE=?? ( aqua X )
-RESTRICT=test
-SLOT=27-vcs
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.90.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.90.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39d7e04328070cb5ad4e08444441960b
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.91 b/metadata/md5-cache/app-editors/emacs-27.1_rc1
similarity index 96%
rename from metadata/md5-cache/app-editors/emacs-27.0.91
rename to metadata/md5-cache/app-editors/emacs-27.1_rc1
index 90b8d47e5f3a..4a37fe80218f 100644
--- a/metadata/md5-cache/app-editors/emacs-27.0.91
+++ b/metadata/md5-cache/app-editors/emacs-27.1_rc1
@@ -11,6 +11,6 @@ RDEPEND=>=app-emacs/emacs-common-gentoo-1.5[games?,X?] sys-libs/ncurses:0= acl?
 REQUIRED_USE=?? ( aqua X )
 RESTRICT=test
 SLOT=27-vcs
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.91.tar.xz
+SRC_URI=mirror://gnu-alpha/emacs/pretest/emacs-27.1-rc1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39d7e04328070cb5ad4e08444441960b
+_md5_=24c81f85acb3976a8b634554a7c3781b
diff --git a/metadata/md5-cache/app-editors/nano-4.9.3 b/metadata/md5-cache/app-editors/nano-4.9.3
index 6c704df85221..51268455b8d8 100644
--- a/metadata/md5-cache/app-editors/nano-4.9.3
+++ b/metadata/md5-cache/app-editors/nano-4.9.3
@@ -5,11 +5,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=7
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~m68k ~mips ppc ppc64 ~riscv ~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
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 REQUIRED_USE=!ncurses? ( slang? ( minimal ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v4/nano-4.9.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab815262ac720adab8c16b6ba0c64d11
+_md5_=cc7a12fc1709e872c6285046fa497839
diff --git a/metadata/md5-cache/app-editors/okteta-0.26.4 b/metadata/md5-cache/app-editors/okteta-0.26.4
new file mode 100644
index 000000000000..0eb111863c01
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.26.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 crypt? ( app-crypt/qca:2[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Hex editor by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.okteta https://utils.kde.org/projects/okteta/
+IUSE=crypt test debug designer +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 crypt? ( app-crypt/qca:2[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.26.4/src/okteta-0.26.4.tar.xz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06d521c28a1c814b01a54a3990c216ac
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 5cc2c88e4589..6be1a4f928e2 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.3 b/metadata/md5-cache/app-emacs/ddskk-16.3
new file mode 100644
index 000000000000..924477870f86
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ddskk-16.3
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=One Japanese input methods on Emacs
+EAPI=7
+HOMEPAGE=http://openlab.ring.gr.jp/skk/
+IUSE=ruby
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) >=app-editors/emacs-24:*
+SLOT=0
+SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-16.3_Kutomatsunai.tar.gz -> ddskk-16.3.tar.gz
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	504a3383c45504fde86b00426619a709	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=d1530bc5c322a60e98b80a5f025d33be
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 91c187e512d5..78866e7d3f6e 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/buildah-1.14.6 b/metadata/md5-cache/app-emulation/buildah-1.14.10
similarity index 84%
rename from metadata/md5-cache/app-emulation/buildah-1.14.6
rename to metadata/md5-cache/app-emulation/buildah-1.14.10
index 847383866597..685c1bba3dec 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.14.6
+++ b/metadata/md5-cache/app-emulation/buildah-1.14.10
@@ -8,8 +8,8 @@ IUSE=selinux
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
-RESTRICT=test
+RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.14.6.tar.gz -> buildah-1.14.6.tar.gz
+SRC_URI=https://github.com/containers/buildah/archive/v1.14.10.tar.gz -> buildah-1.14.10.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5520c3e090edbb1ec669193f4c4351dc
+_md5_=3f9a9353ac09d951d585c394353911b5
diff --git a/metadata/md5-cache/app-emulation/buildah-1.14.5 b/metadata/md5-cache/app-emulation/buildah-1.15.1
similarity index 84%
rename from metadata/md5-cache/app-emulation/buildah-1.14.5
rename to metadata/md5-cache/app-emulation/buildah-1.15.1
index 2697f53fbc2b..7c26035f7ca2 100644
--- a/metadata/md5-cache/app-emulation/buildah-1.14.5
+++ b/metadata/md5-cache/app-emulation/buildah-1.15.1
@@ -8,8 +8,8 @@ IUSE=selinux
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
-RESTRICT=test
+RESTRICT=strip test
 SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.14.5.tar.gz -> buildah-1.14.5.tar.gz
+SRC_URI=https://github.com/containers/buildah/archive/v1.15.1.tar.gz -> buildah-1.15.1.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ada2b56907fccbf26446ca7b18b4da9
+_md5_=a4499c127cb7d7b64ca80fdbee468026
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.12 b/metadata/md5-cache/app-emulation/docker-19.03.12
new file mode 100644
index 000000000000..b0eb59bf2ee0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-19.03.12
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=dev-lang/go-1.13.12 dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp kernel_linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !sys-apps/systemd[-cgroup-hybrid(+)] >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.2.13 ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20191011 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.12.tar.gz -> docker-19.03.12.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=0e6c60d9991b27df674bd7b37c5409af
diff --git a/metadata/md5-cache/app-emulation/libpod-2.0.4 b/metadata/md5-cache/app-emulation/libpod-2.0.4
new file mode 100644
index 000000000000..3d5277e74767
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-2.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/podman/
+IUSE=apparmor btrfs +fuse +rootless selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= >=net-misc/cni-plugins-0.8.6 sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/podman/archive/v2.0.4.tar.gz -> podman-2.0.4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=149c53552f1e81ff7838b418d48dc6b7
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 7a79280dad69..73bad13d3e37 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9 b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
deleted file mode 100644
index 21fbed5699a3..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /usr/bin/vi symlink
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.6
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=3ea78678ca7888aa63f04193d08dfdc7
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.2 b/metadata/md5-cache/app-eselect/eselect-vi-1.2
index 22b8dd2d4811..daba308f9330 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.2
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.2
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Vim
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 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
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-vi.git/snapshot/eselect-vi-1.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a22aeccf09239621b9a2fee1e08d178a
+_md5_=9f21b21e06b31289445e89836bf13c4e
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 8d4aecdeafe5..ed3dcfbf2616 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
deleted file mode 100644
index 76af90dd8013..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] nls? ( virtual/libintl ) dev-util/intltool nls? ( sys-devel/gettext )
-DESCRIPTION=Chinese Cangjie and Quick engines for IBus
-EAPI=6
-HOMEPAGE=http://cangjians.github.io/
-IUSE=nls python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] nls? ( virtual/libintl )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04e50f22c8dcd745cfef688857ba59e5
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
new file mode 100644
index 000000000000..a7d3ba3a9f08
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Chinese Cangjie and Quick engines for IBus
+EAPI=7
+HOMEPAGE=http://cangjians.github.io/
+IUSE=nls python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/libcangjie dev-python/cangjie[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] nls? ( virtual/libintl )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d4f59db9f56baf3609a66858a2094ab8
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.3 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.3
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
index b7a6f0916bf3..15a597fd62a9 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.3
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-l
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.8.3/ibus-typing-booster-2.8.3.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.9.4/ibus-typing-booster-2.9.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b324c564bd840dc2c47b73b1768e052
diff --git a/metadata/md5-cache/app-i18n/libcangjie-1.3 b/metadata/md5-cache/app-i18n/libcangjie-1.3
index 7539f4cdfe69..8b56d08449a3 100644
--- a/metadata/md5-cache/app-i18n/libcangjie-1.3
+++ b/metadata/md5-cache/app-i18n/libcangjie-1.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=dev-db/sqlite:3=
 DESCRIPTION=Library implementing the Cangjie input method
-EAPI=6
+EAPI=7
 HOMEPAGE=http://cangjians.github.io/
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-db/sqlite:3=
 SLOT=0
 SRC_URI=https://github.com/Cangjians/libcangjie/releases/download/v1.3/libcangjie-1.3.tar.xz
-_md5_=a959aa707ba6ba9789f4ae22304e382f
+_md5_=89b2f39a907601fbb051e38d794a2979
diff --git a/metadata/md5-cache/app-i18n/yaskkserv-1.1.0 b/metadata/md5-cache/app-i18n/yaskkserv-1.1.0
deleted file mode 100644
index a3b5d6f3923b..000000000000
--- a/metadata/md5-cache/app-i18n/yaskkserv-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config configure install postinst postrm
-DEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( virtual/udev[systemd] ) dev-lang/perl virtual/pkgconfig
-DESCRIPTION=Yet Another SKK server
-EAPI=6
-HOMEPAGE=http://umiushi.org/~wac/yaskkserv/
-IUSE=gnutls libressl systemd
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( virtual/udev[systemd] )
-SLOT=0
-SRC_URI=http://umiushi.org/~wac/yaskkserv/yaskkserv-1.1.0.tar.xz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=008b882a4bf66eb0d3923660096f45b2
diff --git a/metadata/md5-cache/app-i18n/yaskkserv-1.1.1 b/metadata/md5-cache/app-i18n/yaskkserv-1.1.1
index 4f63ccb385bc..bd7cd690cdb2 100644
--- a/metadata/md5-cache/app-i18n/yaskkserv-1.1.1
+++ b/metadata/md5-cache/app-i18n/yaskkserv-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Yet Another SKK server
 EAPI=7
 HOMEPAGE=http://umiushi.org/~wac/yaskkserv/
 IUSE=gnutls libressl systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-i18n/skk-jisyo gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( virtual/udev[systemd] )
 SLOT=0
 SRC_URI=http://umiushi.org/~wac/yaskkserv/yaskkserv-1.1.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e12d48f0127bc7092bc81cb5afc01da
+_md5_=ff9aadd89bd0edbc504606fc3d03e3d6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 576723ce44bf..c628904d1d83 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/evemu-2.6.0 b/metadata/md5-cache/app-misc/evemu-2.6.0
deleted file mode 100644
index 929230196c9f..000000000000
--- a/metadata/md5-cache/app-misc/evemu-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=app-arch/xz-utils python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/libevdev-1.2.99.902
-DESCRIPTION=tools and bindings for kernel evdev device emulation, data capture, and replay
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/libevdev-1.2.99.902
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/evemu/evemu-2.6.0.tar.xz
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a35392370840d88f9df525599d4c389c
diff --git a/metadata/md5-cache/app-misc/golly-3.3-r3 b/metadata/md5-cache/app-misc/golly-3.3-r3
index 75d92e343e3b..088b4a435d48 100644
--- a/metadata/md5-cache/app-misc/golly-3.3-r3
+++ b/metadata/md5-cache/app-misc/golly-3.3-r3
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+DEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
 EAPI=7
 HOMEPAGE=http://golly.sourceforge.net/
-IUSE=tiff python_single_target_python2_7 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=tiff python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[X,opengl,tiff?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-3.3-src.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18bb2b49cf4e90ce758b7485b436a3c7
+_md5_=161ad3627f7f66f66fe87f3dfd9aec05
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.6 b/metadata/md5-cache/app-misc/pax-utils-1.2.6
index 53d2d983b409..c537bdf9f703 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.6
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.6
@@ -1,5 +1,6 @@
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
+BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install setup test
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp )
 DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
@@ -10,5 +11,5 @@ RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.6.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.6.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=6b480f1441f54294dbfe572e40404481
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=af7c0e742f832060c1dc4d53e1b7125f
diff --git a/metadata/md5-cache/app-misc/tmux-3.1b b/metadata/md5-cache/app-misc/tmux-3.1b
index fd9fc32583eb..9aa156843a0c 100644
--- a/metadata/md5-cache/app-misc/tmux-3.1b
+++ b/metadata/md5-cache/app-misc/tmux-3.1b
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal multiplexer
 EAPI=7
 HOMEPAGE=https://tmux.github.io/
 IUSE=debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux
-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
 LICENSE=ISC
 RDEPEND=dev-libs/libevent:0= sys-libs/ncurses:0= utempter? ( sys-libs/libutempter ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
 SLOT=0
 SRC_URI=https://github.com/tmux/tmux/releases/download/3.1b/tmux-3.1b.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=50d4727ffcc09bbe506c22574d94aae5
+_md5_=c0b7957bcb03677a48efd7bb41d7e9fc
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 7251e61f1b0d..a1c118f9e08c 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/lyx-2.3.5.2 b/metadata/md5-cache/app-office/lyx-2.3.5.2
index 47cb8bef0166..10925fc793c5 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.5.2
+++ b/metadata/md5-cache/app-office/lyx-2.3.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:0 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig dev-qt/qtconcurrent:5 nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:0 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig dev-qt/qtconcurrent:5 nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=6
 HOMEPAGE=https://www.lyx.org/
-IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:0 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:0 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.5.2.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.5.2/lyx-2.3.5.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	font	dd073b36fe3fd8b868c23bc23209db45	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc4b336ab5c64213c24bb815084411b9
+_md5_=b60795c33d563bb675dd3c0046507955
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 14792dcc153a..7e1adac18650 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-1 b/metadata/md5-cache/app-portage/cpuid2cpuflags-1
deleted file mode 100644
index 5e1d3b2c180d..000000000000
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo
-EAPI=5
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v1/cpuinfo2cpuflags-1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0190365a84c7a5fa2750e9e69a087737
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-9 b/metadata/md5-cache/app-portage/cpuid2cpuflags-9
deleted file mode 100644
index fdfb206fd82f..000000000000
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Tool to guess CPU_FLAGS_* flags for the host
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v9/cpuid2cpuflags-9.tar.bz2
-_md5_=df43436e03d71d7483cd4aaa09ba7fe7
diff --git a/metadata/md5-cache/app-portage/eix-0.34.4 b/metadata/md5-cache/app-portage/eix-0.34.4
index 30253801c6ca..65cfaf50ed63 100644
--- a/metadata/md5-cache/app-portage/eix-0.34.4
+++ b/metadata/md5-cache/app-portage/eix-0.34.4
@@ -5,10 +5,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.34.4/eix-0.34.4.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c9b9fe10cf9dc30f56171347ca093fd
+_md5_=bf6b7532895a75bcf31708fd7a29ecc7
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.9-r1 b/metadata/md5-cache/app-portage/elogviewer-2.9-r1
deleted file mode 100644
index 0fba315c6e93..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=+python_single_target_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4821eea0b6393ae04209ade90eef260
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.0-r2 b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
index d3187232a1ea..8cb56cc608e6 100644
--- a/metadata/md5-cache/app-portage/elogviewer-3.0-r2
+++ b/metadata/md5-cache/app-portage/elogviewer-3.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 SLOT=0
 SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c31a6fe2d837b01b706e3bedc735807b
+_md5_=55c6679312cd056588258e2750cebf93
diff --git a/metadata/md5-cache/app-portage/hackport-0.6.6 b/metadata/md5-cache/app-portage/hackport-0.6.6
new file mode 100644
index 000000000000..ea0c00822304
--- /dev/null
+++ b/metadata/md5-cache/app-portage/hackport-0.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/base64-bytestring-1.0:= >=dev-haskell/cryptohash-sha256-0.11:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= >=dev-haskell/lukko-0.1:= >=dev-haskell/mtl-2.1:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= >=dev-haskell/old-locale-1.0:= >=dev-haskell/parsec-3.1.13:= >=dev-haskell/random-1.0:= dev-haskell/split:= >=dev-haskell/stm-2.0:= >=dev-haskell/tar-0.5:= >=dev-haskell/text-1.2.3.0:= >=dev-haskell/xml-1.3.7:= >=dev-haskell/zlib-0.5.3:= >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/doctest-0.8 >=dev-haskell/hspec-2.0 >=dev-haskell/quickcheck-2.0 )
+DESCRIPTION=Hackage and Portage integration tool
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/hackport
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-portage/repoman >=dev-haskell/async-2.0:= >=dev-haskell/base16-bytestring-0.1.1:= >=dev-haskell/base64-bytestring-1.0:= >=dev-haskell/cryptohash-sha256-0.11:= dev-haskell/ed25519:= dev-haskell/extensible-exceptions:= >=dev-haskell/hashable-1.0:= >=dev-haskell/http-4000.1.5:= >=dev-haskell/lukko-0.1:= >=dev-haskell/mtl-2.1:= >=dev-haskell/network-2.6:= >=dev-haskell/network-uri-2.6:= >=dev-haskell/old-locale-1.0:= >=dev-haskell/parsec-3.1.13:= >=dev-haskell/random-1.0:= dev-haskell/split:= >=dev-haskell/stm-2.0:= >=dev-haskell/tar-0.5:= >=dev-haskell/text-1.2.3.0:= >=dev-haskell/xml-1.3.7:= >=dev-haskell/zlib-0.5.3:= >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/hackport-0.6.6/hackport-0.6.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=80449fcb84d445ea5a4926413dcbee04
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index b572eda15471..6c1490784580 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/fish-3.0.2 b/metadata/md5-cache/app-shells/fish-3.0.2
index b0aeed23b316..aa9f927689ed 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.2
+++ b/metadata/md5-cache/app-shells/fish-3.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Friendly Interactive SHell
 EAPI=7
 HOMEPAGE=http://fishshell.com/
 IUSE=doc nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d35eb125d3933d6fd1e5ffe7eebab157
+_md5_=cb0effc9499e6829497dcf4192f1c2ed
diff --git a/metadata/md5-cache/app-shells/posh-0.14.1 b/metadata/md5-cache/app-shells/posh-0.14.1
index 518848e8c46c..b07ed79af406 100644
--- a/metadata/md5-cache/app-shells/posh-0.14.1
+++ b/metadata/md5-cache/app-shells/posh-0.14.1
@@ -4,9 +4,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Reimplementation of Bourne shell based on pdksh
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/clint/posh
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2+ BSD public-domain
 SLOT=0
 SRC_URI=https://salsa.debian.org/clint/posh/-/archive/debian/0.14.1/posh-debian-0.14.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03bdc686181bbb1a9ca7e65673374fc9
+_md5_=5bc3e57da440121b742b6c0b4c6d6f29
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a571db99341d..d623cf52e7b5 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/kchmviewer-7.7-r1 b/metadata/md5-cache/app-text/kchmviewer-7.7-r1
index c22bbd861400..48d0fccc7267 100644
--- a/metadata/md5-cache/app-text/kchmviewer-7.7-r1
+++ b/metadata/md5-cache/app-text/kchmviewer-7.7-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Feature rich chm file viewer, based on Qt
 EAPI=7
 HOMEPAGE=https://www.ulduzsoft.com/kchmviewer/
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-7.7.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8d6be25119d0d73e858718b8855cfad
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c62357ae08f7ee3b39d7ec922f2af58
diff --git a/metadata/md5-cache/app-text/pandoc-2.9.2.1 b/metadata/md5-cache/app-text/pandoc-2.9.2.1
new file mode 100644
index 000000000000..bd7f6593516e
--- /dev/null
+++ b/metadata/md5-cache/app-text/pandoc-2.9.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] >=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?] >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?] >=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?] >=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] >=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] ) >=dev-haskell/cabal-2.0 test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between markup formats
+EAPI=7
+HOMEPAGE=https://pandoc.org
+IUSE=embed-data-files optimize static trypandoc doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] >=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] >=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?] >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?] >=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?] >=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?] >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?] >=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?] >=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?] >=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?] >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?] >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] )
+RESTRICT=test
+SLOT=0/2.9.2.1
+SRC_URI=https://hackage.haskell.org/package/pandoc-2.9.2.1/pandoc-2.9.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bb5336639ac3e4582f53ebc476a3a883
diff --git a/metadata/md5-cache/app-text/po4a-0.47-r1 b/metadata/md5-cache/app-text/po4a-0.47-r1
deleted file mode 100644
index 4327c954afd4..000000000000
--- a/metadata/md5-cache/app-text/po4a-0.47-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/tex-base ) dev-lang/perl
-DESCRIPTION=Tools for helping translation of documentation
-EAPI=6
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N sys-devel/gettext dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a746871fa218f370f5580c6e33acfaf2
diff --git a/metadata/md5-cache/app-text/po4a-0.60 b/metadata/md5-cache/app-text/po4a-0.60
new file mode 100644
index 000000000000..2f66981d1c72
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.60
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=7
+HOMEPAGE=https://po4a.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.60/po4a-0.60.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=9c7a7cce34d2af86b87062cd46404a26
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
index 3b9ed74d8e0d..5614bbdcc89e 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
@@ -5,7 +5,7 @@ DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/podofo/
 IUSE=+boost idn libressl debug test +tools
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 REQUIRED_USE=test? ( tools )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ebe83c5363b318e5b1e5efb2c6521a6
+_md5_=cc283af57e54992d50bbabace5b8d720
diff --git a/metadata/md5-cache/app-text/q-text-as-data-2.0.10 b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
index e22b33b95ce7..f8bac26c5e93 100644
--- a/metadata/md5-cache/app-text/q-text-as-data-2.0.10
+++ b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
 EAPI=7
 HOMEPAGE=http://harelba.github.io/q/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/harelba/q/archive/2.0.10.tar.gz -> q-2.0.10.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4728534a04a792911e84c3dce6a6d20c
+_md5_=2fe087e812a5b61398bf733d79f55f77
diff --git a/metadata/md5-cache/app-text/sword-modules-1-r3 b/metadata/md5-cache/app-text/sword-modules-1-r3
deleted file mode 100644
index d61912ab4dba..000000000000
--- a/metadata/md5-cache/app-text/sword-modules-1-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A collection of modules for the SWORD project
-EAPI=7
-HOMEPAGE=https://www.crosswire.org/sword/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=metapackage
-RDEPEND=app-dicts/sword-Abbott app-dicts/sword-ACV app-dicts/sword-Afr1953 app-dicts/sword-AKJV app-dicts/sword-Alb app-dicts/sword-Aleppo app-dicts/sword-AmTract app-dicts/sword-AraSVD app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern app-dicts/sword-ASV app-dicts/sword-Barnes app-dicts/sword-BasHautin app-dicts/sword-BBE app-dicts/sword-BulVeren app-dicts/sword-BurJudson app-dicts/sword-Byz app-dicts/sword-CBC app-dicts/sword-Chamorro app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-CroSaric app-dicts/sword-CzeBKR app-dicts/sword-DaOT1931NT1907 app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-Diaglott app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-DutKant app-dicts/sword-DutSVV app-dicts/sword-Easton app-dicts/sword-Esperanto app-dicts/sword-FarOPV app-dicts/sword-FinBiblia app-dicts/sword-Finney app-dicts/sword-FinPR app-dicts/sword-FreBBB app-dicts/sword-FreBDM1744 app-dicts/sword-FreCrampon app-dicts/sword-FreSegond1910 app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerLut1545 app-dicts/sword-GerSch app-dicts/sword-GreekHebrew app-dicts/sword-HebrewGreek app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-HunKar app-dicts/sword-Institutes app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-ItaDio app-dicts/sword-ItaRive app-dicts/sword-JFB app-dicts/sword-Josephus app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Jubilee2000 app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en app-dicts/sword-Lightfoot app-dicts/sword-LITV app-dicts/sword-Luther app-dicts/sword-MAK app-dicts/sword-ManxGaelic app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-Nave app-dicts/sword-Norsk app-dicts/sword-Orthodoxy app-dicts/sword-Packard app-dicts/sword-Personal app-dicts/sword-Peshitta app-dicts/sword-Pilgrim app-dicts/sword-PNT app-dicts/sword-Practice app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RWebster app-dicts/sword-RWP app-dicts/sword-SAOA app-dicts/sword-Scofield app-dicts/sword-ScotsGaelic app-dicts/sword-SME app-dicts/sword-Smith app-dicts/sword-SpaRV app-dicts/sword-SpaRVG app-dicts/sword-SpaVNT app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-Swahili app-dicts/sword-Tagalog app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-Tisch app-dicts/sword-Torrey app-dicts/sword-TR app-dicts/sword-TSK app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Ukrainian app-dicts/sword-Uma app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-Webster app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Weymouth app-dicts/sword-WHNU app-dicts/sword-WLC app-dicts/sword-Wulfila app-dicts/sword-Wycliffe app-dicts/sword-YLT
-SLOT=0
-_md5_=b1b58023aaa3d32ddcd264fe955ea907
diff --git a/metadata/md5-cache/app-text/sword-modules-2 b/metadata/md5-cache/app-text/sword-modules-2
new file mode 100644
index 000000000000..b5dfe751b80d
--- /dev/null
+++ b/metadata/md5-cache/app-text/sword-modules-2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=All the unlocked modules for app-text/sword, grouped by language
+EAPI=7
+HOMEPAGE=https://www.crosswire.org/sword/modules/
+IUSE=-esoteric l10n_af l10n_ar l10n_az l10n_be l10n_bea l10n_bg l10n_bla l10n_br l10n_ch l10n_chr l10n_ckb l10n_cop l10n_cs l10n_cu l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gd l10n_gez l10n_got l10n_grc l10n_gv l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_it l10n_ja l10n_kek l10n_kk l10n_km l10n_ko l10n_kpg l10n_ktu l10n_la l10n_ln l10n_lt l10n_lv l10n_mg l10n_mi l10n_ml l10n_mn l10n_my l10n_nb l10n_nd l10n_nl l10n_nn l10n_pl l10n_pon l10n_pot l10n_ppk l10n_prs l10n_pt l10n_rmq l10n_ro l10n_ru l10n_sl l10n_sml l10n_sn l10n_so l10n_sq l10n_sr l10n_sv l10n_sw l10n_syr l10n_th l10n_tl l10n_tlh l10n_tr l10n_tsg l10n_ug l10n_uk l10n_ur l10n_vi l10n_vls l10n_zh
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=metapackage
+RDEPEND=|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs ) app-dicts/sword-Personal esoteric? ( app-dicts/sword-Phaistos app-dicts/sword-Sentiment ) l10n_af? ( app-dicts/sword-Afr1953 ) l10n_ar? ( app-dicts/sword-AraNAV app-dicts/sword-AraSVD app-dicts/sword-alzat ) l10n_az? ( app-dicts/sword-Azeri app-dicts/sword-NorthernAzeri ) l10n_be? ( app-dicts/sword-Bela ) l10n_bea? ( app-dicts/sword-BeaMRK ) l10n_bg? ( app-dicts/sword-BulVeren ) l10n_bla? ( app-dicts/sword-BlaMat ) l10n_br? ( app-dicts/sword-BretonNT app-dicts/sword-br_en ) l10n_ch? ( app-dicts/sword-Chamorro ) l10n_chr? ( app-dicts/sword-Che1860 ) l10n_ckb? ( app-dicts/sword-Sorani ) l10n_cop? ( app-dicts/sword-CopNT app-dicts/sword-CopSahBible2 app-dicts/sword-CopSahHorner app-dicts/sword-CopSahidicMSS app-dicts/sword-CopSahidica app-dicts/sword-SahidicBible ) l10n_cs? ( app-dicts/sword-CzeB21 app-dicts/sword-CzeBKR app-dicts/sword-CzeCEP app-dicts/sword-CzeCSP ) l10n_cu? ( app-dicts/sword-CSlElizabeth ) l10n_cy? ( app-dicts/sword-WelBeiblNet ) l10n_da? ( app-dicts/sword-DaNT1819 app-dicts/sword-DaOT1871NT1907 app-dicts/sword-DaOT1931NT1907 ) l10n_de? ( app-dicts/sword-GerAlbrecht app-dicts/sword-GerAugustinus app-dicts/sword-GerElb1871 app-dicts/sword-GerElb1905 app-dicts/sword-GerGruenewald app-dicts/sword-GerHfa2002 app-dicts/sword-GerHfaLex2002 app-dicts/sword-GerLeoNA28 app-dicts/sword-GerLeoRP18 app-dicts/sword-GerLut1545 app-dicts/sword-GerLutherpredigten app-dicts/sword-GerNeUe app-dicts/sword-GerReinhardt app-dicts/sword-GerSch app-dicts/sword-GerTafel app-dicts/sword-GerTextbibel app-dicts/sword-MAK app-dicts/sword-Rieger ) l10n_el? ( app-dicts/sword-GreVamvas ) l10n_en? ( app-dicts/sword-2BabDict app-dicts/sword-AB app-dicts/sword-ABP app-dicts/sword-ABS_Essay_GoodSam_SWB app-dicts/sword-ACV app-dicts/sword-AKJV app-dicts/sword-ASV app-dicts/sword-Abbott app-dicts/sword-AbbottSmith app-dicts/sword-AbbottSmithStrongs app-dicts/sword-AmTract app-dicts/sword-Anderson app-dicts/sword-BBE app-dicts/sword-BDBGlosses_Strongs app-dicts/sword-BWE app-dicts/sword-BaptistConfession1689 app-dicts/sword-Barnes app-dicts/sword-Burkitt app-dicts/sword-CBC app-dicts/sword-CPDV app-dicts/sword-Catena app-dicts/sword-Cawdrey app-dicts/sword-Clarke app-dicts/sword-Common app-dicts/sword-Concord app-dicts/sword-DBD app-dicts/sword-DRC app-dicts/sword-DTN app-dicts/sword-Daily app-dicts/sword-Darby app-dicts/sword-DarkNightOfTheSoul app-dicts/sword-Diaglott app-dicts/sword-Dodson app-dicts/sword-EMBReality app-dicts/sword-EMTV app-dicts/sword-Easton app-dicts/sword-Etheridge app-dicts/sword-Family app-dicts/sword-Finney app-dicts/sword-Geneva app-dicts/sword-Geneva1599 app-dicts/sword-Godbey app-dicts/sword-GodsWord app-dicts/sword-Heretics app-dicts/sword-Hitchcock app-dicts/sword-ISBE app-dicts/sword-ISV app-dicts/sword-Imitation app-dicts/sword-Institutes app-dicts/sword-JCRHoliness app-dicts/sword-JEAffections app-dicts/sword-JESermons app-dicts/sword-JFB app-dicts/sword-JOChrist app-dicts/sword-JOCommGod app-dicts/sword-JOGlory app-dicts/sword-JOMortSin app-dicts/sword-JPS app-dicts/sword-JST app-dicts/sword-Josephus app-dicts/sword-Jubilee2000 app-dicts/sword-KD app-dicts/sword-KJV app-dicts/sword-KJVA app-dicts/sword-KJVPCE app-dicts/sword-LEB app-dicts/sword-LITV app-dicts/sword-LO app-dicts/sword-LawGospel app-dicts/sword-Leeser app-dicts/sword-Lightfoot app-dicts/sword-Luther app-dicts/sword-MHC app-dicts/sword-MHCC app-dicts/sword-MKJV app-dicts/sword-MLStrong app-dicts/sword-MollColossians app-dicts/sword-Montgomery app-dicts/sword-Murdock app-dicts/sword-NETfree app-dicts/sword-NETnotesfree app-dicts/sword-NETtext app-dicts/sword-NHEB app-dicts/sword-NHEBJE app-dicts/sword-NHEBME app-dicts/sword-Nave app-dicts/sword-Noyes app-dicts/sword-OEB app-dicts/sword-OEBcth app-dicts/sword-OSHM app-dicts/sword-OrthJBC app-dicts/sword-Orthodoxy app-dicts/sword-PNT app-dicts/sword-Packard app-dicts/sword-Passion app-dicts/sword-Pilgrim app-dicts/sword-Practice app-dicts/sword-QuotingPassages app-dicts/sword-RKJNT app-dicts/sword-RNKJV app-dicts/sword-RWP app-dicts/sword-RWebster app-dicts/sword-RecVer app-dicts/sword-Robinson app-dicts/sword-Rotherham app-dicts/sword-SAOA app-dicts/sword-SME app-dicts/sword-SPE app-dicts/sword-Scofield app-dicts/sword-Smith app-dicts/sword-Spurious app-dicts/sword-StrongsGreek app-dicts/sword-StrongsHebrew app-dicts/sword-TCR app-dicts/sword-TDavid app-dicts/sword-TFG app-dicts/sword-TSK app-dicts/sword-Torrey app-dicts/sword-Twenty app-dicts/sword-Tyndale app-dicts/sword-UKJV app-dicts/sword-Webster app-dicts/sword-Webster1806 app-dicts/sword-Webster1913 app-dicts/sword-Wesley app-dicts/sword-Westminster app-dicts/sword-Westminster21 app-dicts/sword-Weymouth app-dicts/sword-Worsley app-dicts/sword-Wycliffe app-dicts/sword-YLT ) l10n_eo? ( app-dicts/sword-Esperanto ) l10n_es? ( app-dicts/sword-SpaRV app-dicts/sword-SpaRV1865 app-dicts/sword-SpaRV1909 app-dicts/sword-SpaRVG app-dicts/sword-SpaTDP app-dicts/sword-SpaVNT ) l10n_et? ( app-dicts/sword-Est ) l10n_eu? ( app-dicts/sword-BasHautin app-dicts/sword-en_eu ) l10n_fa? ( app-dicts/sword-FarHezareNoh app-dicts/sword-FarOPV app-dicts/sword-FarTPV ) l10n_fi? ( app-dicts/sword-FinBiblia app-dicts/sword-FinPR app-dicts/sword-FinPR92 app-dicts/sword-FinRK app-dicts/sword-FinSTLK2017 ) l10n_fr? ( app-dicts/sword-FreBBB app-dicts/sword-FreBDM1707 app-dicts/sword-FreBDM1744 app-dicts/sword-FreBailly app-dicts/sword-FreCJE app-dicts/sword-FreCrampon app-dicts/sword-FreDAW app-dicts/sword-FreGBM app-dicts/sword-FreGeneve1669 app-dicts/sword-FreJND app-dicts/sword-FreKhan app-dicts/sword-FreLSN1872 app-dicts/sword-FreLXX app-dicts/sword-FreOltramare1874 app-dicts/sword-FrePGR app-dicts/sword-FrePilgrim app-dicts/sword-FreSegond1910 app-dicts/sword-FreStapfer1889 app-dicts/sword-FreSynodale1921 ) l10n_ga? ( app-dicts/sword-IriODomhnuill ) l10n_gd? ( app-dicts/sword-ScotsGaelic ) l10n_gez? ( app-dicts/sword-Geez ) l10n_got? ( app-dicts/sword-Wulfila ) l10n_grc? ( app-dicts/sword-ABPGRK app-dicts/sword-Antoniades app-dicts/sword-Byz app-dicts/sword-Elzevir app-dicts/sword-GreekHebrew app-dicts/sword-LXX app-dicts/sword-MorphGNT app-dicts/sword-Nestle1904 app-dicts/sword-OxfordTR app-dicts/sword-SBLGNT app-dicts/sword-SBLGNTApp app-dicts/sword-TNT app-dicts/sword-TR app-dicts/sword-Tisch app-dicts/sword-VarApp app-dicts/sword-WHNU app-dicts/sword-f35 ) l10n_gv? ( app-dicts/sword-ManxGaelic ) l10n_he? ( app-dicts/sword-Aleppo app-dicts/sword-HebDelitzsch app-dicts/sword-HebModern app-dicts/sword-HebrewGreek app-dicts/sword-MapM app-dicts/sword-OSHB app-dicts/sword-SP app-dicts/sword-SPDSS app-dicts/sword-SPMT app-dicts/sword-SPVar app-dicts/sword-WLC ) l10n_hi? ( app-dicts/sword-HinERV ) l10n_hr? ( app-dicts/sword-CroSaric ) l10n_ht? ( app-dicts/sword-Haitian ) l10n_hu? ( app-dicts/sword-HunKar app-dicts/sword-HunUj ) l10n_hy? ( app-dicts/sword-ArmEastern app-dicts/sword-ArmWestern ) l10n_it? ( app-dicts/sword-ItDizGreco app-dicts/sword-ItNomiBibbia app-dicts/sword-ItaDio app-dicts/sword-ItaRive ) l10n_ja? ( app-dicts/sword-JapBungo app-dicts/sword-JapDenmo app-dicts/sword-JapKougo app-dicts/sword-JapMeiji app-dicts/sword-JapRaguet ) l10n_kek? ( app-dicts/sword-Kekchi ) l10n_kk? ( app-dicts/sword-Kaz ) l10n_km? ( app-dicts/sword-KhmerNT ) l10n_ko? ( app-dicts/sword-KorHKJV app-dicts/sword-KorRV ) l10n_kpg? ( app-dicts/sword-Kapingamarangi ) l10n_ktu? ( app-dicts/sword-KtuVb ) l10n_la? ( app-dicts/sword-VulgClementine app-dicts/sword-VulgConte app-dicts/sword-VulgGlossa app-dicts/sword-VulgHetzenauer app-dicts/sword-VulgSistine app-dicts/sword-Vulgate app-dicts/sword-Vulgate_HebPs app-dicts/sword-la_en ) l10n_ln? ( app-dicts/sword-LinVB ) l10n_lt? ( app-dicts/sword-LtKBB ) l10n_lv? ( app-dicts/sword-Latvian app-dicts/sword-LvGluck8 ) l10n_mg? ( app-dicts/sword-Mg1865 ) l10n_mi? ( app-dicts/sword-Maori ) l10n_ml? ( app-dicts/sword-Mal1910 ) l10n_mn? ( app-dicts/sword-MonKJV ) l10n_my? ( app-dicts/sword-BurCBCM app-dicts/sword-BurJudson ) l10n_nb? ( app-dicts/sword-NorBroed app-dicts/sword-Norsk ) l10n_nd? ( app-dicts/sword-Ndebele ) l10n_nl? ( app-dicts/sword-DutKant app-dicts/sword-DutSVV app-dicts/sword-NlCanisius1939 ) l10n_nn? ( app-dicts/sword-NorSMB ) l10n_pl? ( app-dicts/sword-PolGdanska app-dicts/sword-PolUGdanska ) l10n_pon? ( app-dicts/sword-PohnOld app-dicts/sword-Pohnpeian ) l10n_pot? ( app-dicts/sword-PotLykins ) l10n_ppk? ( app-dicts/sword-Uma ) l10n_prs? ( app-dicts/sword-Dari ) l10n_pt? ( app-dicts/sword-PorAR app-dicts/sword-PorAlmeida1911 app-dicts/sword-PorBLivre app-dicts/sword-PorBLivreTR app-dicts/sword-PorCap app-dicts/sword-PorIBP ) l10n_rmq? ( app-dicts/sword-Calo ) l10n_ro? ( app-dicts/sword-RomCor ) l10n_ru? ( app-dicts/sword-RusCARS app-dicts/sword-RusCARSA app-dicts/sword-RusCARSADICT app-dicts/sword-RusCARSDict app-dicts/sword-RusCARST app-dicts/sword-RusCARSTDICT app-dicts/sword-RusMakarij app-dicts/sword-RusSynodal app-dicts/sword-RusSynodalLIO app-dicts/sword-RusVZh ) l10n_sl? ( app-dicts/sword-SloKJV app-dicts/sword-SloKJVA app-dicts/sword-SloOjacano app-dicts/sword-SloStritar ) l10n_sml? ( app-dicts/sword-sml_BL_2008 ) l10n_sn? ( app-dicts/sword-Shona ) l10n_so? ( app-dicts/sword-SomKQA ) l10n_sq? ( app-dicts/sword-Alb ) l10n_sr? ( app-dicts/sword-SrKDEkavski app-dicts/sword-SrKDIjekav ) l10n_sv? ( app-dicts/sword-Swe1917 app-dicts/sword-Swe1917Of app-dicts/sword-SweFolk1998 app-dicts/sword-SweKarlXII app-dicts/sword-SweKarlXII1873 ) l10n_sw? ( app-dicts/sword-Swahili ) l10n_syr? ( app-dicts/sword-Peshitta ) l10n_th? ( app-dicts/sword-ThaiKJV ) l10n_tl? ( app-dicts/sword-TagAngBiblia app-dicts/sword-Tagalog ) l10n_tlh? ( app-dicts/sword-KLV app-dicts/sword-KLVen_iklingon app-dicts/sword-KLViklingon_en ) l10n_tr? ( app-dicts/sword-TurHADI app-dicts/sword-TurNTB ) l10n_tsg? ( app-dicts/sword-Tausug ) l10n_ug? ( app-dicts/sword-UyCyr ) l10n_uk? ( app-dicts/sword-UkrKulish app-dicts/sword-Ukrainian ) l10n_ur? ( app-dicts/sword-UrduGeo app-dicts/sword-UrduGeoDeva app-dicts/sword-UrduGeoRoman ) l10n_vi? ( app-dicts/sword-FVDPVietAnh app-dicts/sword-Viet app-dicts/sword-VietLCCMN app-dicts/sword-VietLCCMNCT app-dicts/sword-VietNVB ) l10n_vls? ( app-dicts/sword-vlsJoNT ) l10n_zh? ( app-dicts/sword-ChiNCVs app-dicts/sword-ChiNCVt app-dicts/sword-ChiUn app-dicts/sword-ChiUnL app-dicts/sword-ChiUns app-dicts/sword-ZhEnglish app-dicts/sword-ZhHanzi app-dicts/sword-ZhPinyin )
+SLOT=0
+_md5_=a3830160218505ce9fd884bb27587441
diff --git a/metadata/md5-cache/app-text/texlive-core-2020-r6 b/metadata/md5-cache/app-text/texlive-core-2020-r6
new file mode 100644
index 000000000000..ec8d09c2b6fc
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2020-r6
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/xindy !~dev-texlive/texlive-basic-2019 !~dev-texlive/texlive-fontutils-2019 sys-libs/zlib >=media-libs/harfbuzz-1.4.5[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=app-text/teckit-2.5.3 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.2 cjk? ( >=dev-libs/ptexenc-1.3.8 ) >=app-text/poppler-0.87.0:=
+DESCRIPTION=A complete TeX distribution
+EAPI=7
+HOMEPAGE=https://tug.org/texlive/
+IUSE=cjk X doc source tk +luajittex xetex xindy
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~sparc64-solaris
+LICENSE=GPL-2 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/xindy !~dev-texlive/texlive-basic-2019 !~dev-texlive/texlive-fontutils-2019 sys-libs/zlib >=media-libs/harfbuzz-1.4.5[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=app-text/teckit-2.5.3 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.2 cjk? ( >=dev-libs/ptexenc-1.3.8 ) >=app-text/poppler-0.87.0:= >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( dev-perl/Tk )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20200406-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-core-patches-2020-5.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-base-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflua-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-binextra-2020.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex.doc-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen.doc-2020.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.source-2020.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.source-2020.tar.xz )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	texlive-common	0eca2ea110130453e0124f83ce50c408	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2f3199bf7b352f15f78406f878f8ef6
diff --git a/metadata/md5-cache/app-text/xmldiff-1.1.1 b/metadata/md5-cache/app-text/xmldiff-1.1.1
deleted file mode 100644
index 8f8172773ff5..000000000000
--- a/metadata/md5-cache/app-text/xmldiff-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=A tool that figures out the differences between two similar XML files
-EAPI=6
-HOMEPAGE=https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/future dev-python/lxml dev-python/six python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/Shoobx/xmldiff/archive/1.1.1.tar.gz -> xmldiff-1.1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7037ec509e0b75621b866cddea42a0e6
diff --git a/metadata/md5-cache/app-text/xmldiff-2.3 b/metadata/md5-cache/app-text/xmldiff-2.3
index 18295cdd96ce..5dc146ce1dea 100644
--- a/metadata/md5-cache/app-text/xmldiff-2.3
+++ b/metadata/md5-cache/app-text/xmldiff-2.3
@@ -4,7 +4,7 @@ DESCRIPTION=A tool that figures out the differences between two similar XML file
 EAPI=7
 HOMEPAGE=https://github.com/Shoobx/xmldiff
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Shoobx/xmldiff/archive/2.3.tar.gz -> xmldiff-2.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=07a6b075c2e2c80699ba74e0ef5ae597
+_md5_=9fca32f7b0a2a62e0faccf3f71f56b9b
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 494312dfbdda..385001d980cd 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/aunit-2020 b/metadata/md5-cache/dev-ada/aunit-2020
index 53d67a099734..fe648dae909d 100644
--- a/metadata/md5-cache/dev-ada/aunit-2020
+++ b/metadata/md5-cache/dev-ada/aunit-2020
@@ -4,11 +4,11 @@ DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
 IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=aunit-2020-20200429-19B6C-src}.tar.gz -> aunit-2020-20200429-19B6C-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=296c13a484f6ea8928ca7674ce0b7ea1
+_md5_=e0fc52ede127be02ac8ed36b96055274
diff --git a/metadata/md5-cache/dev-ada/aws-2020 b/metadata/md5-cache/dev-ada/aws-2020
index 65db32133ea3..e94e6e5b1e8f 100644
--- a/metadata/md5-cache/dev-ada/aws-2020
+++ b/metadata/md5-cache/dev-ada/aws-2020
@@ -4,11 +4,11 @@ DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
 IUSE=ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2018
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),shared,static-libs]
 REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=aws-2020-20200429-19A9F-src.tar.gz -> aws-2020-20200429-19A9F-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=415bef59b03759c149e9840f8b44f4f7
+_md5_=97d4f805de7244a99d45a8666896e5db
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
index 40bb8e5382d3..8cd8fa2e814b 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
@@ -4,11 +4,11 @@ DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
 IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c08e2527e62d8af90029bf29a31c61d
+_md5_=82059002a5dd366981df43db5a523ef3
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2020 b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
index 98da91a44771..7608db0454b8 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
@@ -4,11 +4,11 @@ DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
 IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?]
 REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=gnatcoll-core-2020-20200429-19B7C-src.tar.gz -> gnatcoll-core-2020-20200429-19B7C-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=489051bb891ac7e6b9933340ca0b73dc
+_md5_=c335a9becbd4c096e533c88180181e70
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2020 b/metadata/md5-cache/dev-ada/gprbuild-2020
index d6eaf9a1292e..995534ece856 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2020
+++ b/metadata/md5-cache/dev-ada/gprbuild-2020
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-Language Management
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f1a0fa9eb2f687a25b66cd1bb0e0749e
+_md5_=d2491177b684d08f6b0dd34d73a9f820
diff --git a/metadata/md5-cache/dev-ada/libgpr-2020 b/metadata/md5-cache/dev-ada/libgpr-2020
index 8f75f6811a0e..6a34979dc52a 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2020
+++ b/metadata/md5-cache/dev-ada/libgpr-2020
@@ -4,11 +4,11 @@ DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?] !net-libs/grpc
 REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c848ec462f8ec3fb5e7b4ec6b3625fe5
+_md5_=6e670f7a02d601778ff5497ceb06d3ab
diff --git a/metadata/md5-cache/dev-ada/xmlada-2020 b/metadata/md5-cache/dev-ada/xmlada-2020
index 633bad85e407..3096c878b4a3 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2020
+++ b/metadata/md5-cache/dev-ada/xmlada-2020
@@ -4,11 +4,11 @@ DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
 _eclasses_=ada	2e62916779222e4f23755b01896c54af	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=4525a5bfd154a64818ac81e57d2eba5f
+_md5_=d20c3a995dcacfaec60a4bf8e3bbb9a8
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7bcc4a9b2912..3d6f0043fbfd 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/redis-5.0.9-r1 b/metadata/md5-cache/dev-db/redis-5.0.9-r1
index 40ee123d6548..cbd3f65a0713 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.9-r1
+++ b/metadata/md5-cache/dev-db/redis-5.0.9-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=~amd64 arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 arm ~arm64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) acct-group/redis acct-user/redis
 REQUIRED_USE=?? ( tcmalloc jemalloc )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ef717d64560768ddec5d2af2f264ecd
+_md5_=b0029f8bc0ac5a77bfb69db91898ff02
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 778f3c05796d..fbde0b5c50d9 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/adjunctions-4.4 b/metadata/md5-cache/dev-haskell/adjunctions-4.4
new file mode 100644
index 000000000000..41d081c286e2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/adjunctions-4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Adjunctions and representable functors
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/adjunctions/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/4.4
+SRC_URI=https://hackage.haskell.org/package/adjunctions-4.4/adjunctions-4.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df8dae79fdb38b2ace61255ff7293263
diff --git a/metadata/md5-cache/dev-haskell/aeson-1.4.7.1 b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
new file mode 100644
index 000000000000..0494a2c64a29
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aeson-1.4.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-compat >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9 dev-haskell/base16-bytestring >=dev-haskell/diff-0.4 <dev-haskell/diff-0.5 >=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.14 >=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3 >=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1 >=dev-haskell/quickcheck-2.10.0.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast JSON parsing and encoding
+EAPI=7
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=cffi fast doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?] >=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.4.7.1
+SRC_URI=https://hackage.haskell.org/package/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=df4de5d274c11c1868d600921dd7e019
diff --git a/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2 b/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
new file mode 100644
index 000000000000..600cd68e7c30
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.9 >=dev-haskell/quickcheck-2.10 >=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compatibility layer for aeson
+EAPI=7
+HOMEPAGE=https://github.com/phadej/aeson-compat#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.6.0:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.9
+SRC_URI=https://hackage.haskell.org/package/aeson-compat-0.3.9/aeson-compat-0.3.9.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8cf4c07d5e3f021658bce38d859d6553
diff --git a/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8 b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
new file mode 100644
index 000000000000..5efdaff0e958
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/doctest-0.9 dev-haskell/glob dev-haskell/hlint dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extract and apply patches to JSON documents
+EAPI=7
+HOMEPAGE=https://github.com/thsutton/aeson-diff
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/edit-distance-vector:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/optparse-applicative:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=test
+SLOT=0/1.1.0.8
+SRC_URI=https://hackage.haskell.org/package/aeson-diff-1.1.0.8/aeson-diff-1.1.0.8.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=45fcab3f6e5de4d2c75679bac6aedc84
diff --git a/metadata/md5-cache/dev-haskell/alex-3.2.5 b/metadata/md5-cache/dev-haskell/alex-3.2.5
new file mode 100644
index 000000000000..0aab92b2e376
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/alex-3.2.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )
+DESCRIPTION=Alex is a tool for generating lexical analysers in Haskell
+EAPI=7
+HOMEPAGE=http://www.haskell.org/alex/
+IUSE=doc test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/alex-3.2.5/alex-3.2.5.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f445d71f91cf3cb22edce81b35154420
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
new file mode 100644
index 000000000000..00a416b05c20
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/colour-2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple ANSI terminal support, with Windows compatibility
+EAPI=7
+HOMEPAGE=https://github.com/feuerbach/ansi-terminal
+IUSE=example doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/colour-2.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.3
+SRC_URI=https://hackage.haskell.org/package/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=25585e0c26d6be3c5a4a5df525a412da
diff --git a/metadata/md5-cache/dev-haskell/async-2.2.2 b/metadata/md5-cache/dev-haskell/async-2.2.2
new file mode 100644
index 000000000000..627634d2804b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/async-2.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run IO operations asynchronously and wait for their results
+EAPI=7
+HOMEPAGE=https://github.com/simonmar/async
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.2.2
+SRC_URI=https://hackage.haskell.org/package/async-2.2.2/async-2.2.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6ef012fcba4180f4ce24a1065bcd3728
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1 b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
new file mode 100644
index 000000000000..594500bed7cb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing of ISO 8601 dates, originally from aeson
+EAPI=7
+HOMEPAGE=https://github.com/bos/aeson
+IUSE=developer fast doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.13.0.1:=[profile?] >=dev-haskell/base-compat-0.9.1:=[profile?] >=dev-haskell/text-1.1.1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.1.0
+SRC_URI=https://hackage.haskell.org/package/attoparsec-iso8601-1.0.1.0/attoparsec-iso8601-1.0.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cbf1eb9c75f5bea8759fe1f80832118a
diff --git a/metadata/md5-cache/dev-haskell/authenticate-1.3.5 b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
new file mode 100644
index 000000000000..8f453e15f8f7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/authenticate-1.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/html-conduit-1.3:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication methods for Haskell web applications
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/authenticate
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.5:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/conduit-0.5:=[profile?] >=dev-haskell/html-conduit-1.3:=[profile?] >=dev-haskell/http-conduit-1.5:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+SLOT=0/1.3.5
+SRC_URI=https://hackage.haskell.org/package/authenticate-1.3.5/authenticate-1.3.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=64bb724a95055cff04c19ce2f4431ba0
diff --git a/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1 b/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
new file mode 100644
index 000000000000..9dd235b6384d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?] >=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library to authenticate with OAuth for Haskell web applications
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/authenticate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/http-client-0.3:=[profile?] >=dev-haskell/http-types-0.6:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?] >=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.6.0.1
+SRC_URI=https://hackage.haskell.org/package/authenticate-oauth-1.6.0.1/authenticate-oauth-1.6.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4518c92e86c83de7944ca550700e714d
diff --git a/metadata/md5-cache/dev-haskell/aws-0.22-r1 b/metadata/md5-cache/dev-haskell/aws-0.22-r1
new file mode 100644
index 000000000000..5e674d6ec48e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/aws-0.22-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/aeson-0.7 >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7 >=dev-haskell/lifted-base-0.2 >=dev-haskell/mtl-2.1 >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-haskell/tasty-quickcheck-0.8 >=dev-haskell/text-1.1 >=dev-haskell/transformers-base-0.4 !examples? ( >=dev-haskell/errors-2.0 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Amazon Web Services (AWS) for Haskell
+EAPI=7
+HOMEPAGE=https://github.com/aristidb/aws
+IUSE=+network-3 examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?] >=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= examples? ( >=dev-haskell/errors-2.0:=[profile?] ) network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?] >=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
+RESTRICT=test
+SLOT=0/0.22
+SRC_URI=https://hackage.haskell.org/package/aws-0.22/aws-0.22.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=71201f1b01f2da3c5d45220ff40f5da7
diff --git a/metadata/md5-cache/dev-haskell/base-compat-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
new file mode 100644
index 000000000000..53bf25b8029c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A compatibility layer for base
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.1
+SRC_URI=https://hackage.haskell.org/package/base-compat-0.11.1/base-compat-0.11.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f083e672213baae1285a0c2d4b33b38
diff --git a/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1 b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
new file mode 100644
index 000000000000..4171c913c947
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=base-compat with extra batteries
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/base-compat-batteries
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/base-compat-0.11.1:=[profile?] >=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?] >=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.11.1
+SRC_URI=https://hackage.haskell.org/package/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=51075954b80c3fbd68f3a5f97da3b9c4
diff --git a/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0 b/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
new file mode 100644
index 000000000000..cd1fedbaaedb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-2.2.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION="base" package sans "Prelude" module
+EAPI=7
+HOMEPAGE=https://github.com/hvr/base-noprelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.8.1:=
+SLOT=0/4.13.0.0
+SRC_URI=https://hackage.haskell.org/package/base-noprelude-4.13.0.0/base-noprelude-4.13.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e4ac3ae3ce273ae4cc5e77551520395d
diff --git a/metadata/md5-cache/dev-haskell/base-orphans-0.8.2 b/metadata/md5-cache/dev-haskell/base-orphans-0.8.2
new file mode 100644
index 000000000000..09d18c8ca507
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-orphans-0.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backwards-compatible orphan instances for base
+EAPI=7
+HOMEPAGE=https://github.com/haskell-compat/base-orphans#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.8.2
+SRC_URI=https://hackage.haskell.org/package/base-orphans-0.8.2/base-orphans-0.8.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=382234f927d975e3161b194d834f9a3f
diff --git a/metadata/md5-cache/dev-haskell/base-prelude-1.3 b/metadata/md5-cache/dev-haskell/base-prelude-1.3
new file mode 100644
index 000000000000..7c5177fe4a3d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base-prelude-1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The most complete prelude formed solely from the \
+EAPI=6
+HOMEPAGE=https://github.com/nikita-volkov/base-prelude
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.6.1:=
+SLOT=0/1.3
+SRC_URI=https://hackage.haskell.org/package/base-prelude-1.3/base-prelude-1.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=29af84b9b9ff6c0f5aadcbbe70911f9e
diff --git a/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3 b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
new file mode 100644
index 000000000000..f16d2da91f50
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/split dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast base64 encoding and decoding for ByteStrings
+EAPI=7
+HOMEPAGE=https://github.com/haskell/base64-bytestring
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.3
+SRC_URI=https://hackage.haskell.org/package/base64-bytestring-1.0.0.3/base64-bytestring-1.0.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e53f6b838c5629c0c2f15bc96884f082
diff --git a/metadata/md5-cache/dev-haskell/bencode-0.6.1.1 b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
new file mode 100644
index 000000000000..2b6001335fce
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bencode-0.6.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser and printer for bencoded data
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/bencode
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/parsec:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.6.1.1
+SRC_URI=https://hackage.haskell.org/package/bencode-0.6.1.1/bencode-0.6.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0b07048f6b5f58a2296c1aafd54b873d
diff --git a/metadata/md5-cache/dev-haskell/bifunctors-5.5.6 b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
new file mode 100644
index 000000000000..6fcf72987081
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bifunctors-5.5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell98 bifunctors package
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/bifunctors/
+IUSE=+semigroups +tagged doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/5.5.6
+SRC_URI=https://hackage.haskell.org/package/bifunctors-5.5.6/bifunctors-5.5.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eba402a5b6cb4df2475b782a6c0da16c
diff --git a/metadata/md5-cache/dev-haskell/binary-0.8.7.0 b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
new file mode 100644
index 000000000000..3fe88da98beb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/binary-0.8.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
+EAPI=7
+HOMEPAGE=https://github.com/kolmodin/binary
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.8.7.0
+SRC_URI=https://hackage.haskell.org/package/binary-0.8.7.0/binary-0.8.7.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4522cd0af214c4c2d99437d9b3550385
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
new file mode 100644
index 000000000000..b790e20cdb3f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/utf8-string ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient buffered output
+EAPI=6
+HOMEPAGE=https://github.com/lpsmith/blaze-builder
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.1.0
+SRC_URI=https://hackage.haskell.org/package/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b3d1ccf3d1a431bfed7fc6868afd9e95
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
new file mode 100644
index 000000000000..0723908313aa
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast HTML combinator library for Haskell
+EAPI=7
+HOMEPAGE=http://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.1.2
+SRC_URI=https://hackage.haskell.org/package/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e9ac8bde4704a71558a7e84cc504e13
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4 b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
new file mode 100644
index 000000000000..9d4c8cfeb75a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 >=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A blazingly fast markup combinator library for Haskell
+EAPI=7
+HOMEPAGE=http://jaspervdj.be/blaze
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.2.4
+SRC_URI=https://hackage.haskell.org/package/blaze-markup-0.8.2.4/blaze-markup-0.8.2.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=377a860b1e95b20a37babf79e5c91098
diff --git a/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0 b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
new file mode 100644
index 000000000000..ff02e3be3a9b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implementation of bounded channels
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/BoundedChan
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1.0.3.0
+SRC_URI=https://hackage.haskell.org/package/BoundedChan-1.0.3.0/BoundedChan-1.0.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aa9e2db5b5bbda794ac0e4deacf358fe
diff --git a/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4 b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
new file mode 100644
index 000000000000..9c655b091a92
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/attoparsec >=dev-haskell/blaze-builder-0.2.1.4 >=dev-haskell/doctest-0.8 dev-haskell/hedgehog dev-haskell/tasty dev-haskell/tasty-hedgehog dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Chunked HTTP transfer encoding for bytestring builders
+EAPI=6
+HOMEPAGE=https://github.com/sjakobi/bsb-http-chunked
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.0.0.4
+SRC_URI=https://hackage.haskell.org/package/bsb-http-chunked-0.0.0.4/bsb-http-chunked-0.0.0.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f1aedffeca95e4a1afe692e473968811
diff --git a/metadata/md5-cache/dev-haskell/c2hs-0.28.6 b/metadata/md5-cache/dev-haskell/c2hs-0.28.6
new file mode 100644
index 000000000000..f480adbb1541
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/c2hs-0.28.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= ) >=dev-haskell/cabal-1.10
+DESCRIPTION=C->Haskell FFI tool that gives some cross-language type safety
+EAPI=6
+HOMEPAGE=https://github.com/haskell/c2hs
+IUSE=regression
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/dlist:= dev-haskell/fail:= >=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:= >=dev-lang/ghc-7.4.1:= regression? ( >=dev-haskell/shelly-1.0:= dev-haskell/text:= >=dev-haskell/yaml-0.8:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/c2hs-0.28.6/c2hs-0.28.6.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7c480c1b0bc4d42c5392d595da25d4b3
diff --git a/metadata/md5-cache/dev-haskell/cabal-3.0.1.0 b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
new file mode 100644
index 000000000000..02cfc4d41878
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-3.0.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+DESCRIPTION=A framework for packaging Haskell software
+EAPI=7
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/3.0.1.0
+SRC_URI=https://hackage.haskell.org/package/Cabal-3.0.1.0/Cabal-3.0.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e362a987d9aa10c55813d6d1b5b02496
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
new file mode 100644
index 000000000000..0103169a3ab3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:= >=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= ) >=dev-haskell/cabal-1.22.2.0
+DESCRIPTION=The command-line interface for Cabal and Hackage
+EAPI=7
+HOMEPAGE=http://www.haskell.org/cabal/
+IUSE=+native-dns
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:= >=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:= >=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:= >=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:= >=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:= >=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:= >=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:= >=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:= >=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:= >=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:= >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:= >=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:= >=dev-haskell/network-2.6:= <dev-haskell/network-3.2:= >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= >=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:= >=dev-haskell/random-1:= <dev-haskell/random-1.2:= >=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:= >=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:= >=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:= >=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:= >=dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/cabal-install-3.0.0.0/cabal-install-3.0.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ade648e0326957d9aa25cca3f2942b0a
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.1.0 b/metadata/md5-cache/dev-haskell/call-stack-0.1.0
new file mode 100644
index 000000000000..11da48e1b565
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/call-stack-0.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/nanospec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use GHC call-stacks in a backward compatible way
+EAPI=6
+HOMEPAGE=https://github.com/sol/call-stack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.0
+SRC_URI=https://hackage.haskell.org/package/call-stack-0.1.0/call-stack-0.1.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b4902102523800817cb1f3527177d214
diff --git a/metadata/md5-cache/dev-haskell/call-stack-0.2.0 b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
new file mode 100644
index 000000000000..f1b01343ff37
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/call-stack-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( dev-haskell/nanospec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use GHC call-stacks in a backward compatible way
+EAPI=7
+HOMEPAGE=https://github.com/sol/call-stack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.0
+SRC_URI=https://hackage.haskell.org/package/call-stack-0.2.0/call-stack-0.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=af5642338f3f9709ae009b48efbeb593
diff --git a/metadata/md5-cache/dev-haskell/casa-client-0.0.1 b/metadata/md5-cache/dev-haskell/casa-client-0.0.1
new file mode 100644
index 000000000000..6307bdc6ba43
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/casa-client-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Client for Casa
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/casa-client
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1
+SRC_URI=https://hackage.haskell.org/package/casa-client-0.0.1/casa-client-0.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2a0416ebdf5da759a7562628ca7bab63
diff --git a/metadata/md5-cache/dev-haskell/casa-types-0.0.1 b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
new file mode 100644
index 000000000000..8b0c2a66e7f1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/casa-types-0.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/path-pieces:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for Casa
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/casa-types
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/path-pieces:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.0.1
+SRC_URI=https://hackage.haskell.org/package/casa-types-0.0.1/casa-types-0.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c0f84f29046445e5860adfc17b9496a2
diff --git a/metadata/md5-cache/dev-haskell/cereal-0.5.8.1 b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
new file mode 100644
index 000000000000..2388da8c69bd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cereal-0.5.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binary serialization library
+EAPI=7
+HOMEPAGE=https://github.com/GaloisInc/cereal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.8.1
+SRC_URI=https://hackage.haskell.org/package/cereal-0.5.8.1/cereal-0.5.8.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=31b918aba2b3bd1f7fcb9a4f61d2e169
diff --git a/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1 b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
new file mode 100644
index 000000000000..59260dbbe957
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast unicode character sets based on complemented PATRICIA tries
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/charset
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.7.1
+SRC_URI=https://hackage.haskell.org/package/charset-0.3.7.1/charset-0.3.7.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=39dd362f834d98ddb3d172a87c39adcd
diff --git a/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1 b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
new file mode 100644
index 000000000000..e3b09f42718c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=AES and common modes using AES-NI when available
+EAPI=7
+HOMEPAGE=https://github.com/TomMD/cipher-aes128
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/cereal:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] dev-haskell/tagged:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.7.0.5
+SRC_URI=https://hackage.haskell.org/package/cipher-aes128-0.7.0.5/cipher-aes128-0.7.0.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8df3e3492c5ee1807964093cc53a306b
diff --git a/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1 b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
new file mode 100644
index 000000000000..73a1fcef4fc3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, accurate GitHub Flavored Markdown parser and renderer
+EAPI=7
+HOMEPAGE=https://github.com/kivikakk/cmark-gfm-hs
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.1
+SRC_URI=https://hackage.haskell.org/package/cmark-gfm-0.2.1/cmark-gfm-0.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=839883ce18022b62f30b578cc69d4dcb
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.6 b/metadata/md5-cache/dev-haskell/comonad-5.0.6
new file mode 100644
index 000000000000..5a0bfc1a53eb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/comonad-5.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 compatible comonads
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/comonad/
+IUSE=+containers +distributive +test-doctests doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+RESTRICT=test
+SLOT=0/5.0.6
+SRC_URI=https://hackage.haskell.org/package/comonad-5.0.6/comonad-5.0.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bb72291c2f3b91a1695192cce05d51d3
diff --git a/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11 b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
new file mode 100644
index 000000000000..329e2ec5639a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.11.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Ungarble output from several threads or commands
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/concurrent-output
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.11.0:=[profile?] >=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/1.10.11
+SRC_URI=https://hackage.haskell.org/package/concurrent-output-1.10.11/concurrent-output-1.10.11.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ecf609ccc0add8af4d29ef5cf3e20355
diff --git a/metadata/md5-cache/dev-haskell/conduit-1.3.2 b/metadata/md5-cache/dev-haskell/conduit-1.3.2
new file mode 100644
index 000000000000..40fa815fc4ce
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/conduit-1.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/exceptions-0.6 >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.7 dev-haskell/safe dev-haskell/silently >=dev-haskell/split-0.2.0.0 >=dev-haskell/unliftio-0.2.4.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Streaming data processing library
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/exceptions:=[profile?] >=dev-haskell/mono-traversable-1.0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.3.2
+SRC_URI=https://hackage.haskell.org/package/conduit-1.3.2/conduit-1.3.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7640c91484bfe6d408eefcd43a3ba98a
diff --git a/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0 b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
new file mode 100644
index 000000000000..77ce0be4990e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Commonly used conduit functions, for both chunked and unchunked data
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-8.0.1:=
+SLOT=0/1.3.0
+SRC_URI=https://hackage.haskell.org/package/conduit-combinators-1.3.0/conduit-combinators-1.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e0634bcb22bad12ffa820b802e9f154
diff --git a/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4 b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
new file mode 100644
index 000000000000..103f9b539753
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.16:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.6:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/bytestring-builder dev-haskell/exceptions >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/transformers-base ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Batteries included conduit: adapters for common libraries
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/primitive-0.5:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/streaming-commons-0.1.16:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.6:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=test
+SLOT=0/1.3.4
+SRC_URI=https://hackage.haskell.org/package/conduit-extra-1.3.4/conduit-extra-1.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aa35331dac65cb519f3b125ceefac2bd
diff --git a/metadata/md5-cache/dev-haskell/connection-0.3.1 b/metadata/md5-cache/dev-haskell/connection-0.3.1
new file mode 100644
index 000000000000..e2409d2edad8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/connection-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/basement:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.6.3:=[profile?] >=dev-haskell/socks-0.6:=[profile?] >=dev-haskell/tls-1.4:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple and easy network connections API
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-connection
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/basement:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/network-2.6.3:=[profile?] >=dev-haskell/socks-0.6:=[profile?] >=dev-haskell/tls-1.4:=[profile?] >=dev-haskell/x509-1.5:=[profile?] >=dev-haskell/x509-store-1.5:=[profile?] >=dev-haskell/x509-system-1.5:=[profile?] >=dev-haskell/x509-validation-1.5:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.3.1
+SRC_URI=https://hackage.haskell.org/package/connection-0.3.1/connection-0.3.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b853cb919f73194bfd2872f90ccb4508
diff --git a/metadata/md5-cache/dev-haskell/constraints-0.11.2 b/metadata/md5-cache/dev-haskell/constraints-0.11.2
new file mode 100644
index 000000000000..2fe1fc338f86
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/constraints-0.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Constraint manipulation
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/constraints/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.11.2
+SRC_URI=https://hackage.haskell.org/package/constraints-0.11.2/constraints-0.11.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9bd6e36f705aa9b1750fa3d1c769977d
diff --git a/metadata/md5-cache/dev-haskell/contravariant-1.5.2 b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
new file mode 100644
index 000000000000..0bc43688e751
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/contravariant-1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contravariant functors
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/contravariant/
+IUSE=+semigroups +statevar +tagged doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] ) statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+SLOT=0/1.5.2
+SRC_URI=https://hackage.haskell.org/package/contravariant-1.5.2/contravariant-1.5.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fbdf1f96309dd03fa67d5c944e04d068
diff --git a/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.1 b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.1
new file mode 100644
index 000000000000..119156f3de6d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.2:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extras for the \\
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/contravariant-extras
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/template-haskell-compat-v0208-0.1.2:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/0.3.5.1
+SRC_URI=https://hackage.haskell.org/package/contravariant-extras-0.3.5.1/contravariant-extras-0.3.5.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=12cac111b6601f1074529f8e508318df
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
new file mode 100644
index 000000000000..3eb603c12f9d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/puremd5-2.1.3 <dev-haskell/puremd5-2.2 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, pure and practical MD5 implementation
+EAPI=6
+HOMEPAGE=https://github.com/hvr/cryptohash-md5
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.11.100.1
+SRC_URI=https://hackage.haskell.org/package/cryptohash-md5-0.11.100.1/cryptohash-md5-0.11.100.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f651e5f5a5407a62c0adb3f6bd504fdf
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1 b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
new file mode 100644
index 000000000000..04ad9a5eefde
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, pure and practical SHA-1 implementation
+EAPI=6
+HOMEPAGE=https://github.com/hvr/cryptohash-sha1
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.11.100.1
+SRC_URI=https://hackage.haskell.org/package/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d4da5e2af7596ae7a0de2b262121d083
diff --git a/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0 b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
new file mode 100644
index 000000000000..0b1ec2c21a96
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 >=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast, pure and practical SHA-256 implementation
+EAPI=6
+HOMEPAGE=https://github.com/hvr/cryptohash-sha256
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.11.101.0
+SRC_URI=https://hackage.haskell.org/package/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d51d3042a188d3c36b4cb98182079ac2
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2 b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
new file mode 100644
index 000000000000..b8fd2ac8eec6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/conduit-combinators dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=cryptonite conduit
+EAPI=6
+HOMEPAGE=https://github.com/haskell-crypto/cryptonite-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/resourcet:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.2.2
+SRC_URI=https://hackage.haskell.org/package/cryptonite-conduit-0.2.2/cryptonite-conduit-0.2.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5a48599985a552e41d1299fe25d2354d
diff --git a/metadata/md5-cache/dev-haskell/dav-1.3.4 b/metadata/md5-cache/dev-haskell/dav-1.3.4
new file mode 100644
index 000000000000..107a0065f10c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dav-1.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/network-2.6.10:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=RFC 4918 WebDAV support
+EAPI=7
+HOMEPAGE=http://floss.scru.org/hDAV
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-haskell/case-insensitive-0.4:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] dev-haskell/haskeline:=[profile?] >=dev-haskell/http-client-0.4:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/lens-3.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/network-2.6.10:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/optparse-applicative-0.10.0:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-hamlet-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.3.4
+SRC_URI=https://hackage.haskell.org/package/DAV-1.3.4/DAV-1.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc7c609c0eeb480148085d0850dc0418
diff --git a/metadata/md5-cache/dev-haskell/dbus-1.2.16 b/metadata/md5-cache/dev-haskell/dbus-1.2.16
new file mode 100644
index 000000000000..012bd9eceb98
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dbus-1.2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] <dev-haskell/lens-4.20:=[profile?] >=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( <dev-haskell/extra-1.8 <dev-haskell/quickcheck-2.15 <dev-haskell/resourcet-1.3 <dev-haskell/tasty-1.4 <dev-haskell/tasty-hunit-0.11 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A client library for the D-Bus IPC system
+EAPI=7
+HOMEPAGE=https://github.com/rblaze/haskell-dbus#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] <dev-haskell/lens-4.20:=[profile?] >=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] <dev-haskell/random-1.3:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/th-lift-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/1.2.16
+SRC_URI=https://hackage.haskell.org/package/dbus-1.2.16/dbus-1.2.16.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ee27d09451ebaf53600919e358d0644b
diff --git a/metadata/md5-cache/dev-haskell/dec-0.0.3 b/metadata/md5-cache/dev-haskell/dec-0.0.3
new file mode 100644
index 000000000000..ea6a452b689d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dec-0.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Decidable propositions
+EAPI=7
+HOMEPAGE=https://github.com/phadej/vec
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.0.3
+SRC_URI=https://hackage.haskell.org/package/dec-0.0.3/dec-0.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c799f45cb022ca76a5b05472e77a5e98
diff --git a/metadata/md5-cache/dev-haskell/diff-0.4.0 b/metadata/md5-cache/dev-haskell/diff-0.4.0
new file mode 100644
index 000000000000..ea2d5be7ead2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/diff-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-quickcheck2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=O(ND) diff algorithm in haskell
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/Diff
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.0
+SRC_URI=https://hackage.haskell.org/package/Diff-0.4.0/Diff-0.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=32247afcd35db708761faab20cd0c3de
diff --git a/metadata/md5-cache/dev-haskell/distributive-0.6.1 b/metadata/md5-cache/dev-haskell/distributive-0.6.1
new file mode 100644
index 000000000000..176ebfe19a92
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/distributive-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2 >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Distributive functors -- Dual to Traversable
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/distributive/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.6.1
+SRC_URI=https://hackage.haskell.org/package/distributive-0.6.1/distributive-0.6.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1412360d6d21eb1662cd9479346216a5
diff --git a/metadata/md5-cache/dev-haskell/dlist-0.8.0.7 b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
new file mode 100644
index 000000000000..9301091896ad
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/dlist-0.8.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Difference lists
+EAPI=7
+HOMEPAGE=https://github.com/spl/dlist
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.0.7
+SRC_URI=https://hackage.haskell.org/package/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c86a4e66e0b3e0b4b6c7c318591003ca
diff --git a/metadata/md5-cache/dev-haskell/doclayout-0.3 b/metadata/md5-cache/dev-haskell/doclayout-0.3
new file mode 100644
index 000000000000..bafb39109f16
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/doclayout-0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A prettyprinting library for laying out text documents
+EAPI=7
+HOMEPAGE=https://github.com/jgm/doclayout
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://hackage.haskell.org/package/doclayout-0.3/doclayout-0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=62269cb2d07683b5c088268228718ecb
diff --git a/metadata/md5-cache/dev-haskell/doctemplates-0.8.2 b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
new file mode 100644
index 000000000000..42c32d15c638
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/doctemplates-0.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] dev-haskell/hsyaml:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/glob dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pandoc-style document templates
+EAPI=7
+HOMEPAGE=https://github.com/jgm/doctemplates#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?] dev-haskell/hsyaml:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-conversions:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.2
+SRC_URI=https://hackage.haskell.org/package/doctemplates-0.8.2/doctemplates-0.8.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c33779426d2768321fe5ac86b0205d8d
diff --git a/metadata/md5-cache/dev-haskell/doctest-0.16.3 b/metadata/md5-cache/dev-haskell/doctest-0.16.3
new file mode 100644
index 000000000000..1425b5184ba9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/doctest-0.16.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.3.0 >=dev-haskell/hspec-core-2.3.0 dev-haskell/hunit dev-haskell/mockery >=dev-haskell/quickcheck-2.13.1 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Test interactive Haskell examples
+EAPI=7
+HOMEPAGE=https://github.com/sol/doctest#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base-compat-0.7.0:=[profile?] >=dev-haskell/code-page-0.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
+RESTRICT=test
+SLOT=0/0.16.3
+SRC_URI=https://hackage.haskell.org/package/doctest-0.16.3/doctest-0.16.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=08a05d3b14ca9bcd16e21dd885bffa99
diff --git a/metadata/md5-cache/dev-haskell/drbg-0.5.5 b/metadata/md5-cache/dev-haskell/drbg-0.5.5
new file mode 100644
index 000000000000..887770ccb7f4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/drbg-0.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/cipher-aes128-0.6:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/binary dev-haskell/crypto-api-tests dev-haskell/hunit dev-haskell/quickcheck dev-haskell/test-framework dev-haskell/test-framework-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/DRBG
+IUSE=test doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/cipher-aes128-0.6:=[profile?] >=dev-haskell/crypto-api-0.13:=[profile?] >=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?] dev-haskell/entropy:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/prettyclass:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.5.5
+SRC_URI=https://hackage.haskell.org/package/DRBG-0.5.5/DRBG-0.5.5.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cfc4128894af651bcfc50c618517f126
diff --git a/metadata/md5-cache/dev-haskell/echo-0.1.3 b/metadata/md5-cache/dev-haskell/echo-0.1.3
new file mode 100644
index 000000000000..27d5df8746fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/echo-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A cross-platform, cross-console way to handle echoing terminal input
+EAPI=6
+HOMEPAGE=https://github.com/RyanGlScott/echo
+IUSE=examples doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.3
+SRC_URI=https://hackage.haskell.org/package/echo-0.1.3/echo-0.1.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=01fef73992aaabbcc5e7def1329772dc
diff --git a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0 b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
index d6d1b7d30a11..abfbc3b6c552 100644
--- a/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+++ b/metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/doctest-0.10 >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Ed25519 cryptographic signatures
 EAPI=6
 HOMEPAGE=http://thoughtpolice.github.com/hs-ed25519
-IUSE=doc hscolour profile test
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0/0.0.5.0
 SRC_URI=https://hackage.haskell.org/package/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d125f1f1dd4f7b319bd428e34bfbb93f
+_md5_=36a459e7b03958a3c8dba22349d44b89
diff --git a/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4 b/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
new file mode 100644
index 000000000000..409c060e72a3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Calculate edit distances and edit scripts between vectors
+EAPI=7
+HOMEPAGE=https://github.com/thsutton/edit-distance-vector
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/vector-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.4
+SRC_URI=https://hackage.haskell.org/package/edit-distance-vector-1.0.0.4/edit-distance-vector-1.0.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eb1b9ef4cbf9bd4ddc20065fb4e1d318
diff --git a/metadata/md5-cache/dev-haskell/either-5.0.1.1 b/metadata/md5-cache/dev-haskell/either-5.0.1.1
new file mode 100644
index 000000000000..93ec668cdff7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/either-5.0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An either monad transformer
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/either/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/5.0.1.1
+SRC_URI=https://hackage.haskell.org/package/either-5.0.1.1/either-5.0.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b25d5b1633354a35e9bd551bcb49a446
diff --git a/metadata/md5-cache/dev-haskell/emojis-0.1 b/metadata/md5-cache/dev-haskell/emojis-0.1
new file mode 100644
index 000000000000..c2bff80912be
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/emojis-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between emoji characters and their names.
+EAPI=7
+HOMEPAGE=https://github.com/jgm/emojis#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1
+SRC_URI=https://hackage.haskell.org/package/emojis-0.1/emojis-0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7ba760a8c4b7c9310a36a6e655bea567
diff --git a/metadata/md5-cache/dev-haskell/entropy-0.4.1.6 b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
new file mode 100644
index 000000000000..2d33e33cdc63
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/entropy-0.4.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A platform independent entropy source
+EAPI=7
+HOMEPAGE=https://github.com/TomMD/entropy
+IUSE=halvm doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.1:=
+SLOT=0/0.4.1.6
+SRC_URI=https://hackage.haskell.org/package/entropy-0.4.1.6/entropy-0.4.1.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6f61a7a50a124189cf9da3a27961ff9
diff --git a/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0 b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
new file mode 100644
index 000000000000..e122a34c162e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.5 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An orphan Eq instance for ErrorCall
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/errorcall-eq-instance
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/base-orphans:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.0
+SRC_URI=https://hackage.haskell.org/package/errorcall-eq-instance-0.3.0/errorcall-eq-instance-0.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=46e0423a1006cec432673d256be97740
diff --git a/metadata/md5-cache/dev-haskell/errors-2.3.0 b/metadata/md5-cache/dev-haskell/errors-2.3.0
new file mode 100644
index 000000000000..c6deb3ea938d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/errors-2.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simplified error-handling
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/errors
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.3.0
+SRC_URI=https://hackage.haskell.org/package/errors-2.3.0/errors-2.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a260eaf327d6f80b9f318047dbbed107
diff --git a/metadata/md5-cache/dev-haskell/exceptions-0.10.4 b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
new file mode 100644
index 000000000000..cbd661727d9c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/exceptions-0.10.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15 >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extensible optionally-pure exceptions
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/exceptions/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.10.4
+SRC_URI=https://hackage.haskell.org/package/exceptions-0.10.4/exceptions-0.10.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4540333eea25a5a1a8dd1ff4c83c9452
diff --git a/metadata/md5-cache/dev-haskell/extra-1.7.4 b/metadata/md5-cache/dev-haskell/extra-1.7.4
new file mode 100644
index 000000000000..48860c827ced
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/extra-1.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2.10 >=dev-haskell/quickcheck-instances-0.3.17 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extra functions I use
+EAPI=7
+HOMEPAGE=https://github.com/ndmitchell/extra#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/clock-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=2/1.7.4
+SRC_URI=https://hackage.haskell.org/package/extra-1.7.4/extra-1.7.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=55d3c6525f95ab162ad3c7f79934f092
diff --git a/metadata/md5-cache/dev-haskell/fail-4.9.0.0 b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
index bab0a6271ef7..abc97f0214d9 100644
--- a/metadata/md5-cache/dev-haskell/fail-4.9.0.0
+++ b/metadata/md5-cache/dev-haskell/fail-4.9.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10
+DEPEND=>=dev-lang/ghc-7.4.1:=
 DESCRIPTION=Forward-compatible MonadFail class
 EAPI=5
 HOMEPAGE=https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/4.9.0.0
 SRC_URI=https://hackage.haskell.org/package/fail-4.9.0.0/fail-4.9.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e114a9c717a2125bb33ed82f8b4b4697
+_md5_=ca0a9b11fe84ac93e7c478e25fb12aa7
diff --git a/metadata/md5-cache/dev-haskell/fast-logger-3.0.1 b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
new file mode 100644
index 000000000000..fb61c9d9efdc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fast-logger-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unix-time-0.4.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast logging system
+EAPI=7
+HOMEPAGE=https://github.com/kazu-yamamoto/logger
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/auto-update-0.1.2:=[profile?] >=dev-haskell/easy-file-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-haskell/unix-time-0.4.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/3.0.1
+SRC_URI=https://hackage.haskell.org/package/fast-logger-3.0.1/fast-logger-3.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f461703e03a4e62fb9268fbe49c634e
diff --git a/metadata/md5-cache/dev-haskell/feed-1.3.0.1 b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
new file mode 100644
index 000000000000..c4ab087d992b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/feed-1.3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
+EAPI=7
+HOMEPAGE=https://github.com/bergmark/feed
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.3.0.1
+SRC_URI=https://hackage.haskell.org/package/feed-1.3.0.1/feed-1.3.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ac79d2be9fe0115c69b327e2ad2cc4b7
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.7.0.2 b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
new file mode 100644
index 000000000000..1fe4b8490227
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fgl-5.7.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Martin Erwig's Functional Graph Library
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/fgl
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/5.7.0.2
+SRC_URI=https://hackage.haskell.org/package/fgl-5.7.0.2/fgl-5.7.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10f599d30dfe74a4484207f383dbace4
diff --git a/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2 b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
new file mode 100644
index 000000000000..0f116b5600c6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use Template Haskell to embed file contents directly
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/file-embed
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.0.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.0.11.2
+SRC_URI=https://hackage.haskell.org/package/file-embed-0.0.11.2/file-embed-0.0.11.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff7a961ef777c1709c8f16744a254cce
diff --git a/metadata/md5-cache/dev-haskell/filelock-0.1.1.4 b/metadata/md5-cache/dev-haskell/filelock-0.1.1.4
new file mode 100644
index 000000000000..065576ea1483
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/filelock-0.1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.2:= >=dev-haskell/cabal-1.14.0 test? ( dev-haskell/async ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable interface to file locking (flock / LockFileEx)
+EAPI=7
+HOMEPAGE=https://github.com/takano-akio/filelock
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.1.4
+SRC_URI=https://hackage.haskell.org/package/filelock-0.1.1.4/filelock-0.1.1.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40f69ef407f38d36318c40d0bd376179
diff --git a/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6 b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
new file mode 100644
index 000000000000..27c8c99a9b5c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for manipulating RawFilePaths in a cross platform way
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/filepath-bytestring
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.4.2.1.6
+SRC_URI=https://hackage.haskell.org/package/filepath-bytestring-1.4.2.1.6/filepath-bytestring-1.4.2.1.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f36ed1cd0f35c41636d313273511a529
diff --git a/metadata/md5-cache/dev-haskell/foldl-1.4.7 b/metadata/md5-cache/dev-haskell/foldl-1.4.7
new file mode 100644
index 000000000000..4333f902c078
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/foldl-1.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.6:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] <dev-haskell/vector-builder-0.4:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/doctest-0.16 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Composable, streaming, and efficient left folds
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/foldl
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?] <dev-haskell/contravariant-1.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?] <dev-haskell/primitive-0.8:=[profile?] <dev-haskell/profunctors-5.6:=[profile?] >=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?] >=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?] >=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?] <dev-haskell/vector-builder-0.4:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/1.4.7
+SRC_URI=https://hackage.haskell.org/package/foldl-1.4.7/foldl-1.4.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f48ac6021c5835185e148322a2ece8d
diff --git a/metadata/md5-cache/dev-haskell/free-5.1.3 b/metadata/md5-cache/dev-haskell/free-5.1.3
new file mode 100644
index 000000000000..73955c64f3fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/free-5.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monads for free
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/free/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/distributive-0.2.1:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/5.1.3
+SRC_URI=https://hackage.haskell.org/package/free-5.1.3/free-5.1.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ac94d30587154314ff8782e2c094aab
diff --git a/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1 b/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
new file mode 100644
index 000000000000..e34243254fae
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.0:=[profile?] >=dev-haskell/shelly-1.6.5:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/random >=dev-haskell/tasty-0.5 dev-haskell/tasty-hunit dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Cross platform library for file change notification
+EAPI=7
+HOMEPAGE=https://github.com/haskell-fswatch/hfsnotify
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0.1:=[profile?] >=dev-haskell/hinotify-0.3.0:=[profile?] >=dev-haskell/shelly-1.6.5:=[profile?] >=dev-haskell/text-0.11.0:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.0.1
+SRC_URI=https://hackage.haskell.org/package/fsnotify-0.3.0.1/fsnotify-0.3.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9906363310fd62e30014e6b60927bdc5
diff --git a/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1 b/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
new file mode 100644
index 000000000000..a34c3147976b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic programming library for generalised deriving
+EAPI=7
+HOMEPAGE=https://github.com/dreixel/generic-deriving
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.13.1
+SRC_URI=https://hackage.haskell.org/package/generic-deriving-1.13.1/generic-deriving-1.13.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=428807ae822c3f7965b187ea1d5c7450
diff --git a/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0 b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
new file mode 100644
index 000000000000..99b1e5a1f7f0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic Programming using True Sums of Products
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/generics-sop
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.1.0
+SRC_URI=https://hackage.haskell.org/package/generics-sop-0.5.1.0/generics-sop-0.5.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4326571af02dd2b24a26ec5e24a6d477
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2 b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
new file mode 100644
index 000000000000..4bd3fddb90f4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/hspec-core ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Testing utilities for the validity library
+EAPI=7
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/quickcheck-2.7:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.10.0.2
+SRC_URI=https://hackage.haskell.org/package/genvalidity-0.10.0.2/genvalidity-0.10.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f6acdd6727c4de71817bdcaacc43262
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4 b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
new file mode 100644
index 000000000000..94a200103c0a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] dev-haskell/hspec-core:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Standard spec's for GenValidity instances
+EAPI=7
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/genvalidity-0.8:=[profile?] >=dev-haskell/genvalidity-property-0.5:=[profile?] dev-haskell/hspec:=[profile?] dev-haskell/hspec-core:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.5:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.7.0.4
+SRC_URI=https://hackage.haskell.org/package/genvalidity-hspec-0.7.0.4/genvalidity-hspec-0.7.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8eec9242bc1f428f1e7b2e2ba039e215
diff --git a/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1 b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
new file mode 100644
index 000000000000..4a6d7b42b8fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/doctest ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Standard properties for functions on 'Validity' types
+EAPI=7
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/genvalidity-0.7:=[profile?] >=dev-haskell/hspec-2.1:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/quickcheck:2=[profile?] >=dev-haskell/validity-0.9:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.0.1
+SRC_URI=https://hackage.haskell.org/package/genvalidity-property-0.5.0.1/genvalidity-property-0.5.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=97d5bd48c7fe2abf420109c7a7e5ca8a
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
new file mode 100644
index 000000000000..89011d1e8ff3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.3
+DESCRIPTION=Knowledge of GHC's installation directories
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/ghc-paths
+IUSE=profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.0.12
+SRC_URI=https://hackage.haskell.org/package/ghc-paths-0.1.0.12/ghc-paths-0.1.0.12.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d190219ac6a08c594b124eb424767f92
diff --git a/metadata/md5-cache/dev-haskell/githash-0.1.3.3 b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
new file mode 100644
index 000000000000..25037ee3cffd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/githash-0.1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec dev-haskell/temporary dev-haskell/unliftio ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Compile git revision info into Haskell projects
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/githash#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.0.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.3.3
+SRC_URI=https://hackage.haskell.org/package/githash-0.1.3.3/githash-0.1.3.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5a61c7f6208ed5dd4359f3b862c74694
diff --git a/metadata/md5-cache/dev-haskell/glob-0.9.3 b/metadata/md5-cache/dev-haskell/glob-0.9.3
new file mode 100644
index 000000000000..c59133670756
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/glob-0.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 >=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Globbing library
+EAPI=6
+HOMEPAGE=http://iki.fi/matti.niemenmaa/glob/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.3
+SRC_URI=https://hackage.haskell.org/package/Glob-0.9.3/Glob-0.9.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7508a47831fabc25f1217aca8dc6cfd3
diff --git a/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4 b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
new file mode 100644
index 000000000000..711f9fc7ca20
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.8:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wl-pprint-text-1.2:=[profile?] <dev-haskell/wl-pprint-text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/fgl-5.5.0.0 >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3 >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings to Graphviz for graph visualisation
+EAPI=7
+HOMEPAGE=http://projects.haskell.org/graphviz/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?] >=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.8:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wl-pprint-text-1.2:=[profile?] <dev-haskell/wl-pprint-text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2999.20.0.4
+SRC_URI=https://hackage.haskell.org/package/graphviz-2999.20.0.4/graphviz-2999.20.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=41352b6c2bed674a43877778b420c6fa
diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3 b/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
new file mode 100644
index 000000000000..6db29f30ecf8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/old-locale-1.0:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.9 >=dev-haskell/tasty-1.0 >=dev-haskell/tasty-hunit-0.10 >=dev-haskell/tasty-quickcheck-0.10 >=dev-haskell/temporary-1.2 !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hackage security library
+EAPI=7
+HOMEPAGE=https://github.com/haskell/hackage-security
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/cabal-1.14:=[profile?] >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?] >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/old-locale-1.0:=[profile?] network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RESTRICT=test
+SLOT=0/0.5.3.0
+SRC_URI=https://hackage.haskell.org/package/hackage-security-0.5.3.0/hackage-security-0.5.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f6724408e06e1d29fdfe08d0eef2e50e
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-2.23.1
new file mode 100644
index 000000000000..0304b718909c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-2.23.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/haddock-api-2.23.1:= >=dev-lang/ghc-8.8.1:= >=dev-haskell/cabal-3.0.0.0
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=7
+HOMEPAGE=http://www.haskell.org/haddock/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=~dev-haskell/haddock-api-2.23.1:= >=dev-lang/ghc-8.8.1:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/haddock-2.23.1/haddock-2.23.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f2a48371c8d5b5d2e803e76eeb653439
diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.23.1 b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
new file mode 100644
index 000000000000..39fc4ebd31ea
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-api-2.23.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2 >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A documentation-generation tool for Haskell libraries
+EAPI=7
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?] >=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:=
+RESTRICT=!test? ( test )
+SLOT=0/2.23.1
+SRC_URI=https://hackage.haskell.org/package/haddock-api-2.23.1/haddock-api-2.23.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f0828c3ab76e7d1e71f1bbdc4388f31
diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.8.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
new file mode 100644
index 000000000000..198da05348c2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haddock-library-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8 >=dev-haskell/optparse-applicative-0.15 <dev-haskell/optparse-applicative-0.16 >=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2 >=dev-haskell/base-compat-0.9.3 <dev-haskell/base-compat-0.12 >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
+DESCRIPTION=Library exposing some functionality of Haddock
+EAPI=7
+HOMEPAGE=http://www.haskell.org/haddock/
+IUSE=profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.8.0
+SRC_URI=https://hackage.haskell.org/package/haddock-library-1.8.0/haddock-library-1.8.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=108e9a5948c8e353125bde3bbb28db21
diff --git a/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0 b/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
new file mode 100644
index 000000000000..237364f1cf4d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.12:=[profile?] >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-lang/ghc-8.6.3:= buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] ) checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] ) previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?] >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] ) !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] ) watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) ) usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] >=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] ) >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A static website compiler library
+EAPI=7
+HOMEPAGE=http://jaspervdj.be/hakyll
+IUSE=buildwebsite +checkexternal +previewserver +usepandoc +watchserver doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.12:=[profile?] >=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?] >=dev-lang/ghc-8.6.3:= buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] ) checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] ) previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] >=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?] >=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] ) !previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] ) watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) ) usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] >=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/4.13.4.0
+SRC_URI=https://hackage.haskell.org/package/hakyll-4.13.4.0/hakyll-4.13.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc1a9f8e098edc74b8fa64ce92c0bd71
diff --git a/metadata/md5-cache/dev-haskell/hans-3.0.1 b/metadata/md5-cache/dev-haskell/hans-3.0.1
new file mode 100644
index 000000000000..264acb3c690b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hans-3.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/boundedchan:=[profile?] >=dev-haskell/cereal-0.5.0.0:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/heaps:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/monadlib:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( dev-haskell/quickcheck >=dev-haskell/tasty-0.11 dev-haskell/tasty-ant-xml dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Network Stack
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/hans
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/boundedchan:=[profile?] >=dev-haskell/cereal-0.5.0.0:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/heaps:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/monadlib:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/3.0.1
+SRC_URI=https://hackage.haskell.org/package/hans-3.0.1/hans-3.0.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=960d6087048b607cd78477e3d93ef170
diff --git a/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1 b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
new file mode 100644
index 000000000000..0adbc3c8449c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hashable instances for Data.Time
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/hashable-time
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0.2
+SRC_URI=https://hackage.haskell.org/package/hashable-time-0.2.0.2/hashable-time-0.2.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2c2717715e3c803c664604ff6cfabce
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0 b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
new file mode 100644
index 000000000000..11e86c98eba0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-8.0.1:= terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A command-line interface for user input, written in Haskell
+EAPI=7
+HOMEPAGE=https://github.com/judah/haskeline
+IUSE=+terminfo doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-lang/ghc-8.0.1:= terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+SLOT=0/0.7.5.0
+SRC_URI=https://hackage.haskell.org/package/haskeline-0.7.5.0/haskeline-0.7.5.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a570cd0d37f985b48815fb4c1477ab49
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1 b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
new file mode 100644
index 000000000000..cc23b62ea298
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( dev-haskell/mtl >=dev-haskell/pretty-show-1.6.16 >=dev-haskell/smallcheck-1.0 >=dev-haskell/tasty-0.3 >=dev-haskell/tasty-golden-2.2.2 dev-haskell/tasty-smallcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer
+EAPI=7
+HOMEPAGE=https://github.com/haskell-suite/haskell-src-exts
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.18.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=1.21/1.21.1
+SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-1.21.1/haskell-src-exts-1.21.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fee0783ef17dae511552db7c15d576a1
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5 b/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
new file mode 100644
index 000000000000..9e6f9118196a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/haskell-src-exts-1.20.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Helper functions for working with haskell-src-exts trees
+EAPI=7
+HOMEPAGE=https://github.com/pepeiborra/haskell-src-exts-util
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] >=dev-haskell/haskell-src-exts-1.20.0:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/uniplate:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.5
+SRC_URI=https://hackage.haskell.org/package/haskell-src-exts-util-0.2.5/haskell-src-exts-util-0.2.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fb83f40ab7db478e42a19a44ec814461
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1 b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
new file mode 100644
index 000000000000..71bb3a8bca69
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src-exts-1.24:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/th-orphans-0.12:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse source to template-haskell abstract syntax
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/haskell-src-meta
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src-exts-1.24:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] >=dev-haskell/th-orphans-0.12:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/0.8.5
+SRC_URI=https://hackage.haskell.org/package/haskell-src-meta-0.8.5/haskell-src-meta-0.8.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2d9bf3af4376cf779a1a14ae844233cd
diff --git a/metadata/md5-cache/dev-haskell/heaps-0.3.6.1 b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
new file mode 100644
index 000000000000..de5117f27c17
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/heaps-0.3.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Asymptotically optimal Brodal/Okasaki heaps
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/heaps/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.6.1
+SRC_URI=https://hackage.haskell.org/package/heaps-0.3.6.1/heaps-0.3.6.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=84da6a2ebbba5330407246913fdc30b3
diff --git a/metadata/md5-cache/dev-haskell/hedgehog-1.0.2-r1 b/metadata/md5-cache/dev-haskell/hedgehog-1.0.2-r1
new file mode 100644
index 000000000000..e0c555572f0b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hedgehog-1.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hedgehog will eat all your bugs
+EAPI=7
+HOMEPAGE=https://hedgehog.qa
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] <dev-haskell/concurrent-output-1.11:=[profile?] >=dev-haskell/erf-2.0:=[profile?] <dev-haskell/erf-2.1:=[profile?] >=dev-haskell/exceptions-0.7:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?] >=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.2:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.5.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/wl-pprint-annotated-0.0:=[profile?] <dev-haskell/wl-pprint-annotated-0.2:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.2
+SRC_URI=https://hackage.haskell.org/package/hedgehog-1.0.2/hedgehog-1.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=48877409a0f2d5416416b0f1a1d1f727
diff --git a/metadata/md5-cache/dev-haskell/hex-0.1.2 b/metadata/md5-cache/dev-haskell/hex-0.1.2
index 27e23ad58a71..52f2a0a5720e 100644
--- a/metadata/md5-cache/dev-haskell/hex-0.1.2
+++ b/metadata/md5-cache/dev-haskell/hex-0.1.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-lang/ghc-8.8.1:= dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Convert strings into hexadecimal and back
-EAPI=5
-HOMEPAGE=https://hackage.haskell.org/package/hex
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/hex
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
+RDEPEND=>=dev-lang/ghc-8.8.1:=
 SLOT=0/0.1.2
 SRC_URI=https://hackage.haskell.org/package/hex-0.1.2/hex-0.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2acd7dc050ea0e525f71544e80eaeae
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b4b1e0a1ff83a2c1cb6cb23448b991d5
diff --git a/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0 b/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
new file mode 100644
index 000000000000..7c27c357aae9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/vector-0.12.0.1:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-2.4.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parser for GHC's hi files
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/stack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/vector-0.12.0.1:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.0.0
+SRC_URI=https://hackage.haskell.org/package/hi-file-parser-0.1.0.0/hi-file-parser-0.1.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f367d01ccdfe2e69314ba3fb095226bc
diff --git a/metadata/md5-cache/dev-haskell/hinotify-0.3.10 b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
new file mode 100644
index 000000000000..6b75fbc8df8c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hinotify-0.3.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell binding to inotify
+EAPI=6
+HOMEPAGE=https://github.com/kolmodin/hinotify.git
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.10
+SRC_URI=https://hackage.haskell.org/package/hinotify-0.3.10/hinotify-0.3.10.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6c624eeb0393e42d828bbb86872e5987
diff --git a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1 b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
new file mode 100644
index 000000000000..15753ec7a329
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/extra-1.6.6:=[profile?] dev-haskell/haskell-src-exts:1.21=[profile?] >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?] >=dev-haskell/refact-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.5.0:=[profile?] >=dev-lang/ghc-7.10.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Source code suggestions
+EAPI=7
+HOMEPAGE=https://github.com/ndmitchell/hlint#readme
+IUSE=emacs +gpl doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/extra-1.6.6:=[profile?] dev-haskell/haskell-src-exts:1.21=[profile?] >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?] >=dev-haskell/refact-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.5.0:=[profile?] >=dev-lang/ghc-7.10.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
+SLOT=0/2.1.17
+SRC_URI=https://hackage.haskell.org/package/hlint-2.1.17/hlint-2.1.17.tar.gz
+_eclasses_=elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2098cdc98fc0e87a82bc4154ba4b8931
diff --git a/metadata/md5-cache/dev-haskell/hpack-0.33.0 b/metadata/md5-cache/dev-haskell/hpack-0.33.0
new file mode 100644
index 000000000000..64cca051a08b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hpack-0.33.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.4.3.0:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/cabal-2.2:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/glob-0.9.0:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/infer-license-0.2.0:=[profile?] <dev-haskell/infer-license-0.3:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.10.0:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 >=dev-haskell/hunit-1.6.0.0 dev-haskell/interpolate >=dev-haskell/mockery-0.3 dev-haskell/quickcheck dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An alternative format for Haskell packages
+EAPI=7
+HOMEPAGE=https://github.com/sol/hpack#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.4.3.0:=[profile?] dev-haskell/bifunctors:=[profile?] >=dev-haskell/cabal-2.2:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/glob-0.9.0:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-types:=[profile?] >=dev-haskell/infer-license-0.2.0:=[profile?] <dev-haskell/infer-license-0.3:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.10.0:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.33.0
+SRC_URI=https://hackage.haskell.org/package/hpack-0.33.0/hpack-0.33.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=518fd1e9bf53af59b23823854ffbddd6
diff --git a/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0 b/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
new file mode 100644
index 000000000000..5feeef722fa5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.16 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell bindings to bibutils, the bibliography conversion utilities
+EAPI=7
+HOMEPAGE=https://github.com/wilx/hs-bibutils
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/6.8.0.0
+SRC_URI=https://hackage.haskell.org/package/hs-bibutils-6.8.0.0/hs-bibutils-6.8.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=70bb1242a9673ec4c7e8304ee91ac4dd
diff --git a/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1 b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
new file mode 100644
index 000000000000..8e0bde66e735
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 ) ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Versatile logging framework
+EAPI=7
+HOMEPAGE=https://github.com/hvr/hslogger/wiki
+IUSE=+network-3 doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.3.1.0
+SRC_URI=https://hackage.haskell.org/package/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=27e6df689e006a22d3eb37bd9ff50088
diff --git a/metadata/md5-cache/dev-haskell/hslua-1.0.3.1 b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
new file mode 100644
index 000000000000..a3bfa7f174b2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hslua-1.0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/quickcheck-2.7 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Lua language interpreter embedding in Haskell
+EAPI=6
+HOMEPAGE=https://hslua.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.3.1
+SRC_URI=https://hackage.haskell.org/package/hslua-1.0.3.1/hslua-1.0.3.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=feb68bfe8d471a3c5fe783fb5e553e3f
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
new file mode 100644
index 000000000000..1a9a5a775165
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lua module wrapper around Haskell's System module
+EAPI=7
+HOMEPAGE=https://github.com/hslua/hslua-module-system
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?] >=dev-lang/ghc-8.0.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.1
+SRC_URI=https://hackage.haskell.org/package/hslua-module-system-0.2.1/hslua-module-system-0.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b284423aa34e8e36bea0025564fa998f
diff --git a/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1 b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
new file mode 100644
index 000000000000..92b9cdad17c3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lua module for text
+EAPI=7
+HOMEPAGE=https://github.com/hslua/hslua-module-text
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.1
+SRC_URI=https://hackage.haskell.org/package/hslua-module-text-0.2.1/hslua-module-text-0.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0c7de546a9a151c3badfa79bfb5952e5
diff --git a/metadata/md5-cache/dev-haskell/hspec-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-2.7.1
new file mode 100644
index 000000000000..2575235ee22f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/hspec-core-2.7.1:=[profile?] ~dev-haskell/hspec-discover-2.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=7
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/hspec-core-2.7.1:=[profile?] ~dev-haskell/hspec-discover-2.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/2.7.1
+SRC_URI=https://hackage.haskell.org/package/hspec-2.7.1/hspec-2.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a0e6f3eb973040de975b28c4d2271a0d
diff --git a/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1 b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
new file mode 100644
index 000000000000..b9a616e3ca69
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Contributed functionality for Hspec
+EAPI=7
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hspec-core-2.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.5.1
+SRC_URI=https://hackage.haskell.org/package/hspec-contrib-0.5.1/hspec-contrib-0.5.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f888d708245957c1283ccb35f6ff2133
diff --git a/metadata/md5-cache/dev-haskell/hspec-core-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
new file mode 100644
index 000000000000..56260d3b0ec8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-core-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-meta-2.3.2 >=dev-haskell/silently-1.2.4 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Testing Framework for Haskell
+EAPI=7
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.5:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/clock-0.7.1:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] >=dev-haskell/hunit-1.6:=[profile?] <dev-haskell/hunit-1.7:=[profile?] >=dev-haskell/quickcheck-2.13.1:2=[profile?] >=dev-haskell/quickcheck-io-0.2.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] dev-haskell/tf-random:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/2.7.1
+SRC_URI=https://hackage.haskell.org/package/hspec-core-2.7.1/hspec-core-2.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=787c31005019ed3711af0d020f48b250
diff --git a/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1 b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
new file mode 100644
index 000000000000..e96343ce7336
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/hspec-meta-2.3.2 >=dev-haskell/quickcheck-2.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatically discover and run Hspec tests
+EAPI=7
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.7.1
+SRC_URI=https://hackage.haskell.org/package/hspec-discover-2.7.1/hspec-discover-2.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f1c3867624b9b07654bebb646d38c53d
diff --git a/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2 b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
new file mode 100644
index 000000000000..6554115eaeab
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/call-stack:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hunit-1.5.0.0 dev-haskell/nanospec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Catchy combinators for HUnit
+EAPI=6
+HOMEPAGE=https://github.com/hspec/hspec-expectations#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/call-stack:=[profile?] dev-haskell/hunit:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.2
+SRC_URI=https://hackage.haskell.org/package/hspec-expectations-0.8.2/hspec-expectations-0.8.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8cd32758c8b62855a2eb1706cd7bc47e
diff --git a/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0 b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
new file mode 100644
index 000000000000..2da96c95bebe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A version of Hspec which is used to test Hspec itself
+EAPI=7
+HOMEPAGE=http://hspec.github.io/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/ansi-terminal:=[profile?] dev-haskell/call-stack:=[profile?] dev-haskell/clock:=[profile?] >=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2.12:2=[profile?] dev-haskell/quickcheck-io:=[profile?] dev-haskell/random:=[profile?] dev-haskell/setenv:=[profile?] >=dev-haskell/stm-2.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/2.6.0
+SRC_URI=https://hackage.haskell.org/package/hspec-meta-2.6.0/hspec-meta-2.6.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e3e2128b16828618e94962a6a80d8196
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0 b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
new file mode 100644
index 000000000000..602286ff76da
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/quickcheck-2.13:2= >=dev-haskell/tasty-1.2:= >=dev-haskell/tasty-quickcheck-0.10:= ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure Haskell YAML 1.2 parser
+EAPI=7
+HOMEPAGE=https://github.com/hvr/HsYAML
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.1.0
+SRC_URI=https://hackage.haskell.org/package/HsYAML-0.2.1.0/HsYAML-0.2.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=90ce740f06da41c3d795cb99fe7f22ac
diff --git a/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0 b/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
new file mode 100644
index 000000000000..c88aa291b3bd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=JSON to YAML Adapter
+EAPI=7
+HOMEPAGE=https://github.com/hvr/HsYAML
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0.0
+SRC_URI=https://hackage.haskell.org/package/HsYAML-aeson-0.2.0.0/HsYAML-aeson-0.2.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d1b0a635553eb21d7b0b19b72a9dfa6f
diff --git a/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1 b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
new file mode 100644
index 000000000000..309590a7ca80
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse HTML documents using xml-conduit datatypes
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.3.2.1
+SRC_URI=https://hackage.haskell.org/package/html-conduit-1.3.2.1/html-conduit-1.3.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=da6acd1337de78d1d223d3f9eb46c588
diff --git a/metadata/md5-cache/dev-haskell/http-4000.3.14 b/metadata/md5-cache/dev-haskell/http-4000.3.14
index 8ac75f5d6711..9d7cb08a7c0d 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.3.14
+++ b/metadata/md5-cache/dev-haskell/http-4000.3.14
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5 >=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7 >=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2 >=dev-haskell/split-0.1.3 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A library for client-side HTTP
 EAPI=7
@@ -7,8 +7,8 @@ IUSE=conduit10 +network-uri doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0/4000.3.14
 SRC_URI=https://hackage.haskell.org/package/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d0028d14db09a45498083836ea1be527
+_md5_=ea670444c4edd95669e0a1c64f13ff8f
diff --git a/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1 b/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
new file mode 100644
index 000000000000..7e908864ca26
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8 >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Converting to/from HTTP API data like URL pieces, headers and query parameters
+EAPI=7
+HOMEPAGE=https://github.com/fizruk/http-api-data
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?] >=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.1.1
+SRC_URI=https://hackage.haskell.org/package/http-api-data-0.4.1.1/http-api-data-0.4.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=16e66c4e7acad8dab7309ecc0ab87ff1
diff --git a/metadata/md5-cache/dev-haskell/http-client-0.6.4.1 b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
new file mode 100644
index 000000000000..890b48ec2c4b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-client-0.6.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/memory-0.7:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/async dev-haskell/hspec dev-haskell/monad-control >=dev-haskell/streaming-commons-0.1.1 dev-haskell/zlib !network-uri? ( dev-haskell/network-uri ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An HTTP client engine, intended as a base layer for more user-friendly packages
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/case-insensitive-1.0:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/memory-0.7:=[profile?] dev-haskell/mime-types:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RESTRICT=test
+SLOT=0/0.6.4.1
+SRC_URI=https://hackage.haskell.org/package/http-client-0.6.4.1/http-client-0.6.4.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0a1b4a342b4ace90f7c85669359d9ef9
diff --git a/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3 b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
new file mode 100644
index 000000000000..05536603e5c7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=http-client backend using the connection package and tls library
+EAPI=6
+HOMEPAGE=https://github.com/snoyberg/http-client
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/case-insensitive:=[profile?] >=dev-haskell/connection-0.2.5:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/exceptions:=[profile?] >=dev-haskell/http-client-0.5.0:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/network:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/tls-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.3.5.3
+SRC_URI=https://hackage.haskell.org/package/http-client-tls-0.3.5.3/http-client-tls-0.3.5.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aad30ac0507b68b79e1992bfdc7c9727
diff --git a/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3 b/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
new file mode 100644
index 000000000000..05987452dc76
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/blaze-builder dev-haskell/case-insensitive >=dev-haskell/connection-0.2 dev-haskell/cookie dev-haskell/data-default-class >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons dev-haskell/temporary dev-haskell/text dev-haskell/unliftio dev-haskell/utf8-string >=dev-haskell/wai-3.0 <dev-haskell/wai-3.3 dev-haskell/wai-conduit >=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.4 dev-haskell/warp-tls ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP client package with conduit interface and HTTPS support
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/http-conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] >=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.7:=[profile?] >=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-haskell/void-0.5.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/2.3.7.3
+SRC_URI=https://hackage.haskell.org/package/http-conduit-2.3.7.3/http-conduit-2.3.7.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f2fb352597e773e80f991ffd3dae871
diff --git a/metadata/md5-cache/dev-haskell/http-download-0.2.0.0 b/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
new file mode 100644
index 000000000000..652371e6f7b1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-download-0.2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/retry:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-prettyprint:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/hspec-discover ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Verified downloads with retries
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/http-download#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base64-bytestring:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/retry:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-prettyprint:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=test
+SLOT=0/0.2.0.0
+SRC_URI=https://hackage.haskell.org/package/http-download-0.2.0.0/http-download-0.2.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5fa04488ebbfb9d4dea6456b53e9adca
diff --git a/metadata/md5-cache/dev-haskell/http-types-0.12.3 b/metadata/md5-cache/dev-haskell/http-types-0.12.3
new file mode 100644
index 000000000000..fe17abc4b861
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http-types-0.12.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-1.3 dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic HTTP types for Haskell (for both client and server code)
+EAPI=7
+HOMEPAGE=https://github.com/aristidb/http-types
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/text-0.11.0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.12.3
+SRC_URI=https://hackage.haskell.org/package/http-types-0.12.3/http-types-0.12.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=900591806c9d69401dfb3397873c599b
diff --git a/metadata/md5-cache/dev-haskell/http2-2.0.3 b/metadata/md5-cache/dev-haskell/http2-2.0.3
new file mode 100644
index 000000000000..71bdb63b3bfb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/http2-2.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.1:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson dev-haskell/aeson-pretty dev-haskell/base16-bytestring >=dev-haskell/doctest-0.9.3 >=dev-haskell/glob-0.9 >=dev-haskell/hspec-1.3 dev-haskell/text dev-haskell/unordered-containers dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP/2.0 library including frames and HPACK
+EAPI=7
+HOMEPAGE=https://github.com/kazu-yamamoto/http2
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/case-insensitive:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/network-byte-order-0.1.1:=[profile?] dev-haskell/psqueues:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.3
+SRC_URI=https://hackage.haskell.org/package/http2-2.0.3/http2-2.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=58755d80bdc7cc883c801683931d341c
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
new file mode 100644
index 000000000000..88fc95a7e5f9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( <dev-haskell/network-2.7:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple web-server with an interact style API
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/httpd-shed
+IUSE=buildexamples +network-bsd +network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] >=dev-haskell/network-2.7:=[profile?] ) !network-bsd? ( <dev-haskell/network-2.7:=[profile?] ) network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/network-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
+SLOT=0/0.4.1.1
+SRC_URI=https://hackage.haskell.org/package/httpd-shed-0.4.1.1/httpd-shed-0.4.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f87731db6085e38baab135cb9547977f
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.6.0.0 b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
new file mode 100644
index 000000000000..41b5727289d8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/hunit-1.6.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A unit testing framework for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/hspec/HUnit#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.0.0
+SRC_URI=https://hackage.haskell.org/package/HUnit-1.6.0.0/HUnit-1.6.0.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df91456e08dc07205f22e4726f67f9fe
diff --git a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18 b/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
index bd1b1173d897..339885816879 100644
--- a/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+++ b/metadata/md5-cache/dev-haskell/hxt-9.3.1.18
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] ) >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-uri-2.6:=[profile?] >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A collection of tools for processing XML with Haskell
 EAPI=7
 HOMEPAGE=https://github.com/UweSchmidt/hxt
-IUSE=+network-uri doc hscolour profile
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RDEPEND=>=dev-haskell/hxt-charproperties-9.1:=[profile?] >=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] >=dev-haskell/hxt-unicode-9.0.1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/network-uri-2.6:=[profile?]
 SLOT=0/9.3.1.18
 SRC_URI=https://hackage.haskell.org/package/hxt-9.3.1.18/hxt-9.3.1.18.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4f4d3a4e240c513966c0033ec79d2e53
+_md5_=118a6df1a915e1a42b23adc36891a6e4
diff --git a/metadata/md5-cache/dev-haskell/infer-license-0.2.0 b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
new file mode 100644
index 000000000000..abf53864be97
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/infer-license-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] <dev-haskell/text-metrics-0.4:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Infer software license from a given license file
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/infer-license
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] <dev-haskell/text-metrics-0.4:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.0
+SRC_URI=https://hackage.haskell.org/package/infer-license-0.2.0/infer-license-0.2.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5601f8662ae7b8ccce4a0263a6f414f4
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
new file mode 100644
index 000000000000..09f8d979b6ed
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Integer logarithms
+EAPI=7
+HOMEPAGE=https://github.com/Bodigrim/integer-logarithms
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.0.3
+SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1a5df11a393b417de735b2ffb1fa1f69
diff --git a/metadata/md5-cache/dev-haskell/interpolate-0.2.0 b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
new file mode 100644
index 000000000000..b5548936b0ad
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/interpolate-0.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-src-meta-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/base-compat >=dev-haskell/hspec-1.5 dev-haskell/quickcheck dev-haskell/quickcheck-instances dev-haskell/text ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=String interpolation done right
+EAPI=6
+HOMEPAGE=https://github.com/sol/interpolate#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/haskell-src-meta-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.0
+SRC_URI=https://hackage.haskell.org/package/interpolate-0.2.0/interpolate-0.2.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7a99beee89c3ec063704920311506a57
diff --git a/metadata/md5-cache/dev-haskell/invariant-0.5.3 b/metadata/md5-cache/dev-haskell/invariant-0.5.3
new file mode 100644
index 000000000000..5f9e998cc3c7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/invariant-0.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/th-abstraction-0.2.2:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.8 >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell 98 invariant functors
+EAPI=7
+HOMEPAGE=https://github.com/nfrisby/invariant-functors
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?] >=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/th-abstraction-0.2.2:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.3
+SRC_URI=https://hackage.haskell.org/package/invariant-0.5.3/invariant-0.5.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dc00358ab4d7c06b8d1d2bd16673f1fd
diff --git a/metadata/md5-cache/dev-haskell/ipynb-0.1 b/metadata/md5-cache/dev-haskell/ipynb-0.1
new file mode 100644
index 000000000000..5335d3d995b7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ipynb-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/aeson-diff dev-haskell/microlens dev-haskell/microlens-aeson dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/vector ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Data structure for working with Jupyter notebooks (ipynb)
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/ipynb
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1
+SRC_URI=https://hackage.haskell.org/package/ipynb-0.1/ipynb-0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=68af2f023828c55bab98f76211d9b076
diff --git a/metadata/md5-cache/dev-haskell/iwlib-0.1.0 b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
new file mode 100644
index 000000000000..abc2a821aeea
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/iwlib-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= net-wireless/wireless-tools >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Bindings for the iw C library
+EAPI=6
+HOMEPAGE=https://github.com/jaor/iwlib
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= net-wireless/wireless-tools
+SLOT=0/0.1.0
+SRC_URI=https://hackage.haskell.org/package/iwlib-0.1.0/iwlib-0.1.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a39f90959fcc561cd9f3657e2465ccad
diff --git a/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4 b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
new file mode 100644
index 000000000000..95118eff6df9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parse jira wiki text into an abstract syntax tree
+EAPI=7
+HOMEPAGE=https://github.com/tarleb/jira-wiki-markup
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.1.4
+SRC_URI=https://hackage.haskell.org/package/jira-wiki-markup-1.1.4/jira-wiki-markup-1.1.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2f8e5103c3a8b9d2496733efc0292e9
diff --git a/metadata/md5-cache/dev-haskell/juicypixels-3.3.5 b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
new file mode 100644
index 000000000000..574249b148a9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/juicypixels-3.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)
+EAPI=7
+HOMEPAGE=https://github.com/Twinside/Juicy.Pixels
+IUSE=mmap doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/primitive-0.4:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-8.0.1:=
+SLOT=0/3.3.5
+SRC_URI=https://hackage.haskell.org/package/JuicyPixels-3.3.5/JuicyPixels-3.3.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2c179df30cbf3806be85c3d2c529b7a9
diff --git a/metadata/md5-cache/dev-haskell/kan-extensions-5.2 b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
new file mode 100644
index 000000000000..ab16013f8b0b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/kan-extensions-5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/kan-extensions/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/5.2
+SRC_URI=https://hackage.haskell.org/package/kan-extensions-5.2/kan-extensions-5.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=063f13ef6f49ef77392997e89ef19fa3
diff --git a/metadata/md5-cache/dev-haskell/keys-3.12.3 b/metadata/md5-cache/dev-haskell/keys-3.12.3
new file mode 100644
index 000000000000..11d4f0755f44
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/keys-3.12.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Keyed functors and containers
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/keys/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/3.12.3
+SRC_URI=https://hackage.haskell.org/package/keys-3.12.3/keys-3.12.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8b21845a4eb1f8146565d2c14f0b5581
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.8.3 b/metadata/md5-cache/dev-haskell/language-c-0.8.3
new file mode 100644
index 000000000000..04872767ac4c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/language-c-0.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:= dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Analysis and generation of C code
+EAPI=7
+HOMEPAGE=http://visq.github.io/language-c/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.3
+SRC_URI=https://hackage.haskell.org/package/language-c-0.8.3/language-c-0.8.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2279b21fc579895367be64beba91c83f
diff --git a/metadata/md5-cache/dev-haskell/lens-4.19.1 b/metadata/md5-cache/dev-haskell/lens-4.19.1
new file mode 100644
index 000000000000..b17464cf7874
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lens-4.19.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.3:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/generic-deriving-1.10:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.6 >=dev-haskell/test-framework-hunit-0.2 >=dev-haskell/test-framework-quickcheck2-0.2 >=dev-haskell/test-framework-th-0.2 test-doctests? ( >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 || ( ( >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.12 ) ( >=dev-haskell/doctest-0.13 <dev-haskell/doctest-0.17 ) ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lenses, Folds and Traversals
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/lens/
+IUSE=benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.3:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?] >=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?] >=dev-haskell/generic-deriving-1.10:=[profile?] <dev-haskell/generic-deriving-2:=[profile?] >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/4.19.1
+SRC_URI=https://hackage.haskell.org/package/lens-4.19.1/lens-4.19.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=31f42a30c4d0b12b1ae1e29c2dc7083f
diff --git a/metadata/md5-cache/dev-haskell/lens-aeson-1.1 b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
new file mode 100644
index 000000000000..90857c925d0e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lens-aeson-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/lens-4.4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.11.1.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 dev-haskell/generic-deriving >=dev-haskell/semigroups-0.9 >=dev-haskell/simple-reflect-0.3.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Law-abiding lenses for aeson
+EAPI=7
+HOMEPAGE=https://github.com/lens/lens-aeson/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/lens-4.4:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.11.1.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.1
+SRC_URI=https://hackage.haskell.org/package/lens-aeson-1.1/lens-aeson-1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e54cb722d59c9e80a3d0d4ad3a1953b4
diff --git a/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0 b/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
new file mode 100644
index 000000000000..4ab2bd611575
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.6.3.5:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-1.3 >=dev-haskell/quickcheck-2.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An MPD client library
+EAPI=7
+HOMEPAGE=https://github.com/vimus/libmpd-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.6.3.5:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] >=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.1.0
+SRC_URI=https://hackage.haskell.org/package/libmpd-0.9.1.0/libmpd-0.9.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4c9159f27d614a8fe7a1fe76322ca43f
diff --git a/metadata/md5-cache/dev-haskell/libyaml-0.1.2 b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
new file mode 100644
index 000000000000..ca1466ddede3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/libyaml-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-lang/ghc-8.0.2:= system-libyaml? ( dev-libs/libyaml ) >=dev-haskell/cabal-1.24.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Low-level, streaming YAML interface
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/yaml#readme
+IUSE=no-unicode system-libyaml doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-lang/ghc-8.0.2:= system-libyaml? ( dev-libs/libyaml )
+SLOT=0/0.1.2
+SRC_URI=https://hackage.haskell.org/package/libyaml-0.1.2/libyaml-0.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e3166e0d81337ca727552bde060f73ed
diff --git a/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6 b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
new file mode 100644
index 000000000000..addad14e4560
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/hunit dev-haskell/mtl dev-haskell/tasty <dev-haskell/tasty-expected-failure-0.12 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run lifted IO operations asynchronously and wait for their results
+EAPI=7
+HOMEPAGE=https://github.com/maoe/lifted-async
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[profile?] >=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.10.0.6
+SRC_URI=https://hackage.haskell.org/package/lifted-async-0.10.0.6/lifted-async-0.10.0.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=684614bf1d40dabc9ec927a3600f820f
diff --git a/metadata/md5-cache/dev-haskell/linear-1.20.9 b/metadata/md5-cache/dev-haskell/linear-1.20.9
new file mode 100644
index 000000000000..e07624d10c54
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/linear-1.20.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 >=dev-haskell/hunit-1.2.5 >=dev-haskell/simple-reflect-0.3.1 >=dev-haskell/test-framework-0.8 >=dev-haskell/test-framework-hunit-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Linear Algebra
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/linear/
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?] >=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?] >=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?] >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?] >=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/1.20.9
+SRC_URI=https://hackage.haskell.org/package/linear-1.20.9/linear-1.20.9.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=90984d8dd2a3eda242c0a72760e81ee9
diff --git a/metadata/md5-cache/dev-haskell/listlike-4.6.3 b/metadata/md5-cache/dev-haskell/listlike-4.6.3
new file mode 100644
index 000000000000..6e65892ca05f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/listlike-4.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3 >=dev-haskell/random-1 <dev-haskell/random-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Generic support for list-like structures
+EAPI=7
+HOMEPAGE=https://github.com/ddssff/listlike
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.6.2:=
+RESTRICT=!test? ( test )
+SLOT=0/4.6.3
+SRC_URI=https://hackage.haskell.org/package/ListLike-4.6.3/ListLike-4.6.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d2164fd091e4b8e2f9003a45fe115f82
diff --git a/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1 b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
new file mode 100644
index 000000000000..d906f1d0ecc8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a simple, pure LRU cache
+EAPI=7
+HOMEPAGE=https://github.com/chowells79/lrucache
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.1
+SRC_URI=https://hackage.haskell.org/package/lrucache-1.2.0.1/lrucache-1.2.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8d74e9dc7d6f9205d014ed3b3b1e4466
diff --git a/metadata/md5-cache/dev-haskell/lukko-0.1.1.2 b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
new file mode 100644
index 000000000000..d035597eca2a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/lukko-0.1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3 >=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2 >=dev-haskell/tagged-0.8.5 <dev-haskell/tagged-0.9 >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12 >=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=File locking
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/lukko
+IUSE=+ofd-locking doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.1.2
+SRC_URI=https://hackage.haskell.org/package/lukko-0.1.1.2/lukko-0.1.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c16e9b913654662790d8e501619507df
diff --git a/metadata/md5-cache/dev-haskell/megaparsec-8.0.0 b/metadata/md5-cache/dev-haskell/megaparsec-8.0.0
new file mode 100644
index 000000000000..fc327163d90a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/megaparsec-8.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic parser combinators
+EAPI=7
+HOMEPAGE=https://github.com/mrkkrp/megaparsec
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?] >=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/8.0.0
+SRC_URI=https://hackage.haskell.org/package/megaparsec-8.0.0/megaparsec-8.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd9eb855a749683561b3eae3f8430692
diff --git a/metadata/md5-cache/dev-haskell/memotrie-0.6.10 b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
new file mode 100644
index 000000000000..0cb0edd5d733
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/memotrie-0.6.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/newtype-generics-0.5.3:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Trie-based memo functions
+EAPI=7
+HOMEPAGE=https://github.com/conal/MemoTrie
+IUSE=examples doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/newtype-generics-0.5.3:=[profile?] dev-haskell/void:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.10
+SRC_URI=https://hackage.haskell.org/package/MemoTrie-0.6.10/MemoTrie-0.6.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5a364043e3c6eff1b1a6c9fc800dea9b
diff --git a/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4 b/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
new file mode 100644
index 000000000000..012ea4f4969a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/microlens-0.3:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/tasty-0.10.1.2 >=dev-haskell/tasty-hunit-0.9.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Law-abiding lenses for Aeson, using microlens
+EAPI=7
+HOMEPAGE=https://github.com/fosskers/microlens-aeson/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/microlens-0.3:=[profile?] >=dev-haskell/scientific-0.3.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2.3:=[profile?] >=dev-haskell/vector-0.9:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.3.0.4
+SRC_URI=https://hackage.haskell.org/package/microlens-aeson-2.3.0.4/microlens-aeson-2.3.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=41d5b37ef54ad1288555c51f7e64f1c1
diff --git a/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1 b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
new file mode 100644
index 000000000000..9648b8bde11a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=microlens support for Reader/Writer/State from mtl
+EAPI=7
+HOMEPAGE=https://github.com/monadfix/microlens
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.2.0.1
+SRC_URI=https://hackage.haskell.org/package/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e77043386a26834ee8a5506036fed5ce
diff --git a/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4 b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
new file mode 100644
index 000000000000..9928b92c42c4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatic generation of record lenses for microlens
+EAPI=7
+HOMEPAGE=https://github.com/monadfix/microlens
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?] >=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.3.4
+SRC_URI=https://hackage.haskell.org/package/microlens-th-0.4.3.4/microlens-th-0.4.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5c8e9bc49470d696a9ef38cc9d218110
diff --git a/metadata/md5-cache/dev-haskell/mintty-0.1.2 b/metadata/md5-cache/dev-haskell/mintty-0.1.2
new file mode 100644
index 000000000000..eabdd50ee718
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mintty-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A reliable way to detect the presence of a MinTTY console on Windows
+EAPI=6
+HOMEPAGE=https://github.com/RyanGlScott/mintty
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.2
+SRC_URI=https://hackage.haskell.org/package/mintty-0.1.2/mintty-0.1.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aa840fc4b7f7e1c99fc6500293228c7c
diff --git a/metadata/md5-cache/dev-haskell/missingh-1.4.3.0 b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
new file mode 100644
index 000000000000..78573aa4f8ec
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/missingh-1.4.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4 >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Large utility library
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/MissingH
+IUSE=+network-3 doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?] >=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?] >=dev-lang/ghc-7.4.1:= network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] ) !network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+RESTRICT=test
+SLOT=0/1.4.3.0
+SRC_URI=https://hackage.haskell.org/package/MissingH-1.4.3.0/MissingH-1.4.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a394593a90eccd50ab2675914fd1e07b
diff --git a/metadata/md5-cache/dev-haskell/mmorph-1.1.3 b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
new file mode 100644
index 000000000000..af88baecd30a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mmorph-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad morphisms
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/mmorph
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/1.1.3
+SRC_URI=https://hackage.haskell.org/package/mmorph-1.1.3/mmorph-1.1.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9b9a83d88539695cddd4fcd8c07f5316
diff --git a/metadata/md5-cache/dev-haskell/monad-logger-0.3.32 b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
new file mode 100644
index 000000000000..f64d36171495
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/monad-logger-0.3.32
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A class of monads which can log messages
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/monad-logger#readme
+IUSE=+template-haskell doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.1:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] dev-haskell/monad-loops:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/stm-chans:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.3.32
+SRC_URI=https://hackage.haskell.org/package/monad-logger-0.3.32/monad-logger-0.3.32.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=21db67ceb75c1bca17f019aabe40f4a5
diff --git a/metadata/md5-cache/dev-haskell/monadlib-3.10 b/metadata/md5-cache/dev-haskell/monadlib-3.10
new file mode 100644
index 000000000000..1f89931fade2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/monadlib-3.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A collection of monad transformers
+EAPI=7
+HOMEPAGE=https://wiki.github.com/yav/monadlib
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.0.1:=
+SLOT=0/3.10
+SRC_URI=https://hackage.haskell.org/package/monadLib-3.10/monadLib-3.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5820253652179f3d789b8b074e489794
diff --git a/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1 b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
new file mode 100644
index 000000000000..af81cf0098b8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/foldl dev-haskell/hspec dev-haskell/hunit dev-haskell/quickcheck dev-haskell/semigroups ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type classes for mapping, folding, and traversing monomorphic containers
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/mono-traversable#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/hashable:=[profile?] >=dev-haskell/split-0.2:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/vector-algorithms-0.6:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.15.1
+SRC_URI=https://hackage.haskell.org/package/mono-traversable-1.0.15.1/mono-traversable-1.0.15.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aa092693967821b75bd47ed78f37d25c
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.2 b/metadata/md5-cache/dev-haskell/mtl-2.2.2
new file mode 100644
index 000000000000..f8e47ce7722a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.1:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monad classes, using functional dependencies
+EAPI=7
+HOMEPAGE=https://github.com/haskell/mtl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.1:=
+SLOT=0/2.2.2
+SRC_URI=https://hackage.haskell.org/package/mtl-2.2.2/mtl-2.2.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4420f0235f961b3c51857764bab3d4bf
diff --git a/metadata/md5-cache/dev-haskell/mustache-2.3.1 b/metadata/md5-cache/dev-haskell/mustache-2.3.1
new file mode 100644
index 000000000000..42066643f2ec
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/mustache-2.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-unicode-symbols dev-haskell/hspec dev-haskell/lens dev-haskell/tar dev-haskell/temporary dev-haskell/wreq dev-haskell/zlib ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A mustache template parser library
+EAPI=7
+HOMEPAGE=https://github.com/JustusAdam/mustache
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/cmdargs:=[profile?] dev-haskell/either:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/2.3.1
+SRC_URI=https://hackage.haskell.org/package/mustache-2.3.1/mustache-2.3.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=37761571eaef0ea21cd4e6c2da8f7e91
diff --git a/metadata/md5-cache/dev-haskell/nats-1.1.2 b/metadata/md5-cache/dev-haskell/nats-1.1.2
new file mode 100644
index 000000000000..f80c87d09a24
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/nats-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] ) hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+DESCRIPTION=Natural numbers
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/nats/
+IUSE=+binary +hashable +template-haskell profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] ) hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
+RESTRICT=test
+SLOT=0/1.1.2
+SRC_URI=https://hackage.haskell.org/package/nats-1.1.2/nats-1.1.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=60789e6958f7ac6851dfa1cc8aacd320
diff --git a/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.6 b/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.6
new file mode 100644
index 000000000000..c6dd75331d06
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-9:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.3.22 <dev-haskell/quickcheck-instances-0.4 <dev-haskell/rerebase-2 >=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-2 >=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A quasiquoter for neat and simple multiline text interpolation
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/neat-interpolation
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-9:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.2.6
+SRC_URI=https://hackage.haskell.org/package/neat-interpolation-0.3.2.6/neat-interpolation-0.3.2.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=634a96d7e844717f0d8f613ad81e8404
diff --git a/metadata/md5-cache/dev-haskell/netlink-1.1.1.0 b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
new file mode 100644
index 000000000000..fc3b7b4b441a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/netlink-1.1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= generators? ( <dev-haskell/language-c-0.7:=[profile?] dev-haskell/regex-pcre:=[profile?] ) >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Netlink communication for Haskell
+EAPI=6
+HOMEPAGE=https://github.com/Ongy/netlink-hs
+IUSE=generators doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/monad-loops-0.3:=[profile?] dev-haskell/pretty-hex:=[profile?] >=dev-lang/ghc-7.6.1:= generators? ( <dev-haskell/language-c-0.7:=[profile?] dev-haskell/regex-pcre:=[profile?] )
+SLOT=0/1.1.1.0
+SRC_URI=https://hackage.haskell.org/package/netlink-1.1.1.0/netlink-1.1.1.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=920be4018c6d652dcb60d4e99f3bfee9
diff --git a/metadata/md5-cache/dev-haskell/network-3.0.1.1 b/metadata/md5-cache/dev-haskell/network-3.0.1.1
new file mode 100644
index 000000000000..ee151de0214f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-3.0.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.6 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Low-level networking interface
+EAPI=7
+HOMEPAGE=https://github.com/haskell/network
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=3/3.0.1.1
+SRC_URI=https://hackage.haskell.org/package/network-3.0.1.1/network-3.0.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9facff49dec65da49f624077c6aff985
diff --git a/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0 b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
new file mode 100644
index 000000000000..01c2ec9519ad
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?] >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Network.BSD
+EAPI=7
+HOMEPAGE=https://github.com/haskell/network-bsd
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
+SLOT=0/2.8.1.0
+SRC_URI=https://hackage.haskell.org/package/network-bsd-2.8.1.0/network-bsd-2.8.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54c1fcc147efa576b3c3fcd8c57975d1
diff --git a/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0 b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
new file mode 100644
index 000000000000..465c3fcb9619
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/doctest ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Network byte order utilities
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/network-byte-order
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.4.0
+SRC_URI=https://hackage.haskell.org/package/network-byte-order-0.1.4.0/network-byte-order-0.1.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=810a19b0008ea7621608fc1ce580cbc1
diff --git a/metadata/md5-cache/dev-haskell/network-multicast-0.3.2 b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
new file mode 100644
index 000000000000..65510a16c461
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-multicast-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple multicast library
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/network-multicast
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-haskell/network:=[profile?] dev-haskell/network-bsd:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.2
+SRC_URI=https://hackage.haskell.org/package/network-multicast-0.3.2/network-multicast-0.3.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc6cf86c92d69fe357683a97bb1bb14f
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0 b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
new file mode 100644
index 000000000000..25c31c7c40ed
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=URI manipulation
+EAPI=7
+HOMEPAGE=https://github.com/haskell/network-uri
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.6.3.0
+SRC_URI=https://hackage.haskell.org/package/network-uri-2.6.3.0/network-uri-2.6.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=50469135c34afac1cd1dfd6a41935a04
diff --git a/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4 b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
new file mode 100644
index 000000000000..c672b4828a05
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A typeclass for working with newtypes, with generics support
+EAPI=7
+HOMEPAGE=https://github.com/sjakobi/newtype-generics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.4
+SRC_URI=https://hackage.haskell.org/package/newtype-generics-0.5.4/newtype-generics-0.5.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a19ed884217083ada7ba077531c32156
diff --git a/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1 b/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
new file mode 100644
index 000000000000..4d2c80f2f6da
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding for the OpenGL graphics system
+EAPI=7
+HOMEPAGE=https://wiki.haskell.org/OpenGL
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?] >=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?] >=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/3.0.3.0
+SRC_URI=https://hackage.haskell.org/package/OpenGL-3.0.3.0/OpenGL-3.0.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=587a0d420beeb8ca190b3eb3de92e1d1
diff --git a/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0 b/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
new file mode 100644
index 000000000000..2dddc129ad4e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?] >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/opengl >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A raw binding for the OpenGL graphics system
+EAPI=7
+HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?] >=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?] >=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= virtual/opengl
+SLOT=0/3.3.4.0
+SRC_URI=https://hackage.haskell.org/package/OpenGLRaw-3.3.4.0/OpenGLRaw-3.3.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c801f9318448888e7ca2df151cf05c19
diff --git a/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0 b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
new file mode 100644
index 000000000000..4a49c46e2eca
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Utilities and combinators for parsing command line options
+EAPI=7
+HOMEPAGE=https://github.com/pcapriotti/optparse-applicative
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.15.1.0
+SRC_URI=https://hackage.haskell.org/package/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a8fcea588cdcfa3b2b62d7aa5f912be0
diff --git a/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.2 b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.2
new file mode 100644
index 000000000000..9f2001e16ff1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/githash-0.1.3.0:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple interface to optparse-applicative
+EAPI=7
+HOMEPAGE=https://github.com/fpco/optparse-simple#readme
+IUSE=build-example doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/githash-0.1.3.0:=[profile?] dev-haskell/optparse-applicative:=[profile?] >=dev-lang/ghc-8.0.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.1.2
+SRC_URI=https://hackage.haskell.org/package/optparse-simple-0.1.1.2/optparse-simple-0.1.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7570d5aa9827dd945013f98ccc09ef3e
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
new file mode 100644
index 000000000000..c2ea07ffc830
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/hsyaml-aeson-0.2:=[profile?] <dev-haskell/hsyaml-aeson-0.3:=[profile?] dev-haskell/libyaml:=[profile?] dev-haskell/mtl:=[profile?] <dev-haskell/network-3.2:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-6.4:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] ) unicode-collation? ( dev-haskell/text-icu:=[profile?] ) !unicode-collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( >=dev-haskell/temporary-1.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Supports using pandoc with citeproc
+EAPI=7
+HOMEPAGE=https://github.com/jgm/pandoc-citeproc
+IUSE=+bibutils debug embed-data-files static unicode-collation doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] >=dev-haskell/base-compat-0.9:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?] >=dev-haskell/hsyaml-aeson-0.2:=[profile?] <dev-haskell/hsyaml-aeson-0.3:=[profile?] dev-haskell/libyaml:=[profile?] dev-haskell/mtl:=[profile?] <dev-haskell/network-3.2:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/safe:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?] >=dev-haskell/yaml-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-6.4:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] ) unicode-collation? ( dev-haskell/text-icu:=[profile?] ) !unicode-collation? ( dev-haskell/rfc5051:=[profile?] )
+RESTRICT=test
+SLOT=0/0.17.0.1
+SRC_URI=https://hackage.haskell.org/package/pandoc-citeproc-0.17.0.1/pandoc-citeproc-0.17.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b1f555b8835992f19da460379cf1ed50
diff --git a/metadata/md5-cache/dev-haskell/pandoc-types-1.20 b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
new file mode 100644
index 000000000000..c609f1d80f32
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pandoc-types-1.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/string-qq-0.0.2 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Types for representing a structured document
+EAPI=7
+HOMEPAGE=https://pandoc.org/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.20
+SRC_URI=https://hackage.haskell.org/package/pandoc-types-1.20/pandoc-types-1.20.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=96d62af53106755adfcc493b615673ad
diff --git a/metadata/md5-cache/dev-haskell/pantry-0.4.0.1 b/metadata/md5-cache/dev-haskell/pantry-0.4.0.1
new file mode 100644
index 000000000000..4af8b69073c1
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pantry-0.4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.1:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/exceptions dev-haskell/hedgehog dev-haskell/hspec dev-haskell/quickcheck dev-haskell/raw-strings-qq ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Content addressable Haskell package management
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/pantry#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.1:=[profile?] dev-haskell/casa-client:=[profile?] dev-haskell/casa-types:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/cryptonite-conduit:=[profile?] dev-haskell/digest:=[profile?] dev-haskell/filelock:=[profile?] dev-haskell/generic-deriving:=[profile?] dev-haskell/hackage-security:=[profile?] >=dev-haskell/hpack-0.31.2:=[profile?] dev-haskell/http-client:=[profile?] dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-download:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/network-uri:=[profile?] dev-haskell/path:=[profile?] dev-haskell/path-io:=[profile?] dev-haskell/persistent:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] dev-haskell/persistent-template:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/rio-orphans:=[profile?] dev-haskell/rio-prettyprint:=[profile?] dev-haskell/tar-conduit:=[profile?] dev-haskell/text:=[profile?] dev-haskell/text-metrics:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] dev-haskell/yaml:=[profile?] dev-haskell/zip-archive:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=test
+SLOT=0/0.4.0.1
+SRC_URI=https://hackage.haskell.org/package/pantry-0.4.0.1/pantry-0.4.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2bd2eefd78acfadaeac1566e987f36ed
diff --git a/metadata/md5-cache/dev-haskell/parallel-3.2.2.0 b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
new file mode 100644
index 000000000000..629013da8c5c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parallel-3.2.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parallel programming library
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/parallel
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=3/3.2.2.0
+SRC_URI=https://hackage.haskell.org/package/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3409dffb91e139e1881fd61f72e00178
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.14.0 b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
new file mode 100644
index 000000000000..87508f9baa4b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.14.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Monadic parser combinators
+EAPI=7
+HOMEPAGE=https://github.com/haskell/parsec
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+RESTRICT=test
+SLOT=0/3.1.14.0
+SRC_URI=https://hackage.haskell.org/package/parsec-3.1.14.0/parsec-3.1.14.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2748c9ce019c69b72d88f9d4e214858f
diff --git a/metadata/md5-cache/dev-haskell/parsers-0.12.10 b/metadata/md5-cache/dev-haskell/parsers-0.12.10
new file mode 100644
index 000000000000..622928658702
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/parsers-0.12.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] ) parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/quickcheck dev-haskell/quickcheck-instances ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing combinators
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/parsers/
+IUSE=+attoparsec +parsec doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] ) parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.12.10
+SRC_URI=https://hackage.haskell.org/package/parsers-0.12.10/parsers-0.12.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7325cd397b9fea9285eda2aa7fb05a13
diff --git a/metadata/md5-cache/dev-haskell/path-0.7.0 b/metadata/md5-cache/dev-haskell/path-0.7.0
new file mode 100644
index 000000000000..c8f136bc1fa8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/genvalidity-0.8 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 dev-haskell/quickcheck >=dev-haskell/validity-0.8.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for well-typed paths
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/path
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.7.0
+SRC_URI=https://hackage.haskell.org/package/path-0.7.0/path-0.7.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=73a325658592b394f8aced22d0e706b1
diff --git a/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1 b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
new file mode 100644
index 000000000000..3f6d25544f11
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.6.1:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Interface to 'directory' package for users of 'path'
+EAPI=7
+HOMEPAGE=https://github.com/mrkkrp/path-io
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/path-0.6:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?] dev-haskell/unix-compat:=[profile?] >=dev-lang/ghc-8.6.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.0
+SRC_URI=https://hackage.haskell.org/package/path-io-1.6.0/path-io-1.6.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88cb3413d7f49d0ec6c551e276068d62
diff --git a/metadata/md5-cache/dev-haskell/patience-0.1.1-r1 b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
new file mode 100644
index 000000000000..351cf7ddbb40
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/patience-0.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Patience diff and longest increasing subsequence
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/patience
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.1
+SRC_URI=https://hackage.haskell.org/package/patience-0.1.1/patience-0.1.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=42e48f3a391748a2f977326e86dfa7b7
diff --git a/metadata/md5-cache/dev-haskell/persistent-2.10.5.2 b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
new file mode 100644
index 000000000000..e1b857a29ffb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/persistent-2.10.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/fast-logger-2.4:=[profile?] >=dev-haskell/http-api-data-0.3:=[profile?] >=dev-haskell/monad-logger-0.3.28:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/resource-pool-0.2.3:=[profile?] >=dev-haskell/resourcet-1.1.10:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/hspec-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, multi-backend data serialization
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/persistent
+IUSE=nooverlap doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/fast-logger-2.4:=[profile?] >=dev-haskell/http-api-data-0.3:=[profile?] >=dev-haskell/monad-logger-0.3.28:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] >=dev-haskell/resource-pool-0.2.3:=[profile?] >=dev-haskell/resourcet-1.1.10:=[profile?] dev-haskell/scientific:=[profile?] dev-haskell/silently:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.10.5.2
+SRC_URI=https://hackage.haskell.org/package/persistent-2.10.5.2/persistent-2.10.5.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=07a17939e2c14cd1a0d32b419f3f2760
diff --git a/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2 b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
new file mode 100644
index 000000000000..8f146834c204
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:= virtual/libc >=dev-db/sqlite-3.0 >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/exceptions dev-haskell/fast-logger >=dev-haskell/hspec-2.4 dev-haskell/hunit dev-haskell/persistent-template dev-haskell/persistent-test dev-haskell/quickcheck dev-haskell/system-fileio dev-haskell/system-filepath dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Backend for the persistent library using sqlite3
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/persistent
+IUSE=build-sanity-exe doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/microlens-th-0.4.1.1:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-1.1.9:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:= virtual/libc >=dev-db/sqlite-3.0
+RESTRICT=!test? ( test )
+SLOT=0/2.10.6.2
+SRC_URI=https://hackage.haskell.org/package/persistent-sqlite-2.10.6.2/persistent-sqlite-2.10.6.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=129eaad443aedc2fc4d1426e3fb35d71
diff --git a/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3 b/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
new file mode 100644
index 000000000000..7e3c97e94e51
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/http-api-data-0.3.7:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-2.4 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type-safe, non-relational, multi-backend persistence
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/persistent
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/http-api-data-0.3.7:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/path-pieces:=[profile?] >=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/2.8.2.3
+SRC_URI=https://hackage.haskell.org/package/persistent-template-2.8.2.3/persistent-template-2.8.2.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=04e8bcbfc13ef4449458edc93e28761e
diff --git a/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0 b/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
new file mode 100644
index 000000000000..7adbad98db0a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] >=dev-haskell/hspec-2.4:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/persistent-template:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tests for Persistent
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/persistent
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/conduit-1.2.12:=[profile?] >=dev-haskell/exceptions-0.8:=[profile?] >=dev-haskell/hspec-2.4:=[profile?] dev-haskell/hspec-expectations:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/monad-control:=[profile?] >=dev-haskell/monad-logger-0.3.25:=[profile?] >=dev-haskell/path-pieces-0.2:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/persistent-template:=[profile?] >=dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/quickcheck-instances-0.3:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] dev-haskell/transformers-base:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-8.0.1:=
+SLOT=0/2.0.3.0
+SRC_URI=https://hackage.haskell.org/package/persistent-test-2.0.3.0/persistent-test-2.0.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a255e937a5ce8be10b314089c806f3d3
diff --git a/metadata/md5-cache/dev-haskell/polyparse-1.13 b/metadata/md5-cache/dev-haskell/polyparse-1.13
new file mode 100644
index 000000000000..5d8016169cbc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/polyparse-1.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A variety of alternative parser combinator libraries
+EAPI=7
+HOMEPAGE=http://code.haskell.org/~malcolm/polyparse/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.13
+SRC_URI=https://hackage.haskell.org/package/polyparse-1.13/polyparse-1.13.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ff24bceb35f5647c9dba9f40c7e1981
diff --git a/metadata/md5-cache/dev-haskell/pretty-show-1.9.5 b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
new file mode 100644
index 000000000000..40d122329620
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/pretty-show-1.9.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 dev-haskell/happy doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Tools for working with derived 'Show' instances and generic inspection of values
+EAPI=7
+HOMEPAGE=https://wiki.github.com/yav/pretty-show
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.9.5
+SRC_URI=https://hackage.haskell.org/package/pretty-show-1.9.5/pretty-show-1.9.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6d054d740d1eb68eabdca5e6eb598cd2
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1 b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
new file mode 100644
index 000000000000..0d4097c7a0ab
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/pgp-wordlist-0.1 >=dev-haskell/quickcheck-instances-0.3 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A modern, easy to use, well-documented, extensible pretty-printer
+EAPI=7
+HOMEPAGE=https://github.com/quchen/prettyprinter
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/semigroups-0.16.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.1
+SRC_URI=https://hackage.haskell.org/package/prettyprinter-1.6.1/prettyprinter-1.6.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eecc138762e9096d1999dd390e5d0d1d
diff --git a/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2 b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
new file mode 100644
index 000000000000..ff74d1d7ac6f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinter-1.1.1:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=ANSI terminal backend for the "prettyprinter" package
+EAPI=6
+HOMEPAGE=https://github.com/quchen/prettyprinter
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/prettyprinter-1.1.1:=[profile?] >=dev-haskell/semigroups-0.1:=[profile?] >=dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.1.1.2
+SRC_URI=https://hackage.haskell.org/package/prettyprinter-ansi-terminal-1.1.1.2/prettyprinter-ansi-terminal-1.1.1.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=89e2ecfadfb9474a6ff635f49edd40ae
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.7.1.0 b/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
new file mode 100644
index 000000000000..3d8da185982b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/primitive-0.7.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Primitive memory-related operations
+EAPI=7
+HOMEPAGE=https://github.com/haskell/primitive
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/0.7.1.0
+SRC_URI=https://hackage.haskell.org/package/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc642888864976841f04595007591981
diff --git a/metadata/md5-cache/dev-haskell/profunctors-5.5.1 b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
new file mode 100644
index 000000000000..764196f0808e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/profunctors-5.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell98 profunctors package
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/profunctors/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/5.5.1
+SRC_URI=https://hackage.haskell.org/package/profunctors-5.5.1/profunctors-5.5.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e742f963f97700d5416bc6702421a958
diff --git a/metadata/md5-cache/dev-haskell/project-template-0.2.0.1 b/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
new file mode 100644
index 000000000000..0dd9a004150e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/project-template-0.2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Specify Haskell project templates and generate files
+EAPI=6
+HOMEPAGE=https://github.com/fpco/haskell-ide
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-0.4.3:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.0.1
+SRC_URI=https://hackage.haskell.org/package/project-template-0.2.0.1/project-template-0.2.0.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=00d934e6a814595b7e5e5ef0846fade6
diff --git a/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2 b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
new file mode 100644
index 000000000000..00c12f75e9a4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 dev-haskell/tagged >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure priority search queues
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/psqueues
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.7.2
+SRC_URI=https://hackage.haskell.org/package/psqueues-0.2.7.2/psqueues-0.2.7.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f0ef29faf4c5a77ebc99814181ccd64b
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.13.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
new file mode 100644
index 000000000000..3456380eb89a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Automatic testing of Haskell programs
+EAPI=7
+HOMEPAGE=https://github.com/nick8325/quickcheck
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=2/2.13.2
+SRC_URI=https://hackage.haskell.org/package/QuickCheck-2.13.2/QuickCheck-2.13.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7d55758f6bd509697ce0bfe6a7f19c50
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22 b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
new file mode 100644
index 000000000000..2e5736b90d40
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common quickcheck instances
+EAPI=7
+HOMEPAGE=https://github.com/phadej/qc-instances
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?] >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.22
+SRC_URI=https://hackage.haskell.org/package/quickcheck-instances-0.3.22/quickcheck-instances-0.3.22.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fe1e3479593a777a6d4bd8c165836914
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0 b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
new file mode 100644
index 000000000000..4ba082705b43
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Use HUnit assertions as QuickCheck properties
+EAPI=6
+HOMEPAGE=https://github.com/hspec/quickcheck-io#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/hunit-1.2.5:=[profile?] >=dev-haskell/quickcheck-2.7:2=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.2.0
+SRC_URI=https://hackage.haskell.org/package/quickcheck-io-0.2.0/quickcheck-io-0.2.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fa064b825f519219e8f2c782b585cb77
diff --git a/metadata/md5-cache/dev-haskell/rebase-1.4.1 b/metadata/md5-cache/dev-haskell/rebase-1.4.1
new file mode 100644
index 000000000000..8b49ff8b7086
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rebase-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?] >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A more progressive alternative to the 'base' package
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/rebase
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/base-prelude-0.1:=[profile?] <dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/contravariant-extras-0.3.2:=[profile?] <dev-haskell/contravariant-extras-0.4:=[profile?] >=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?] >=dev-haskell/either-5:=[profile?] <dev-haskell/either-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?] >=dev-haskell/hashable-1:=[profile?] <dev-haskell/hashable-2:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?] >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/selective-0.3:=[profile?] <dev-haskell/selective-0.4:=[profile?] >=dev-haskell/semigroupoids-5.2.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/stm-2:=[profile?] <dev-haskell/stm-3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-1:=[profile?] <dev-haskell/uuid-2:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/1.4.1
+SRC_URI=https://hackage.haskell.org/package/rebase-1.4.1/rebase-1.4.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=02e4a427a90bbc027d8b7ff82cb5a15b
diff --git a/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1 b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
index 77bbd15a7177..8425fa9fedf8 100644
--- a/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
+++ b/metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=regex-applicative on text
 EAPI=6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-appli
 SLOT=0/0.1.0.1
 SRC_URI=https://hackage.haskell.org/package/regex-applicative-text-0.1.0.1/regex-applicative-text-0.1.0.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8570dae8a79f131ddbd043e9f0a14fdf
+_md5_=0f6af008cb830fb9fa94613ec207a052
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0 b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
new file mode 100644
index 000000000000..0f25629b29b6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=7
+HOMEPAGE=https://wiki.haskell.org/Regular_expressions
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.94.0.0
+SRC_URI=https://hackage.haskell.org/package/regex-base-0.94.0.0/regex-base-0.94.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3c4b691bd17db20ba6ddf1426ecde4fe
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
new file mode 100644
index 000000000000..84c78c779310
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/regex-compat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/regex-posix-0.96:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.95.2.0
+SRC_URI=https://hackage.haskell.org/package/regex-compat-0.95.2.0/regex-compat-0.95.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e6431a9e59e3b9c0c9e975c887e010d
diff --git a/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0 b/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
new file mode 100644
index 000000000000..8fbb3ec9112f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libpcre >=dev-haskell/cabal-1.12 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/regex-pcre
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:= dev-libs/libpcre
+SLOT=0/0.95.0.0
+SRC_URI=https://hackage.haskell.org/package/regex-pcre-0.95.0.0/regex-pcre-0.95.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10512e97821f397f5b781ecef0fdb675
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0 b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
new file mode 100644
index 000000000000..04848c8ed0aa
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/regex-posix
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.96.0.0
+SRC_URI=https://hackage.haskell.org/package/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a78e0a3d846bbaa487714df1ba12e45d
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0 b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
new file mode 100644
index 000000000000..75b00373a8bd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/cabal-1.12 test? ( dev-haskell/semigroups >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Replaces/Enhances Text.Regex
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/regex-tdfa
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?] >=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
+RESTRICT=!test? ( test )
+SLOT=0/1.3.1.0
+SRC_URI=https://hackage.haskell.org/package/regex-tdfa-1.3.1.0/regex-tdfa-1.3.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f33ad91f18e5c2f796f1edd935f244d
diff --git a/metadata/md5-cache/dev-haskell/rerebase-1.4.1 b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
new file mode 100644
index 000000000000..ecd03893e660
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rerebase-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Reexports from 'base' with a bunch of other standard libraries
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/rerebase
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=~dev-haskell/rebase-1.4.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.4.1
+SRC_URI=https://hackage.haskell.org/package/rerebase-1.4.1/rerebase-1.4.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d008214c84b5b714711178bdeec572f9
diff --git a/metadata/md5-cache/dev-haskell/resolv-0.1.2.0 b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
new file mode 100644
index 000000000000..1d468f04487c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/resolv-0.1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-2.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Domain Name Service (DNS) lookup via the libresolv standard library routines
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/resolv
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/0.1.2.0
+SRC_URI=https://hackage.haskell.org/package/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b961d740c0230b82afa43e336ed05440
diff --git a/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2 b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
new file mode 100644
index 000000000000..ca4f84e38a23
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/exceptions >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Deterministic allocation and freeing of scarce resources
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/conduit
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+RESTRICT=!test? ( test )
+SLOT=0/1.2.4.2
+SRC_URI=https://hackage.haskell.org/package/resourcet-1.2.4.2/resourcet-1.2.4.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=368e9e2756e47263177bd99ab6b86b3e
diff --git a/metadata/md5-cache/dev-haskell/retry-0.8.1.1 b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
new file mode 100644
index 000000000000..5316a2cdf2fe
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/retry-0.8.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hedgehog >=dev-haskell/hunit-1.2.5.2 dev-haskell/mtl dev-haskell/stm dev-haskell/tasty dev-haskell/tasty-hedgehog dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Retry combinators for monadic actions that may fail
+EAPI=7
+HOMEPAGE=https://github.com/Soostone/retry
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.5:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.1.1
+SRC_URI=https://hackage.haskell.org/package/retry-0.8.1.1/retry-0.8.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd88c79585591c0cbad9dbf773de404c
diff --git a/metadata/md5-cache/dev-haskell/rio-0.1.17.0 b/metadata/md5-cache/dev-haskell/rio-0.1.17.0
new file mode 100644
index 000000000000..1cd79f15ffbb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rio-0.1.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A standard library for Haskell
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/rio#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/microlens:=[profile?] dev-haskell/microlens-mtl:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/primitive:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/typed-process-0.2.5.0:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.17.0
+SRC_URI=https://hackage.haskell.org/package/rio-0.1.17.0/rio-0.1.17.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb9fd1e558447b6cde9b368faedf16ad
diff --git a/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0 b/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
new file mode 100644
index 000000000000..7db93284578e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Orphan instances for the RIO type in the rio package
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/rio#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/exceptions:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/monad-control:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/rio:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.1.0
+SRC_URI=https://hackage.haskell.org/package/rio-orphans-0.1.1.0/rio-orphans-0.1.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=35addf4110708179984393ee5df525d3
diff --git a/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.0.0 b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.0.0
new file mode 100644
index 000000000000..26aa366d2b94
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.2.4.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/cabal-2.4.0.1:=[profile?] >=dev-haskell/colour-2.3.4:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pretty-printing for RIO
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/stack#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.2.4.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/cabal-2.4.0.1:=[profile?] >=dev-haskell/colour-2.3.4:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/rio-0.1.9.2:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/0.1.0.0
+SRC_URI=https://hackage.haskell.org/package/rio-prettyprint-0.1.0.0/rio-prettyprint-0.1.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=70598bc4967c6018a72f7cdce0265cb7
diff --git a/metadata/md5-cache/dev-haskell/rsa-2.3.1 b/metadata/md5-cache/dev-haskell/rsa-2.3.1
new file mode 100644
index 000000000000..f77bbc0de704
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/rsa-2.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?] >=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/crypto-pubkey-types-0.4 <dev-haskell/crypto-pubkey-types-0.6 >=dev-haskell/drbg-0.5.2 <dev-haskell/drbg-0.7 >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 >=dev-haskell/tagged-0.2 <dev-haskell/tagged-0.9 >=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.10 >=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-0.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Implementation of RSA, using the padding schemes of PKCS#1 v2.1
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/RSA
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?] >=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?] >=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/2.3.1
+SRC_URI=https://hackage.haskell.org/package/RSA-2.3.1/RSA-2.3.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0565c2189e38817d4605a69b197b9386
diff --git a/metadata/md5-cache/dev-haskell/sandi-0.5 b/metadata/md5-cache/dev-haskell/sandi-0.5
new file mode 100644
index 000000000000..cd38d1186f91
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/sandi-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck dev-haskell/tasty-th ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Data encoding library
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/sandi
+IUSE=+conduit doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= conduit? ( >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/exceptions:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.5
+SRC_URI=https://hackage.haskell.org/package/sandi-0.5/sandi-0.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a76ab6e96233f8a6dba6d29d70c9ee03
diff --git a/metadata/md5-cache/dev-haskell/scientific-0.3.6.2 b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
new file mode 100644
index 000000000000..535d9466a283
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/scientific-0.3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] >=dev-haskell/integer-logarithms-1:=[profile?] >=dev-haskell/primitive-0.1:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Numbers represented using scientific notation
+EAPI=7
+HOMEPAGE=https://github.com/basvandijk/scientific
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/hashable-1.1.2:=[profile?] >=dev-haskell/integer-logarithms-1:=[profile?] >=dev-haskell/primitive-0.1:=[profile?] >=dev-haskell/text-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.3.6.2
+SRC_URI=https://hackage.haskell.org/package/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0bb216be144ca46ba56a3dc9a5893e81
diff --git a/metadata/md5-cache/dev-haskell/selective-0.3 b/metadata/md5-cache/dev-haskell/selective-0.3
new file mode 100644
index 000000000000..6213479e1e74
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/selective-0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/mtl-2.2.1 <dev-haskell/mtl-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 >=dev-haskell/tasty-0.11 >=dev-haskell/tasty-expected-failure-0.11 >=dev-haskell/tasty-quickcheck-0.8.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Selective applicative functors
+EAPI=7
+HOMEPAGE=https://github.com/snowleopard/selective
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://hackage.haskell.org/package/selective-0.3/selective-0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=970af3d67ad33c267c7633479114b4f0
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
new file mode 100644
index 000000000000..4cedb5cc821b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+IUSE=+comonad +containers +contravariant +distributive +tagged +unordered-containers doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
+RESTRICT=test
+SLOT=0/5.3.4
+SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.4/semigroupoids-5.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0fa89d432a58783a22283f7ab0390ee7
diff --git a/metadata/md5-cache/dev-haskell/semigroups-0.18.5 b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
new file mode 100644
index 000000000000..21df229145b7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/semigroups-0.18.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Anything that associates
+EAPI=6
+HOMEPAGE=https://github.com/ekmett/semigroups/
+IUSE=+binary +transformers doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?] >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
+SLOT=0/0.18.5
+SRC_URI=https://hackage.haskell.org/package/semigroups-0.18.5/semigroups-0.18.5.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=336024fdceebbe1f1aee9c8740f58b3f
diff --git a/metadata/md5-cache/dev-haskell/shelly-1.9.0 b/metadata/md5-cache/dev-haskell/shelly-1.9.0
new file mode 100644
index 000000000000..e217ce265a0c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/shelly-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-haskell/cabal-1.24.2.0 test? ( >=dev-haskell/hspec-2.0 dev-haskell/hspec-contrib >=dev-haskell/hunit-1.2 >=dev-haskell/text-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=shell-like (systems) programming in Haskell
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/Shelly.hs
+IUSE=examples lifted doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/enclosed-exceptions:=[profile?] >=dev-haskell/exceptions-0.6:=[profile?] dev-haskell/lifted-async:=[profile?] dev-haskell/lifted-base:=[profile?] >=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers-base:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-lang/ghc-8.0.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.9.0
+SRC_URI=https://hackage.haskell.org/package/shelly-1.9.0/shelly-1.9.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a9af7570a43492288a32485e5d5e63f2
diff --git a/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1 b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
new file mode 100644
index 000000000000..c5212b31cda0
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/dec-0.0.3 <dev-haskell/dec-0.1 >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type level booleans
+EAPI=7
+HOMEPAGE=https://github.com/phadej/singleton-bool#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/dec-0.0.3 <dev-haskell/dec-0.1
+SLOT=0/0.1.5
+SRC_URI=https://hackage.haskell.org/package/singleton-bool-0.1.5/singleton-bool-0.1.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=15bb456a320ae2e1f93282236aa7fac1
diff --git a/metadata/md5-cache/dev-haskell/skylighting-0.8.5 b/metadata/md5-cache/dev-haskell/skylighting-0.8.5
new file mode 100644
index 000000000000..6bc24ee64bd3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/skylighting-0.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=syntax highlighting library
+EAPI=7
+HOMEPAGE=https://github.com/jgm/skylighting
+IUSE=executable doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-haskell/skylighting-core-0.8.5:=[profile?] >=dev-lang/ghc-7.10.1:= executable? ( >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/pretty-show:=[profile?] dev-haskell/text:=[profile?] )
+SLOT=0/0.8.5
+SRC_URI=https://hackage.haskell.org/package/skylighting-0.8.5/skylighting-0.8.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cebaaa0058af933f31dd71cbb7872c77
diff --git a/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5 b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
new file mode 100644
index 000000000000..3a97be01364b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/diff dev-haskell/hunit dev-haskell/pretty-show dev-haskell/quickcheck dev-haskell/random dev-haskell/tasty dev-haskell/tasty-golden dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=syntax highlighting library
+EAPI=7
+HOMEPAGE=https://github.com/jgm/skylighting
+IUSE=executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] >=dev-haskell/ansi-terminal-0.7:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] dev-haskell/case-insensitive:=[profile?] >=dev-haskell/colour-2.0:=[profile?] dev-haskell/hxt:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/regex-pcre:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.5
+SRC_URI=https://hackage.haskell.org/package/skylighting-core-0.8.5/skylighting-core-0.8.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2b5e7a62fc9ad4fea866b1352d8adc4f
diff --git a/metadata/md5-cache/dev-haskell/socks-0.6.1 b/metadata/md5-cache/dev-haskell/socks-0.6.1
new file mode 100644
index 000000000000..0c8d0ae7732f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/socks-0.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Socks proxy (version 5) implementation
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-socks
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/basement:=[profile?] >=dev-haskell/cereal-0.3.1:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.6.1
+SRC_URI=https://hackage.haskell.org/package/socks-0.6.1/socks-0.6.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=04d2eb21259f26538e4f62f10fe53193
diff --git a/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1 b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
new file mode 100644
index 000000000000..81eb1e03d840
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=True Sums of Products
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/sop-core
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.0.1:=
+SLOT=0/0.5.0.1
+SRC_URI=https://hackage.haskell.org/package/sop-core-0.5.0.1/sop-core-0.5.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=48ef9d32b29d3a56e8fb4114780cae6c
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.4 b/metadata/md5-cache/dev-haskell/split-0.2.3.4
new file mode 100644
index 000000000000..af5bfb9944be
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Combinator library for splitting lists
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/split
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.3.4
+SRC_URI=https://hackage.haskell.org/package/split-0.2.3.4/split-0.2.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c35dd9d4df477c6a946cd67c0100e3c9
diff --git a/metadata/md5-cache/dev-haskell/splitmix-0.0.4 b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
new file mode 100644
index 000000000000..9c030cb77bbc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/splitmix-0.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Fast Splittable PRNG
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/splitmix
+IUSE=optimised-mixer +random doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
+RESTRICT=test
+SLOT=0/0.0.4
+SRC_URI=https://hackage.haskell.org/package/splitmix-0.0.4/splitmix-0.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=22554bc7263a9df903bb228d8642257f
diff --git a/metadata/md5-cache/dev-haskell/stack-2.3.1 b/metadata/md5-cache/dev-haskell/stack-2.3.1
new file mode 100644
index 000000000000..1b6a894a0600
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/stack-2.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9.1:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] >=dev-haskell/attoparsec-0.13.2.3:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.3:=[profile?] >=dev-haskell/cabal-3.0.0.0:=[profile?] >=dev-haskell/casa-client-0.0.1:=[profile?] >=dev-haskell/casa-types-0.0.1:=[profile?] >=dev-haskell/colour-2.3.5:=[profile?] >=dev-haskell/conduit-1.3.1.2:=[profile?] >=dev-haskell/conduit-extra-1.3.4:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] >=dev-haskell/cryptonite-conduit-0.2.2:=[profile?] >=dev-haskell/echo-0.1.3:=[profile?] >=dev-haskell/exceptions-0.10.4:=[profile?] >=dev-haskell/extra-1.6.19:=[profile?] >=dev-haskell/file-embed-0.0.11.1:=[profile?] >=dev-haskell/filelock-0.1.1.4:=[profile?] >=dev-haskell/fsnotify-0.3.0.1:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] >=dev-haskell/githash-0.1.3.3:=[profile?] >=dev-haskell/hackage-security-0.5.3.0:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/hi-file-parser-0.1.0.0:=[profile?] >=dev-haskell/hpack-0.33.0:=[profile?] >=dev-haskell/http-client-0.6.4:=[profile?] >=dev-haskell/http-client-tls-0.3.5.3:=[profile?] >=dev-haskell/http-conduit-2.3.7.3:=[profile?] >=dev-haskell/http-download-0.2.0.0:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-haskell/microlens-0.4.10:=[profile?] >=dev-haskell/mintty-0.1.2:=[profile?] >=dev-haskell/mono-traversable-1.0.15.1:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/mustache-2.3.1:=[profile?] >=dev-haskell/neat-interpolation-0.3.2.6:=[profile?] >=dev-haskell/network-uri-2.6.2.0:=[profile?] >=dev-haskell/open-browser-0.2.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] >=dev-haskell/optparse-simple-0.1.1.2:=[profile?] >=dev-haskell/pantry-0.4.0.1:=[profile?] <dev-haskell/pantry-0.5:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/path-io-1.4.2:=[profile?] >=dev-haskell/persistent-2.9.2:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] >=dev-haskell/persistent-template-2.6.0:=[profile?] >=dev-haskell/primitive-0.6.4.0:=[profile?] >=dev-haskell/project-template-0.2.0.1:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] >=dev-haskell/retry-0.8.1.0:=[profile?] >=dev-haskell/rio-0.1.14.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/split-0.2.3.3:=[profile?] >=dev-haskell/stm-2.5.0.0:=[profile?] >=dev-haskell/streaming-commons-0.2.1.2:=[profile?] >=dev-haskell/tar-0.5.1.1:=[profile?] >=dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] >=dev-haskell/th-reify-many-0.1.9:=[profile?] >=dev-haskell/tls-1.4.1:=[profile?] >=dev-haskell/typed-process-0.2.6.0:=[profile?] >=dev-haskell/unicode-transforms-0.3.6:=[profile?] >=dev-haskell/unix-compat-0.5.2:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] >=dev-haskell/yaml-0.11.2.0:=[profile?] >=dev-haskell/zip-archive-0.4.1:=[profile?] >=dev-haskell/zlib-0.6.2.1:=[profile?] >=dev-lang/ghc-8.6.5:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-2.7.1 >=dev-haskell/quickcheck-2.13.2 >=dev-haskell/raw-strings-qq-1.1 >=dev-haskell/smallcheck-1.1.5 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The Haskell Tool Stack
+EAPI=7
+HOMEPAGE=http://haskellstack.org
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.4.6.0:=[profile?] >=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?] >=dev-haskell/ansi-terminal-0.9.1:=[profile?] >=dev-haskell/async-2.2.2:=[profile?] >=dev-haskell/attoparsec-0.13.2.3:=[profile?] >=dev-haskell/base64-bytestring-1.0.0.3:=[profile?] >=dev-haskell/cabal-3.0.0.0:=[profile?] >=dev-haskell/casa-client-0.0.1:=[profile?] >=dev-haskell/casa-types-0.0.1:=[profile?] >=dev-haskell/colour-2.3.5:=[profile?] >=dev-haskell/conduit-1.3.1.2:=[profile?] >=dev-haskell/conduit-extra-1.3.4:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] >=dev-haskell/cryptonite-conduit-0.2.2:=[profile?] >=dev-haskell/echo-0.1.3:=[profile?] >=dev-haskell/exceptions-0.10.4:=[profile?] >=dev-haskell/extra-1.6.19:=[profile?] >=dev-haskell/file-embed-0.0.11.1:=[profile?] >=dev-haskell/filelock-0.1.1.4:=[profile?] >=dev-haskell/fsnotify-0.3.0.1:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] >=dev-haskell/githash-0.1.3.3:=[profile?] >=dev-haskell/hackage-security-0.5.3.0:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] >=dev-haskell/hi-file-parser-0.1.0.0:=[profile?] >=dev-haskell/hpack-0.33.0:=[profile?] >=dev-haskell/http-client-0.6.4:=[profile?] >=dev-haskell/http-client-tls-0.3.5.3:=[profile?] >=dev-haskell/http-conduit-2.3.7.3:=[profile?] >=dev-haskell/http-download-0.2.0.0:=[profile?] >=dev-haskell/http-types-0.12.3:=[profile?] >=dev-haskell/memory-0.14.18:=[profile?] >=dev-haskell/microlens-0.4.10:=[profile?] >=dev-haskell/mintty-0.1.2:=[profile?] >=dev-haskell/mono-traversable-1.0.15.1:=[profile?] >=dev-haskell/mtl-2.2.2:=[profile?] >=dev-haskell/mustache-2.3.1:=[profile?] >=dev-haskell/neat-interpolation-0.3.2.6:=[profile?] >=dev-haskell/network-uri-2.6.2.0:=[profile?] >=dev-haskell/open-browser-0.2.1.0:=[profile?] >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?] >=dev-haskell/optparse-simple-0.1.1.2:=[profile?] >=dev-haskell/pantry-0.4.0.1:=[profile?] <dev-haskell/pantry-0.5:=[profile?] >=dev-haskell/path-0.6.1:=[profile?] >=dev-haskell/path-io-1.4.2:=[profile?] >=dev-haskell/persistent-2.9.2:=[profile?] >=dev-haskell/persistent-sqlite-2.9.3:=[profile?] >=dev-haskell/persistent-template-2.6.0:=[profile?] >=dev-haskell/primitive-0.6.4.0:=[profile?] >=dev-haskell/project-template-0.2.0.1:=[profile?] >=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?] >=dev-haskell/retry-0.8.1.0:=[profile?] >=dev-haskell/rio-0.1.14.0:=[profile?] >=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] >=dev-haskell/split-0.2.3.3:=[profile?] >=dev-haskell/stm-2.5.0.0:=[profile?] >=dev-haskell/streaming-commons-0.2.1.2:=[profile?] >=dev-haskell/tar-0.5.1.1:=[profile?] >=dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.3.1:=[profile?] >=dev-haskell/text-metrics-0.3.0:=[profile?] >=dev-haskell/th-reify-many-0.1.9:=[profile?] >=dev-haskell/tls-1.4.1:=[profile?] >=dev-haskell/typed-process-0.2.6.0:=[profile?] >=dev-haskell/unicode-transforms-0.3.6:=[profile?] >=dev-haskell/unix-compat-0.5.2:=[profile?] >=dev-haskell/unliftio-0.2.12:=[profile?] >=dev-haskell/unordered-containers-0.2.10.0:=[profile?] >=dev-haskell/vector-0.12.1.2:=[profile?] >=dev-haskell/yaml-0.11.2.0:=[profile?] >=dev-haskell/zip-archive-0.4.1:=[profile?] >=dev-haskell/zlib-0.6.2.1:=[profile?] >=dev-lang/ghc-8.6.5:=
+RESTRICT=test
+SLOT=0/2.3.1
+SRC_URI=https://hackage.haskell.org/package/stack-2.3.1/stack-2.3.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5ff6b186f35d47648620bf0b973f5baf
diff --git a/metadata/md5-cache/dev-haskell/stack-bin-2.3.1 b/metadata/md5-cache/dev-haskell/stack-bin-2.3.1
new file mode 100644
index 000000000000..bd416defe2b6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/stack-bin-2.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=The Haskell Tool Stack (Binary)
+EAPI=7
+HOMEPAGE=https://github.com/commercialhaskell/stack
+IUSE=symlink
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=sys-libs/zlib dev-libs/gmp:0 symlink? ( !dev-haskell/stack )
+SLOT=0
+SRC_URI=https://github.com/commercialhaskell/stack/releases/download/v2.3.1/stack-2.3.1-linux-x86_64.tar.gz
+_md5_=bcb578562e1eb1bf74fdbde5b2053635
diff --git a/metadata/md5-cache/dev-haskell/stm-2.5.0.0 b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
index 41b13e630149..1ee640c5faa9 100644
--- a/metadata/md5-cache/dev-haskell/stm-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/stm-2.5.0.0
@@ -4,9 +4,10 @@ DESCRIPTION=Software Transactional Memory
 EAPI=7
 HOMEPAGE=https://wiki.haskell.org/Software_transactional_memory
 IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?]
 SLOT=0/2.5.0.0
 SRC_URI=https://hackage.haskell.org/package/stm-2.5.0.0/stm-2.5.0.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3aa432f3bb208587a3b98982c2aa5f58
+_md5_=ba307e1b617e3fb2c89f3547fbf170a3
diff --git a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2 b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
new file mode 100644
index 000000000000..101c44a44894
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=7
+HOMEPAGE=https://github.com/fpco/streaming-commons
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/0.2.1.2
+SRC_URI=https://hackage.haskell.org/package/streaming-commons-0.2.1.2/streaming-commons-0.2.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2c9bca1c2279669b89141f2dd0815d2a
diff --git a/metadata/md5-cache/dev-haskell/string-qq-0.0.4 b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
new file mode 100644
index 000000000000..93cec88a1905
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/string-qq-0.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 >=dev-haskell/text-1.2 <dev-haskell/text-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuasiQuoter for non-interpolated strings, texts and bytestrings
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/string-qq
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.0.4
+SRC_URI=https://hackage.haskell.org/package/string-qq-0.0.4/string-qq-0.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3ed27065542b401e3f5c8f6ebec3b80
diff --git a/metadata/md5-cache/dev-haskell/tagsoup-0.14.8 b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
new file mode 100644
index 000000000000..37acbc7f4451
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tagsoup-0.14.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/quickcheck-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Parsing and extracting information from (possibly malformed) HTML/XML documents
+EAPI=7
+HOMEPAGE=https://github.com/ndmitchell/tagsoup#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.14.8
+SRC_URI=https://hackage.haskell.org/package/tagsoup-0.14.8/tagsoup-0.14.8.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3723203921bf2eceeee455ce5da375c4
diff --git a/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1 b/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
new file mode 100644
index 000000000000..9b39643ed007
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/conduit-combinators-1.0.8.1 >=dev-haskell/conduit-1.3 dev-haskell/safe-exceptions >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.24 test? ( dev-haskell/conduit-extra dev-haskell/hspec dev-haskell/quickcheck dev-haskell/weigh ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Extract and create tar files using conduit for streaming
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/tar-conduit#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/conduit-combinators-1.0.8.1 >=dev-haskell/conduit-1.3 dev-haskell/safe-exceptions >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.2
+SRC_URI=https://hackage.haskell.org/package/tar-conduit-0.3.2/tar-conduit-0.3.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=239628b163a25fdd705cf548ba05adaa
diff --git a/metadata/md5-cache/dev-haskell/tasty-1.2.3 b/metadata/md5-cache/dev-haskell/tasty-1.2.3
new file mode 100644
index 000000000000..6a77f59d8699
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/clock-0.4.4.0:=[profile?] >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Modern and extensible testing framework
+EAPI=7
+HOMEPAGE=https://github.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/ansi-terminal-0.9:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/mtl-2.1.3.1:=[profile?] >=dev-haskell/optparse-applicative-0.14:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/tagged-0.5:=[profile?] >=dev-haskell/unbounded-delays-0.1:=[profile?] dev-haskell/wcwidth:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/clock-0.4.4.0:=[profile?]
+SLOT=0/1.2.3
+SRC_URI=https://hackage.haskell.org/package/tasty-1.2.3/tasty-1.2.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7710b7d029a012ca256efeee03884819
diff --git a/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2 b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
new file mode 100644
index 000000000000..12c5a2506282
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Mark tasty tests as failure expected
+EAPI=7
+HOMEPAGE=https://github.com/nomeata/tasty-expected-failure
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.11.1.2
+SRC_URI=https://hackage.haskell.org/package/tasty-expected-failure-0.11.1.2/tasty-expected-failure-0.11.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2103d23c11e7301172e0b132464a317b
diff --git a/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2 b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2
new file mode 100644
index 000000000000..8b3ae9f90585
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.0.3:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.12 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Integration for tasty and hedgehog
+EAPI=7
+HOMEPAGE=https://github.com/qfpl/tasty-hedgehog
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.0.3:=[profile?] >=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.0.2
+SRC_URI=https://hackage.haskell.org/package/tasty-hedgehog-1.0.0.2/tasty-hedgehog-1.0.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a677fd6a40a4fd253f6300f2d566e582
diff --git a/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2 b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
new file mode 100644
index 000000000000..b2d431695ff5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HUnit support for the Tasty test framework
+EAPI=7
+HOMEPAGE=https://github.com/feuerbach/tasty
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/call-stack:=[profile?] >=dev-haskell/tasty-1.2.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.10.0.2
+SRC_URI=https://hackage.haskell.org/package/tasty-hunit-0.10.0.2/tasty-hunit-0.10.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc124c2365da8746abe76488504a9fab
diff --git a/metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1 b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
new file mode 100644
index 000000000000..d6cdd002dbb9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Write tests in Lua, integrate into tasty
+EAPI=7
+HOMEPAGE=https://github.com/hslua/tasty-lua
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] >=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?] >=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.3:=[profile?] >=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-8.0.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.0.1
+SRC_URI=https://hackage.haskell.org/package/tasty-lua-0.2.0.1/tasty-lua-0.2.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=899d1df8ed02dfc41489f21b8dbb5054
diff --git a/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1 b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
new file mode 100644
index 000000000000..9a0df2f4d8e4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-1.0.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/pcre-light dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=QuickCheck support for the Tasty test framework
+EAPI=7
+HOMEPAGE=https://github.com/feuerbach/tasty
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/optparse-applicative:=[profile?] >=dev-haskell/quickcheck-2.10:2=[profile?] dev-haskell/random:=[profile?] dev-haskell/tagged:=[profile?] >=dev-haskell/tasty-1.0.1:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.10.1.1
+SRC_URI=https://hackage.haskell.org/package/tasty-quickcheck-0.10.1.1/tasty-quickcheck-0.10.1.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c743d101942a58ee2b3a151096fe895
diff --git a/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.2.1 b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.2.1
new file mode 100644
index 000000000000..6f850d782678
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A backwards compatibility layer for Template Haskell newer than 2.8
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/template-haskell-compat-v0208
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.6.2:=
+SLOT=0/0.1.2.1
+SRC_URI=https://hackage.haskell.org/package/template-haskell-compat-v0208-0.1.2.1/template-haskell-compat-v0208-0.1.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4bd6a4f22ffa83dbe6f302a7134eab71
diff --git a/metadata/md5-cache/dev-haskell/temporary-1.3 b/metadata/md5-cache/dev-haskell/temporary-1.3
new file mode 100644
index 000000000000..2f216e203d27
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/temporary-1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/base-compat dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable temporary file and directory support for Windows and Unix
+EAPI=7
+HOMEPAGE=https://github.com/feuerbach/temporary
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/exceptions-0.6:=[profile?] >=dev-haskell/random-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.3
+SRC_URI=https://hackage.haskell.org/package/temporary-1.3/temporary-1.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7cee727f7c71fa1291c35f0b987b1d4c
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4 b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
new file mode 100644
index 000000000000..8d9ff8f7a227
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Haskell bindings to the terminfo library
+EAPI=7
+HOMEPAGE=https://github.com/judah/terminfo
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.0.1:=
+SLOT=0/0.4.1.4
+SRC_URI=https://hackage.haskell.org/package/terminfo-0.4.1.4/terminfo-0.4.1.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88ee62a1fe604e8890302e816508ae50
diff --git a/metadata/md5-cache/dev-haskell/texmath-0.12.0.2 b/metadata/md5-cache/dev-haskell/texmath-0.12.0.2
new file mode 100644
index 000000000000..eb04528f1d8d
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/texmath-0.12.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?] >=dev-haskell/parsec-3:=[profile?] >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-8.8.1:= executable? ( dev-haskell/aeson:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) ) >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/temporary dev-haskell/utf8-string ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Conversion between formats used to represent mathematics
+EAPI=7
+HOMEPAGE=https://github.com/jgm/texmath
+IUSE=executable +network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?] >=dev-haskell/parsec-3:=[profile?] >=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?] dev-haskell/text:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-8.8.1:= executable? ( dev-haskell/aeson:=[profile?] network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
+RESTRICT=!test? ( test )
+SLOT=0/0.12.0.2
+SRC_URI=https://hackage.haskell.org/package/texmath-0.12.0.2/texmath-0.12.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=81862016fe4fb7c9a8e8060a30ebd2a2
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.0 b/metadata/md5-cache/dev-haskell/text-1.2.4.0
new file mode 100644
index 000000000000..1ab630e61b4b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-1.2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.8.1:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An efficient packed Unicode text type
+EAPI=7
+HOMEPAGE=https://github.com/haskell/text
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-lang/ghc-8.8.1:=
+RESTRICT=test
+SLOT=0/1.2.4.0
+SRC_URI=https://hackage.haskell.org/package/text-1.2.4.0/text-1.2.4.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=11141117a07168419e5ca44500f7ee1b
diff --git a/metadata/md5-cache/dev-haskell/text-conversions-0.3.0 b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
new file mode 100644
index 000000000000..ad8fec739b9b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-conversions-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/errors:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/hspec-discover ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Safe conversions between textual types
+EAPI=7
+HOMEPAGE=https://github.com/cjdev/text-conversions#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/errors:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.0
+SRC_URI=https://hackage.haskell.org/package/text-conversions-0.3.0/text-conversions-0.3.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e9184e12904ac82372984d439f9ac54
diff --git a/metadata/md5-cache/dev-haskell/text-metrics-0.3.0 b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
new file mode 100644
index 000000000000..966f0f1f1aa4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/text-metrics-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Calculate various string metrics efficiently
+EAPI=6
+HOMEPAGE=https://github.com/mrkkrp/text-metrics
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/0.3.0
+SRC_URI=https://hackage.haskell.org/package/text-metrics-0.3.0/text-metrics-0.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d70def7d451c7a22812571f928fe71b4
diff --git a/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0 b/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
new file mode 100644
index 000000000000..41ae40a4a4f2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Nicer interface for reified information about data types
+EAPI=7
+HOMEPAGE=https://github.com/glguy/th-abstraction
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.2.0
+SRC_URI=https://hackage.haskell.org/package/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d02ff9f3e1492a889ee0f049ebd503a
diff --git a/metadata/md5-cache/dev-haskell/th-lift-0.8.1 b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
new file mode 100644
index 000000000000..e5d725042e1b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-lift-0.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Derive Template Haskell's Lift class for datatypes
+EAPI=7
+HOMEPAGE=https://github.com/RyanGlScott/th-lift
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.1
+SRC_URI=https://hackage.haskell.org/package/th-lift-0.8.1/th-lift-0.8.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2078aef7484031fa506cc5ca394ae1f4
diff --git a/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14 b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
new file mode 100644
index 000000000000..bd8bf997c562
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2 >=dev-haskell/quickcheck-2.6 >=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift instances for template-haskell for common data types
+EAPI=7
+HOMEPAGE=https://github.com/bennofs/th-lift-instances/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/text:=[profile?] >=dev-haskell/th-lift-0.8:=[profile?] >=dev-haskell/vector-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.14
+SRC_URI=https://hackage.haskell.org/package/th-lift-instances-0.1.14/th-lift-instances-0.1.14.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8485a4e5494a745f3545d7f4196fc957
diff --git a/metadata/md5-cache/dev-haskell/time-compat-1.9.3 b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
new file mode 100644
index 000000000000..e13ef6addea7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/time-compat-1.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=This packages tries to compat as much of \'time\' features as possible
+EAPI=7
+HOMEPAGE=https://github.com/phadej/time-compat
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?] >=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/1.9.3
+SRC_URI=https://hackage.haskell.org/package/time-compat-1.9.3/time-compat-1.9.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=775bd61a961a037ceaf703c5acd1237c
diff --git a/metadata/md5-cache/dev-haskell/time-manager-0.0.0 b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
new file mode 100644
index 000000000000..52cb0a938caf
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/time-manager-0.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/auto-update:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Scalable timer
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/auto-update:=[profile?] >=dev-lang/ghc-7.10.1:=
+SLOT=0/0.0.0
+SRC_URI=https://hackage.haskell.org/package/time-manager-0.0.0/time-manager-0.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f882e9687b698bc613715e3f4db10816
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.4 b/metadata/md5-cache/dev-haskell/tls-1.5.4
new file mode 100644
index 000000000000..e313fc7e37e7
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tls-1.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.0.1:= hans? ( dev-haskell/hans:=[profile?] ) network? ( >=dev-haskell/network-2.4.0.0:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-tls
+IUSE=+compat hans +network doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.0.1:= hans? ( dev-haskell/hans:=[profile?] ) network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.5.4
+SRC_URI=https://hackage.haskell.org/package/tls-1.5.4/tls-1.5.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=738485be2161056b2e85287585f7efbe
diff --git a/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4 b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
new file mode 100644
index 000000000000..8c96e12901c3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev-haskell/clock:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/psqueues-0.2.3:=[profile?] dev-haskell/tls:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=In-memory TLS session manager
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/tls-session-manager
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/auto-update:=[profile?] dev-haskell/basement:=[profile?] dev-haskell/clock:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/psqueues-0.2.3:=[profile?] dev-haskell/tls:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.0.4
+SRC_URI=https://hackage.haskell.org/package/tls-session-manager-0.0.4/tls-session-manager-0.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f3f119ed69b6af5ebe7eeb43eac205d9
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.5.6.2 b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
new file mode 100644
index 000000000000..dccec71e3569
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Concrete functor and monad transformers
+EAPI=7
+HOMEPAGE=https://hackage.haskell.org/package/transformers
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.6.2
+SRC_URI=https://hackage.haskell.org/package/transformers-0.5.6.2/transformers-0.5.6.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ca27d43c44843a4d18a672cf93da2d27
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
new file mode 100644
index 000000000000..e04cb2b10e9b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-compat-0.6.1:=[profile?] >=dev-lang/ghc-7.8.2:= orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Lift computations from the bottom of a transformer stack
+EAPI=6
+HOMEPAGE=https://github.com/mvv/transformers-base
+IUSE=+orphaninstances doc hscolour profile
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=>=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/transformers-compat-0.6.1:=[profile?] >=dev-lang/ghc-7.8.2:= orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
+SLOT=0/0.4.5.2
+SRC_URI=https://hackage.haskell.org/package/transformers-base-0.4.5.2/transformers-base-0.4.5.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e909f253b0c74a43b052f2156ad32af
diff --git a/metadata/md5-cache/dev-haskell/transformers-compat-0.6.5 b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.5
new file mode 100644
index 000000000000..ce1ccaa10e21
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/transformers-compat-0.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A small compatibility shim for dev-haskell/transformers
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/transformers-compat/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+SLOT=0/0.6.5
+SRC_URI=https://hackage.haskell.org/package/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b7b125972b84cf86891a7cb02a08d17f
diff --git a/metadata/md5-cache/dev-haskell/tree-diff-0.1 b/metadata/md5-cache/dev-haskell/tree-diff-0.1
new file mode 100644
index 000000000000..1c89b6d6da29
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tree-diff-0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/ansi-terminal-0.8.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] <dev-haskell/generic-deriving-1.14:=[profile?] >=dev-haskell/generics-sop-0.3.1.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/memotrie-0.6.8:=[profile?] <dev-haskell/memotrie-0.7:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?] >=dev-haskell/quickcheck-2.10.0.1:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 >=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4 >=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11 >=dev-haskell/trifecta-2.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Diffing of (expression) trees
+EAPI=7
+HOMEPAGE=https://github.com/phadej/tree-diff
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?] >=dev-haskell/ansi-terminal-0.8.1:=[profile?] >=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?] >=dev-haskell/base-compat-0.9.3:=[profile?] >=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] >=dev-haskell/generic-deriving-1.12.4:=[profile?] <dev-haskell/generic-deriving-1.14:=[profile?] >=dev-haskell/generics-sop-0.3.1.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/memotrie-0.6.8:=[profile?] <dev-haskell/memotrie-0.7:=[profile?] >=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?] >=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13:=[profile?] >=dev-haskell/quickcheck-2.10.0.1:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?] >=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?] >=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1
+SRC_URI=https://hackage.haskell.org/package/tree-diff-0.1/tree-diff-0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=029b4f158d7d17617b48c722845671fd
diff --git a/metadata/md5-cache/dev-haskell/trifecta-2.1 b/metadata/md5-cache/dev-haskell/trifecta-2.1
new file mode 100644
index 000000000000..ad837969acdb
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/trifecta-2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?] >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?] >=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A modern parser combinator library with convenient diagnostics
+EAPI=7
+HOMEPAGE=https://github.com/ekmett/trifecta/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?] >=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?] >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?] >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?] >=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?] >=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?] >=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?] >=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?] >=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?] >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=test
+SLOT=0/2.1
+SRC_URI=https://hackage.haskell.org/package/trifecta-2.1/trifecta-2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10714e3cdffa7e5dfd1a1b9c9bc614ef
diff --git a/metadata/md5-cache/dev-haskell/type-equality-1 b/metadata/md5-cache/dev-haskell/type-equality-1
new file mode 100644
index 000000000000..5f5120b85734
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/type-equality-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type equality, coercion/cast and other operations
+EAPI=7
+HOMEPAGE=https://github.com/hesselink/type-equality
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/1
+SRC_URI=https://hackage.haskell.org/package/type-equality-1/type-equality-1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c95c23c37fd821430b14e4c732c8de7b
diff --git a/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0 b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
new file mode 100644
index 000000000000..88fb4b4d66a8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/base64-bytestring dev-haskell/hspec dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Run external processes, with strong typing of streams
+EAPI=7
+HOMEPAGE=https://haskell-lang.org/library/typed-process
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/unliftio-core:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.6.0
+SRC_URI=https://hackage.haskell.org/package/typed-process-0.2.6.0/typed-process-0.2.6.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ca2a15401f1f498697de5d390a0a8de1
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.6 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.6
new file mode 100644
index 000000000000..066802fd965c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.14 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unicode normalization
+EAPI=7
+HOMEPAGE=https://github.com/harendra-kumar/unicode-transforms
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?] >=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.6
+SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.6/unicode-transforms-0.3.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5afdd2a4477a6b3b83e3464d117f0c38
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.5.2 b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
new file mode 100644
index 000000000000..c2ebae1db689
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Portable POSIX-compatibility layer
+EAPI=7
+HOMEPAGE=https://github.com/jacobstanley/unix-compat
+IUSE=old-time doc hscolour profile
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:=
+SLOT=0/0.5.2
+SRC_URI=https://hackage.haskell.org/package/unix-compat-0.5.2/unix-compat-0.5.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=14c517ffda64164f43bd1689ef351a63
diff --git a/metadata/md5-cache/dev-haskell/unix-time-0.4.7 b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
new file mode 100644
index 000000000000..13d7ca2a9f73
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.18 test? ( >=dev-haskell/doctest-0.9.3 >=dev-haskell/hspec-2.6 dev-haskell/old-locale dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Unix time parser/formatter and utilities
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/unix-time
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/old-time:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.4.7
+SRC_URI=https://hackage.haskell.org/package/unix-time-0.4.7/unix-time-0.4.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=715a4baa3f0b69c7669f689895303b2b
diff --git a/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1 b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
new file mode 100644
index 000000000000..7d8d47418de9
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)
+EAPI=7
+HOMEPAGE=https://github.com/fpco/unliftio/tree/master/unliftio#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>dev-haskell/async-2.1.1:=[profile?] >=dev-haskell/stm-2.4.3:=[profile?] >=dev-haskell/unliftio-core-0.1.1.0:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.2.12.1
+SRC_URI=https://hackage.haskell.org/package/unliftio-0.2.12.1/unliftio-0.2.12.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5cd60b507183f36a6587d24bbdb3c462
diff --git a/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0 b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
new file mode 100644
index 000000000000..c45190725ce6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=The MonadUnliftIO typeclass for unlifting monads to IO
+EAPI=6
+HOMEPAGE=https://github.com/fpco/unliftio/tree/master/unliftio-core#readme
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+SLOT=0/0.1.2.0
+SRC_URI=https://hackage.haskell.org/package/unliftio-core-0.1.2.0/unliftio-core-0.1.2.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b710c49566ac8498796be3847312a31
diff --git a/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1 b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
new file mode 100644
index 000000000000..69c33c39d570
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.6.1:= >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=For creating, comparing, parsing and printing Universally Unique Identifiers
+EAPI=6
+HOMEPAGE=https://github.com/hvr/uuid
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?] >=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?] >=dev-haskell/entropy-0.3.7:=[profile?] >=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?] >=dev-lang/ghc-7.6.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.3.13
+SRC_URI=https://hackage.haskell.org/package/uuid-1.3.13/uuid-1.3.13.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=70a47e7c3cecb3091c79e5b262f04c16
diff --git a/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1 b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
new file mode 100644
index 000000000000..a4b823c037d3
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 >=dev-haskell/quickcheck-2.4 >=dev-haskell/tasty-0.10 >=dev-haskell/tasty-hunit-0.9 >=dev-haskell/tasty-quickcheck-0.8 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Type definitions for Universally Unique Identifiers
+EAPI=5
+HOMEPAGE=https://github.com/aslatter/uuid
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+RESTRICT=!test? ( test )
+SLOT=0/1.0.3
+SRC_URI=https://hackage.haskell.org/package/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2ffbde516b031437843e5dc39fada0ea
diff --git a/metadata/md5-cache/dev-haskell/validity-0.9.0.3 b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
new file mode 100644
index 000000000000..23a222f88504
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/validity-0.9.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Validity typeclass
+EAPI=7
+HOMEPAGE=https://github.com/NorfairKing/validity#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.0.3
+SRC_URI=https://hackage.haskell.org/package/validity-0.9.0.3/validity-0.9.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=58201b194b4eaf56be4603953323923c
diff --git a/metadata/md5-cache/dev-haskell/vector-0.12.1.2 b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
new file mode 100644
index 000000000000..66247d06d50b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-0.12.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient Arrays
+EAPI=7
+HOMEPAGE=https://github.com/haskell/vector
+IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?] >=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/0.12.1.2
+SRC_URI=https://hackage.haskell.org/package/vector-0.12.1.2/vector-0.12.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3f0e73ac73cbf229d4e23f50aa527d59
diff --git a/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3 b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
new file mode 100644
index 000000000000..381a6f14d76f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Efficient algorithms for vector arrays
+EAPI=7
+HOMEPAGE=https://github.com/erikd/vector-algorithms/
+IUSE=+bench +boundschecks internalchecks +properties unsafechecks doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?] >=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.8.0.3
+SRC_URI=https://hackage.haskell.org/package/vector-algorithms-0.8.0.3/vector-algorithms-0.8.0.3.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=35d279425b04965bd94c21e48ff1434d
diff --git a/metadata/md5-cache/dev-haskell/vector-builder-0.3.8 b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
new file mode 100644
index 000000000000..08a2c061a34b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/vector-builder-0.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14 >=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3 >=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4 <dev-haskell/rerebase-2 >=dev-haskell/tasty-0.12 <dev-haskell/tasty-2 >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11 >=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Vector builder
+EAPI=7
+HOMEPAGE=https://github.com/nikita-volkov/vector-builder
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-haskell/base-prelude-2:=[profile?] >=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.3.8
+SRC_URI=https://hackage.haskell.org/package/vector-builder-0.3.8/vector-builder-0.3.8.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5150f6334fab9f3e3d4a7537475dfd8d
diff --git a/metadata/md5-cache/dev-haskell/wai-3.2.2.1 b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
new file mode 100644
index 000000000000..b17816e0a00b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wai-3.2.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Web Application Interface
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/3.2.2.1
+SRC_URI=https://hackage.haskell.org/package/wai-3.2.2.1/wai-3.2.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=588cc0f4599d856d9448a38a050ba93e
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.1 b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.1
new file mode 100644
index 000000000000..4804ed5d86b4
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/mockery dev-haskell/network dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=WAI application for static serving
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/book/web-application-interface
+IUSE=print doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/3.1.7.1
+SRC_URI=https://hackage.haskell.org/package/wai-app-static-3.1.7.1/wai-app-static-3.1.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=929a4bab1ebb8ab3d820291fcd4cdb77
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.0.29.1 b/metadata/md5-cache/dev-haskell/wai-extra-3.0.29.1
new file mode 100644
index 000000000000..fb78353f753e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wai-extra-3.0.29.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= examples? ( dev-haskell/warp:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= examples? ( dev-haskell/warp:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/3.0.29.1
+SRC_URI=https://hackage.haskell.org/package/wai-extra-3.0.29.1/wai-extra-3.0.29.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6710c7c3f55390f4a328c313131f195a
diff --git a/metadata/md5-cache/dev-haskell/wai-logger-2.3.6 b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
new file mode 100644
index 000000000000..74507b3d622e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wai-logger-2.3.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 >=dev-haskell/cabal-doctest-1.0.6 <dev-haskell/cabal-doctest-1.1 test? ( >=dev-haskell/doctest-0.10.1 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A logging system for WAI
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/wai-logger
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/byteorder:=[profile?] >=dev-haskell/fast-logger-3:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/network:=[profile?] >=dev-haskell/wai-2.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=test
+SLOT=0/2.3.6
+SRC_URI=https://hackage.haskell.org/package/wai-logger-2.3.6/wai-logger-2.3.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=34278dd7675257714e0c721161a5b872
diff --git a/metadata/md5-cache/dev-haskell/warp-3.3.13 b/metadata/md5-cache/dev-haskell/warp-3.3.13
new file mode 100644
index 000000000000..c1593a63fc01
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/warp-3.3.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/x509:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/http-client dev-haskell/hunit >=dev-haskell/lifted-base-0.1 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A fast, light-weight web server for WAI applications
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=+allow-sendfilefd warp-debug doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?] <dev-haskell/bsb-http-chunked-0.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/hashable:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.12:=[profile?] >=dev-haskell/http2-2.0:=[profile?] <dev-haskell/http2-2.1:=[profile?] >=dev-haskell/iproute-1.3.1:=[profile?] >=dev-haskell/network-2.3:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?] >=dev-haskell/stm-2.3:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-manager:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/vault-0.3:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/x509:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=test
+SLOT=0/3.3.13
+SRC_URI=https://hackage.haskell.org/package/warp-3.3.13/warp-3.3.13.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fa6186c5451e5afefcdb126fae7d81f5
diff --git a/metadata/md5-cache/dev-haskell/warp-tls-3.2.12 b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
new file mode 100644
index 000000000000..823df253efad
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/warp-tls-3.2.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.5.3:=[profile?] >=dev-haskell/tls-session-manager-0.0.4:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.3.6:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=HTTP over TLS support for Warp via the TLS package
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/cryptonite-0.12:=[profile?] >=dev-haskell/data-default-class-0.0.1:=[profile?] >=dev-haskell/network-2.2.1:=[profile?] dev-haskell/streaming-commons:=[profile?] >=dev-haskell/tls-1.5.3:=[profile?] >=dev-haskell/tls-session-manager-0.0.4:=[profile?] >=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/warp-3.3.6:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/3.2.12
+SRC_URI=https://hackage.haskell.org/package/warp-tls-3.2.12/warp-tls-3.2.12.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c924fe86b4c7b75e15ade9a8cf3637cc
diff --git a/metadata/md5-cache/dev-haskell/wcwidth-0.0.2 b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
new file mode 100644
index 000000000000..6bb9aed56308
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wcwidth-0.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-7.4.1:= cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?] >=dev-haskell/setlocale-0.0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] ) >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Native wcwidth
+EAPI=6
+HOMEPAGE=https://github.com/solidsnack/wcwidth/
+IUSE=cli doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-7.4.1:= cli? ( >=dev-haskell/attoparsec-0.8.5:=[profile?] >=dev-haskell/setlocale-0.0.3:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] )
+SLOT=0/0.0.2
+SRC_URI=https://hackage.haskell.org/package/wcwidth-0.0.2/wcwidth-0.0.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c099309f806ecebae60ebd9e0d507ab9
diff --git a/metadata/md5-cache/dev-haskell/weigh-0.0.16 b/metadata/md5-cache/dev-haskell/weigh-0.0.16
new file mode 100644
index 000000000000..905ce2ecc9fc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/weigh-0.0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-lang/ghc-8.2.1:=[profile?] >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Measure allocations of a Haskell functions/values
+EAPI=7
+HOMEPAGE=https://github.com/fpco/weigh#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/split:=[profile?] dev-haskell/temporary:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-lang/ghc-8.2.1:=[profile?]
+RESTRICT=!test? ( test )
+SLOT=0/0.0.16
+SRC_URI=https://hackage.haskell.org/package/weigh-0.0.16/weigh-0.0.16.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c858d0681b0b51e7f1ce305646e2315e
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
new file mode 100644
index 000000000000..9e84df9a5ac8
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Wadler/Leijen pretty printer with annotations and slightly modernized API
+EAPI=6
+HOMEPAGE=https://github.com/minad/wl-pprint-annotated#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.1.0.1
+SRC_URI=https://hackage.haskell.org/package/wl-pprint-annotated-0.1.0.1/wl-pprint-annotated-0.1.0.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=21c942ed3a9b98876bb2115055011174
diff --git a/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1 b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
new file mode 100644
index 000000000000..96ad0fc3ca33
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Wadler/Leijen Pretty Printer for Text values
+EAPI=7
+HOMEPAGE=http://hackage.haskell.org/package/wl-pprint-text
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?] >=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.2.0.1
+SRC_URI=https://hackage.haskell.org/package/wl-pprint-text-1.2.0.1/wl-pprint-text-1.2.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a270878cb74065c8530598bdb8254c6f
diff --git a/metadata/md5-cache/dev-haskell/wreq-0.5.3.2 b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
new file mode 100644
index 000000000000..c8efb9c9be7c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wreq-0.5.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 >=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1 test? ( dev-haskell/doctest dev-haskell/hunit dev-haskell/network-info >=dev-haskell/quickcheck-2.7 dev-haskell/temporary dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 dev-haskell/vector !httpbin? ( >=dev-haskell/aeson-pretty-0.8.0 dev-haskell/base64-bytestring >=dev-haskell/snap-core-1.0.0.0 >=dev-haskell/snap-server-0.9.4.4 dev-haskell/unix-compat dev-haskell/uuid ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An easy-to-use HTTP client library
+EAPI=7
+HOMEPAGE=http://www.serpentine.com/wreq
+IUSE=aws httpbin doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-1.0.0.0:=[profile?] >=dev-haskell/attoparsec-0.11.1.0:=[profile?] >=dev-haskell/authenticate-oauth-1.5:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/case-insensitive:=[profile?] dev-haskell/cryptonite:=[profile?] >=dev-haskell/exceptions-0.5:=[profile?] dev-haskell/hashable:=[profile?] >=dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.3.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/lens-4.5:=[profile?] dev-haskell/lens-aeson:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mime-types:=[profile?] >=dev-haskell/psqueues-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/time-locale-compat:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-lang/ghc-7.10.1:= httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?] dev-haskell/base64-bytestring:=[profile?] >=dev-haskell/snap-core-1.0.0.0:=[profile?] >=dev-haskell/snap-server-0.9.4.4:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/uuid:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.5.3.2
+SRC_URI=https://hackage.haskell.org/package/wreq-0.5.3.2/wreq-0.5.3.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=562112e0e3707dec12f8cae93ab547fe
diff --git a/metadata/md5-cache/dev-haskell/x11-1.9.1 b/metadata/md5-cache/dev-haskell/x11-1.9.1
new file mode 100644
index 000000000000..acd38e8a2770
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x11-1.9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver xinerama? ( x11-libs/libXinerama ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A binding to the X11 graphics library
+EAPI=7
+HOMEPAGE=https://github.com/xmonad/X11
+IUSE=+xinerama doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver xinerama? ( x11-libs/libXinerama )
+SLOT=0/1.9.1
+SRC_URI=https://hackage.haskell.org/package/X11-1.9.1/X11-1.9.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4890e4599127267aabba2d1a49bc3951
diff --git a/metadata/md5-cache/dev-haskell/x509-1.7.5 b/metadata/md5-cache/dev-haskell/x509-1.7.5
new file mode 100644
index 000000000000..6906abe157fc
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x509-1.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/tasty dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X509 reader and writer
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?] >=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.7.5
+SRC_URI=https://hackage.haskell.org/package/x509-1.7.5/x509-1.7.5.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2d597d26d28731afbde19ee5f2dc4d4d
diff --git a/metadata/md5-cache/dev-haskell/x509-store-1.6.7 b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
new file mode 100644
index 000000000000..f0f3537b3ee5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x509-store-1.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 collection accessing and storing methods
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.7
+SRC_URI=https://hackage.haskell.org/package/x509-store-1.6.7/x509-store-1.6.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e5b398d3b0982476fe37c6ae5c857259
diff --git a/metadata/md5-cache/dev-haskell/x509-system-1.6.6 b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
new file mode 100644
index 000000000000..f3757c41411a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x509-system-1.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Handle per-operating-system X.509 accessors and storage
+EAPI=6
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/x509-1.6:=[profile?] >=dev-haskell/x509-store-1.6.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/1.6.6
+SRC_URI=https://hackage.haskell.org/package/x509-system-1.6.6/x509-system-1.6.6.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93e1c0990fa9a1a64775da622f0dba3b
diff --git a/metadata/md5-cache/dev-haskell/x509-validation-1.6.11 b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
new file mode 100644
index 000000000000..eca421f74fe6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/x509-validation-1.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/tasty dev-haskell/tasty-hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=X.509 Certificate and CRL validation
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-certificate
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-haskell/cryptonite-0.24:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] dev-haskell/memory:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pem-0.1:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.11
+SRC_URI=https://hackage.haskell.org/package/x509-validation-1.6.11/x509-validation-1.6.11.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f10a5d1240e98536070b7810d5408c4b
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
new file mode 100644
index 000000000000..1d1737325c0b
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.4.2:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=An XHTML combinator library
+EAPI=7
+HOMEPAGE=https://github.com/haskell/xhtml
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ghc-8.4.2:=
+SLOT=0/3000.2.2.1
+SRC_URI=https://hackage.haskell.org/package/xhtml-3000.2.2.1/xhtml-3000.2.2.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5b62d57e7dfbc2f2e1ce6f7c2f54fb18
diff --git a/metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0 b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
new file mode 100644
index 000000000000..65144debb6b5
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/doctest-0.8 >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Pure-Haskell utilities for dealing with XML with the conduit package
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/xml
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.9.0.0
+SRC_URI=https://hackage.haskell.org/package/xml-conduit-1.9.0.0/xml-conduit-1.9.0.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cb7acf5d6853d64c4f1d9a3e301e2429
diff --git a/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1 b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
new file mode 100644
index 000000000000..817111bdfed2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Hamlet-style quasiquoter for XML content
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-2.2:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-lang/ghc-7.4.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.5.0.1
+SRC_URI=https://hackage.haskell.org/package/xml-hamlet-0.5.0.1/xml-hamlet-0.5.0.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eb9324b67f192688e14d8cd4923da62b
diff --git a/metadata/md5-cache/dev-haskell/yaml-0.11.2.0 b/metadata/md5-cache/dev-haskell/yaml-0.11.2.0
new file mode 100644
index 000000000000..c95fbb324b6a
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yaml-0.11.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] ) >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/base-compat >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/mockery dev-haskell/temporary no-examples? ( dev-haskell/raw-strings-qq ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for parsing and rendering YAML documents
+EAPI=7
+HOMEPAGE=https://github.com/snoyberg/yaml#readme
+IUSE=+no-examples +no-exe doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/aeson-0.11:=[profile?] >=dev-haskell/attoparsec-0.11.3.0:=[profile?] >=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?] >=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/scientific-0.3:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-8.0.2:= !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.11.2.0
+SRC_URI=https://hackage.haskell.org/package/yaml-0.11.2.0/yaml-0.11.2.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9424a4f27b7c475bf8b1893e15fa689e
diff --git a/metadata/md5-cache/dev-haskell/yesod-1.6.0.2 b/metadata/md5-cache/dev-haskell/yesod-1.6.0.2
new file mode 100644
index 000000000000..e06be84f1e1c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-1.6.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/fast-logger:=[profile?] dev-haskell/monad-logger:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/shakespeare:=[profile?] dev-haskell/streaming-commons:=[profile?] dev-haskell/text:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-extra-1.3:=[profile?] dev-haskell/wai-logger:=[profile?] >=dev-haskell/warp-1.3:=[profile?] >=dev-haskell/yaml-0.8.17:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-8.2.1:=
+SLOT=0/1.6.0.2
+SRC_URI=https://hackage.haskell.org/package/yesod-1.6.0.2/yesod-1.6.0.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=155d36e9819e48f0bd1f4db6fd68b742
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9 b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
new file mode 100644
index 000000000000..53a6bdaf43aa
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3.4:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication for Yesod
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] >=dev-haskell/authenticate-1.3.4:=[profile?] dev-haskell/base16-bytestring:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] dev-haskell/cryptonite:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/file-embed:=[profile?] >=dev-haskell/http-client-0.5:=[profile?] dev-haskell/http-client-tls:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] dev-haskell/http-types:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] dev-haskell/safe:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unliftio:=[profile?] dev-haskell/unliftio-core:=[profile?] dev-haskell/unordered-containers:=[profile?] >=dev-haskell/wai-1.4:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] >=dev-lang/ghc-8.2.1:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+SLOT=0/1.6.9
+SRC_URI=https://hackage.haskell.org/package/yesod-auth-1.6.9/yesod-auth-1.6.9.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8b6d2cac0dcd35f2d703cb529cf39d21
diff --git a/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2 b/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
new file mode 100644
index 000000000000..a4c229953186
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4.18:=[profile?] <dev-haskell/yesod-auth-1.7:=[profile?] >=dev-haskell/yesod-core-1.4.19:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/basic-prelude >=dev-haskell/hspec-2.0.0 dev-haskell/http-conduit dev-haskell/http-types dev-haskell/monad-logger dev-haskell/network-uri dev-haskell/persistent-sqlite dev-haskell/resourcet dev-haskell/unordered-containers dev-haskell/wai-extra dev-haskell/yesod >=dev-haskell/yesod-test-1.5.0.1 || ( ( >=dev-haskell/yesod-auth-1.4.18 <dev-haskell/yesod-auth-1.5 ) ( >=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 ) ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Authentication plugin for Yesod
+EAPI=7
+HOMEPAGE=https://github.com/paul-rouse/yesod-auth-hashdb
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/yesod-auth-1.4.18:=[profile?] <dev-haskell/yesod-auth-1.7:=[profile?] >=dev-haskell/yesod-core-1.4.19:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.2:=[profile?] >=dev-lang/ghc-7.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.7.1.2
+SRC_URI=https://hackage.haskell.org/package/yesod-auth-hashdb-1.7.1.2/yesod-auth-hashdb-1.7.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=376875a068d4e806b949c0836486388f
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.17.2 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.17.2
new file mode 100644
index 000000000000..7e5d4a5b8d52
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.17.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/async >=dev-haskell/hspec-1.3 dev-haskell/hspec-expectations dev-haskell/hunit dev-haskell/network dev-haskell/streaming-commons ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Creation of type-safe, RESTful web applications
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=test
+SLOT=0/1.6.17.2
+SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.17.2/yesod-core-1.6.17.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bcee6d722152b35c4083f8b565dc50bd
diff --git a/metadata/md5-cache/dev-haskell/yesod-form-1.6.7 b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
new file mode 100644
index 000000000000..c5322a9f8208
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-form-1.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Form handling support for Yesod Web Framework
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=+network-uri doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] dev-haskell/byteable:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/email-validate-1.0:=[profile?] dev-haskell/persistent:=[profile?] dev-haskell/resourcet:=[profile?] dev-haskell/semigroups:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/xss-sanitize-0.3.0.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?] >=dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.6.7
+SRC_URI=https://hackage.haskell.org/package/yesod-form-1.6.7/yesod-form-1.6.7.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b7a30ab77c0c1875d08019c29897faf0
diff --git a/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4 b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
new file mode 100644
index 000000000000..cc4075e28971
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.9:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec >=dev-haskell/persistent-sqlite-2.8 dev-haskell/text dev-haskell/wai-extra ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Some helpers for using Persistent from Yesod
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/blaze-builder:=[profile?] dev-haskell/conduit:=[profile?] >=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?] >=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.9:=[profile?] dev-haskell/resource-pool:=[profile?] >=dev-haskell/resourcet-0.4.5:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.0.4
+SRC_URI=https://hackage.haskell.org/package/yesod-persistent-1.6.0.4/yesod-persistent-1.6.0.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ddfcfb5d062a02714a11506d348e87b2
diff --git a/metadata/md5-cache/dev-haskell/yesod-static-1.6.0.1 b/metadata/md5-cache/dev-haskell/yesod-static-1.6.0.1
new file mode 100644
index 000000000000..4d06eaedc3f6
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-static-1.6.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/cryptonite-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit dev-haskell/wai-extra >=dev-haskell/yesod-test-1.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Static file serving subsite for Yesod Web Framework
+EAPI=6
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1.0.1:=[profile?] >=dev-haskell/blaze-builder-0.3:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] >=dev-haskell/cryptonite-0.11:=[profile?] >=dev-haskell/cryptonite-conduit-0.1:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] dev-haskell/data-default:=[profile?] >=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?] >=dev-haskell/hashable-1.1:=[profile?] dev-haskell/hjsmin:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] >=dev-haskell/text-0.9:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-1.3:=[profile?] >=dev-haskell/wai-app-static-3.1:=[profile?] >=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.0.1
+SRC_URI=https://hackage.haskell.org/package/yesod-static-1.6.0.1/yesod-static-1.6.0.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=967e284d235d48df406f436f7ed57df5
diff --git a/metadata/md5-cache/dev-haskell/yesod-test-1.6.10 b/metadata/md5-cache/dev-haskell/yesod-test-1.6.10
new file mode 100644
index 000000000000..76e6e55c7bdd
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/yesod-test-1.6.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.6.17:=[profile?] >=dev-lang/ghc-8.2.1:= >=dev-haskell/cabal-2.0.0.2 test? ( dev-haskell/hspec dev-haskell/unliftio dev-haskell/unliftio-core >=dev-haskell/yesod-form-1.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=integration testing for WAI/Yesod Applications
+EAPI=7
+HOMEPAGE=http://www.yesodweb.com
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] dev-haskell/blaze-builder:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/conduit:=[profile?] dev-haskell/cookie:=[profile?] >=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?] >=dev-haskell/html-conduit-0.1:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/network-2.2:=[profile?] >=dev-haskell/pretty-show-1.6:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/wai-3.0:=[profile?] dev-haskell/wai-extra:=[profile?] >=dev-haskell/xml-conduit-1.0:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] >=dev-haskell/yesod-core-1.6.17:=[profile?] >=dev-lang/ghc-8.2.1:=
+RESTRICT=!test? ( test )
+SLOT=0/1.6.10
+SRC_URI=https://hackage.haskell.org/package/yesod-test-1.6.10/yesod-test-1.6.10.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6b232835a5517f08c2ab0b9b72b84def
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.4.1 b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
new file mode 100644
index 000000000000..73d647ef83e2
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.0 test? ( dev-haskell/hunit dev-haskell/temporary ) test? ( app-arch/zip ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Library for creating and modifying zip archives
+EAPI=7
+HOMEPAGE=https://github.com/jgm/zip-archive
+IUSE=executable doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.8.2:=
+RESTRICT=!test? ( test )
+SLOT=0/0.4.1
+SRC_URI=https://hackage.haskell.org/package/zip-archive-0.4.1/zip-archive-0.4.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=87f8bacc8f0770567119b149d2dc3e89
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 745d7023c262..45217091b785 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.265_p01 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.265_p01
new file mode 100644
index 000000000000..76b579ca208a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.265_p01
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups headless-awt nsplugin selinux webstart
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=preserve-libs splitdebug
+SLOT=8
+SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a5f6fb5bbaf363fcb7345c5c2ed13fb
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 6a5e774e6d6a..11fb11d281ce 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/ghc-8.8.4 b/metadata/md5-cache/dev-lang/ghc-8.8.4
index 26d4c9c6f767..1c9ffb57f8d8 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.8.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.8.4
@@ -5,6 +5,7 @@ DESCRIPTION=The Glasgow Haskell Compiler
 EAPI=7
 HOMEPAGE=https://www.haskell.org/ghc/
 IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
 RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.8.4
 SRC_URI=!binary? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-src.tar.xz test? ( https://downloads.haskell.org/~ghc/8.8.4/ghc-8.8.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6dac7b07ee62276bc519536d4c17af12
+_md5_=4b036ce5c8c9f9282322f17ea8b830d2
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
index 01859efb1ae6..f21693cee644 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8656cce49186fcace677463b71036141
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index 926e54620fce..ef69578b3822 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=6.3.0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd8678d553374954e85eebd8b67ea874
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index f208ad12c5a9..2ebc3be59fd5 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=7.3.1
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13d2fb63cd8e6365bd1e5e2f11ff6488
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
index 4cbb8b32b28b..418781ea06a1 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=test
 SLOT=8.3.1
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) mirror://gentoo/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=face89fe7b4787f7a7118717808a901a
diff --git a/metadata/md5-cache/dev-lang/nim-1.2.4 b/metadata/md5-cache/dev-lang/nim-1.2.6
similarity index 90%
rename from metadata/md5-cache/dev-lang/nim-1.2.4
rename to metadata/md5-cache/dev-lang/nim-1.2.6
index e4f7be24e990..0d782e5c3f49 100644
--- a/metadata/md5-cache/dev-lang/nim-1.2.4
+++ b/metadata/md5-cache/dev-lang/nim-1.2.6
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=readline? ( sys-libs/readline:0= )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.2.4.tar.xz
+SRC_URI=https://nim-lang.org/download/nim-1.2.6.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4e08ee9588127859fba175003763ac49
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18 b/metadata/md5-cache/dev-lang/python-2.7.18
deleted file mode 100644
index a36de831330c..000000000000
--- a/metadata/md5-cache/dev-lang/python-2.7.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-SLOT=2.7
-SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=711fb94cd29bf0ca7d2733ec88920423
diff --git a/metadata/md5-cache/dev-lang/python-3.6.10-r2 b/metadata/md5-cache/dev-lang/python-3.6.10-r2
deleted file mode 100644
index 532077baa5a1..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.6.10-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.6/3.6m
-SRC_URI=https://www.python.org/ftp/python/3.6.10/Python-3.6.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.10-r1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c20098d94b549d77849f96a544578b21
diff --git a/metadata/md5-cache/dev-lang/python-3.6.11-r1 b/metadata/md5-cache/dev-lang/python-3.6.11-r1
deleted file mode 100644
index 8d5c3096ad35..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.6.11-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.6/3.6m
-SRC_URI=https://www.python.org/ftp/python/3.6.11/Python-3.6.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.11-r2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=739801ca00880df38b1365e7e63b7714
diff --git a/metadata/md5-cache/dev-lang/python-3.7.7-r2 b/metadata/md5-cache/dev-lang/python-3.7.7-r2
deleted file mode 100644
index 1165c67dd6ae..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.7.7-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.7/3.7m
-SRC_URI=https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.7.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c193762a398c2c1b09280a1024f2387
diff --git a/metadata/md5-cache/dev-lang/python-3.7.8-r1 b/metadata/md5-cache/dev-lang/python-3.7.8-r1
deleted file mode 100644
index 21e00886df2f..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.7.8-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.7/3.7m
-SRC_URI=https://www.python.org/ftp/python/3.7.8/Python-3.7.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.8-r2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ccb455b2f6a1a789f01e387501d0b8f3
diff --git a/metadata/md5-cache/dev-lang/python-3.8.2-r2 b/metadata/md5-cache/dev-lang/python-3.8.2-r2
deleted file mode 100644
index 602e19fee353..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.2/Python-3.8.2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.2-r1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=533ae62821353516e62bf6b53ee59cc3
diff --git a/metadata/md5-cache/dev-lang/python-3.8.3-r1 b/metadata/md5-cache/dev-lang/python-3.8.3-r1
deleted file mode 100644
index b1150760a28f..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.3-r1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=763b66779657c2a370d915889fb56f1d
diff --git a/metadata/md5-cache/dev-lang/python-3.8.4 b/metadata/md5-cache/dev-lang/python-3.8.4
deleted file mode 100644
index 9b0675a88d09..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=PSF-2
-PDEPEND=>=app-eselect/eselect-python-20140125-r1
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.4/Python-3.8.4.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.4-r1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e284a24bfc4599e6badc4868cdeaf718
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.12 b/metadata/md5-cache/dev-lang/vala-0.46.12
new file mode 100644
index 000000000000..13c71e0a8b6f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.46.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.12 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.12 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
+SLOT=0.46
+SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.12.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71f2c920ebb631e67f3561e12bd1f7bc
diff --git a/metadata/md5-cache/dev-lang/vala-0.48.8 b/metadata/md5-cache/dev-lang/vala-0.48.8
new file mode 100644
index 000000000000..8e7edd41cac9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.48.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.8 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.48.8 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
+SLOT=0.48
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.8.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dd48cd961ee51164de3dcd3e5395232
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b06b3923106e..d0f1da2e2374 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/boost-1.73.0 b/metadata/md5-cache/dev-libs/boost-1.73.0
index 41cdc8c0c29f..808361a5793c 100644
--- a/metadata/md5-cache/dev-libs/boost-1.73.0
+++ b/metadata/md5-cache/dev-libs/boost-1.73.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.73.0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2beba54e085a889100a5ef167b4bbb2
+_md5_=f988a906afa1786cc375c96b88c4bb88
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
index 903bf8526017..2ac7539a65f5 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-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=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/v1.9.3.tar.gz -> jsoncpp-1.9.3.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=beacfa2e081b80d1cfcc2cbc239405e7
+_md5_=79097639b59eb9bcae468f6570ebbe6c
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.3 b/metadata/md5-cache/dev-libs/libbytesize-2.3
index 87d2757b5844..808e700710c9 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-2.3
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.3
@@ -5,7 +5,7 @@ DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big si
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libbytesize
 IUSE=doc python test tools python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) tools? ( python )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.3/libbytesize-2.3.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=956fc58291715e1b6a4a6d8ea20dc48e
+_md5_=32159ad5c603f1ca0b5baefe23ee0fa2
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.4 b/metadata/md5-cache/dev-libs/libbytesize-2.4
new file mode 100644
index 000000000000..bfe520dbbc7b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
+EAPI=7
+HOMEPAGE=https://github.com/storaged-project/libbytesize
+IUSE=doc python test tools python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) tools? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.4/libbytesize-2.4.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=956fc58291715e1b6a4a6d8ea20dc48e
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14_pre20200717 b/metadata/md5-cache/dev-libs/libdnet-1.14_pre20200717
new file mode 100644
index 000000000000..0af9d26c9997
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14_pre20200717
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=simplified, portable interface to several low-level networking routines
+EAPI=7
+HOMEPAGE=https://github.com/ofalk/libdnet
+IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/libdnet-1.14_pre20200717.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	0dda1d9008ac0b2530588115a772d99d	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=273e89cf39a16e7d290f12d900f86e1b
diff --git a/metadata/md5-cache/dev-libs/libdnet-9999 b/metadata/md5-cache/dev-libs/libdnet-9999
new file mode 100644
index 000000000000..482a28e91187
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdnet-9999
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=simplified, portable interface to several low-level networking routines
+EAPI=7
+HOMEPAGE=https://github.com/ofalk/libdnet
+IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+LICENSE=LGPL-2
+PROPERTIES=live
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
+SLOT=0
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78ffdbbe70c88e7cc6facf86fdbc7e6a
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.4 b/metadata/md5-cache/dev-libs/libgit2-0.28.4
deleted file mode 100644
index 21cd4e28609b..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.28.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
-DESCRIPTION=A linkable library for Git
-EAPI=7
-HOMEPAGE=https://libgit2.org
-IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-RESTRICT=!test? ( test )
-SLOT=0/28
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.4.tar.gz -> libgit2-0.28.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f58eb785c203db549a40b32c91c94bfc
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.5 b/metadata/md5-cache/dev-libs/libgit2-0.28.5
index f8f064bcbc69..ddc821037740 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.28.5
+++ b/metadata/md5-cache/dev-libs/libgit2-0.28.5
@@ -5,11 +5,11 @@ DESCRIPTION=A linkable library for Git
 EAPI=7
 HOMEPAGE=https://libgit2.org
 IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.5.tar.gz -> libgit2-0.28.5.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c97fbf4288d5a9897f0f1f0d76742940
+_md5_=bd69a158e645ea6f885e3ca7f4ed76ef
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1 b/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
deleted file mode 100644
index 1fa839421a3b..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
-DESCRIPTION=A linkable library for Git
-EAPI=7
-HOMEPAGE=https://libgit2.org
-IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-RESTRICT=!test? ( test )
-SLOT=0/1.0
-SRC_URI=https://github.com/libgit2/libgit2/archive/v1.0.0.tar.gz -> libgit2-1.0.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=526a92904dd848585d1881e61da5308c
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.1 b/metadata/md5-cache/dev-libs/libgit2-1.0.1
index e07d66d3effb..0dc81cf0e9e3 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.0.1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=A linkable library for Git
 EAPI=7
 HOMEPAGE=https://libgit2.org
 IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.0
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz -> libgit2-1.0.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46a7072fbf0d08d4dbc365f56c02afd0
+_md5_=526a92904dd848585d1881e61da5308c
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.5.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
index 85fa827f1cdc..d599ec985749 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Implementation of XDG Standards
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.5.0/libqtxdg-3.5.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88b1f43b3af950257b0cecd374ae2189
+_md5_=ba2d7619e93098c8e116aec85a89b89b
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
similarity index 90%
rename from metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.0
rename to metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
index 5f1310222ded..8c158b54adb1 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.0
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
-SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.1.0/plasma-wayland-protocols-1.1.0.tar.xz
+SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.1.1/plasma-wayland-protocols-1.1.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=227b51fb3d70e4cb0591be39dd1d300b
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.48.8 b/metadata/md5-cache/dev-libs/vala-common-0.48.8
new file mode 100644
index 000000000000..989fabefbe2c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.48.8
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.48/vala-0.48.8.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=a88da6d0887f1c58b41cf0533978aa3d
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index d6c496fffb69..ad8b20d55fe8 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2 b/metadata/md5-cache/dev-lua/lgi-0.9.2
index af619d567973..d321d19a806f 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2
@@ -5,11 +5,11 @@ DESCRIPTION=Lua bindings using gobject-introspection
 EAPI=7
 HOMEPAGE=https://github.com/pavouk/lgi
 IUSE=examples test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= dev-libs/gobject-introspection dev-libs/glib virtual/libffi:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=49c41c178952061ecfb5ff7ef3d8ebd3
+_md5_=b59583109599a542dfdfa22426b38b35
diff --git a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13 b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
deleted file mode 100644
index 579a9efebe62..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=upload things to the CPAN
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Uploader
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=912c38dacef086a7f8d5bfba796f104a
diff --git a/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0 b/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0
deleted file mode 100644
index 629e3c85599d..000000000000
--- a/metadata/md5-cache/dev-perl/Compress-LZF-3.800.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=extremely light-weight Lempel-Ziv-Free compression
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Compress-LZF
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Compress-LZF-3.8.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c4abd43b42f8b5914448b31aebf8b355
diff --git a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0 b/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
deleted file mode 100644
index 92296c421ba9..000000000000
--- a/metadata/md5-cache/dev-perl/Config-Auto-0.440.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec >=dev-perl/YAML-0.670.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Magical config file parser
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Config-Auto
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Config-IniFiles dev-perl/IO-String virtual/perl-Text-ParseWords virtual/perl-File-Spec >=dev-perl/YAML-0.670.0 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Config-Auto-0.44.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a189373b4fd8c4f098841afd05634fd
diff --git a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200 b/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
deleted file mode 100644
index ba85eb03fa7c..000000000000
--- a/metadata/md5-cache/dev-perl/Config-JSON-1.520.200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Moo >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.700.0 >=dev-perl/Test-Deep-0.95.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A JSON based config file system
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Config-JSON
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-File-Temp-0.180.0 >=dev-perl/JSON-2.160.0 >=virtual/perl-Scalar-List-Utils-1.190.0 dev-perl/Moo dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RI/RIZEN/Config-JSON-1.5202.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d17082e46b23dfe07616cf77b20d790
diff --git a/metadata/md5-cache/dev-perl/Config-MVP-2.200.10 b/metadata/md5-cache/dev-perl/Config-MVP-2.200.10
deleted file mode 100644
index 6934bd9d2db9..000000000000
--- a/metadata/md5-cache/dev-perl/Config-MVP-2.200.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable dev-perl/Module-Runtime >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DESCRIPTION=multivalue-property package-oriented configuration
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Config-MVP
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Class-Load-0.170.0 virtual/perl-File-Spec dev-perl/Module-Pluggable dev-perl/Module-Runtime >=dev-perl/Moose-0.910.0 dev-perl/MooseX-OneArgNew dev-perl/Params-Util dev-perl/Role-HasMessage dev-perl/Role-Identifiable dev-perl/Throwable dev-perl/Tie-IxHash dev-perl/Try-Tiny dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200010.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4c07a10b902acaf0a7b7e9868efb9633
diff --git a/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0 b/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
deleted file mode 100644
index 6bc926e0d838..000000000000
--- a/metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Return chained, modified values from subs, without losing context
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Context-Preserve
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.02.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=beb9ce3196d81a80dcdc3e8c953545b1
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-6.15.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-6.15.0
new file mode 100644
index 000000000000..ee1838badbd7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-6.15.0
@@ -0,0 +1,15 @@
+BDEPEND=!<dev-perl/Dist-Zilla-Plugin-PromptIfStale-0.40.0 !<=dev-perl/Dist-Zilla-App-Command-update-0.40.0 !<dev-perl/Dist-Zilla-Plugin-CheckExtraTests-0.29.0 !<=dev-perl/Dist-Zilla-PluginBundle-Author-Plicease-2.20.0 !<dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-0.161.230 !<=dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-Filtered-0.1.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.36.0 !<=dev-perl/Dist-Zilla-Plugin-Keywords-0.6.0 !<dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.220.0 !<=dev-perl/Dist-Zilla-Plugin-NameFromDirectory-0.30.0 !<=dev-perl/Dist-Zilla-Plugin-PodWeaver-4.6.0 !<=dev-perl/Dist-Zilla-Plugin-Prereqs-AuthorDeps-0.5.0 !<dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.161.170 !<=dev-perl/Dist-Zilla-Plugin-Run-0.35.0 !<=dev-perl/Dist-Zilla-Plugin-Test-CheckDeps-0.13.0 !<=dev-perl/Dist-Zilla-Plugin-Test-Version-1.50.0 !<=dev-perl/Dist-Zilla-Plugin-TrialVersionComment-0.3.0 !minimal? ( >=dev-perl/Archive-Tar-Wrapper-0.150.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Term-ReadLine-Gnu ) >=dev-perl/App-Cmd-0.330.0 virtual/perl-Archive-Tar >=virtual/perl-CPAN-Meta-2.142.60 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/CPAN-Uploader-0.103.4 virtual/perl-Carp >=dev-perl/Class-Load-0.170.0 dev-perl/Config-INI >=dev-perl/Config-MVP-2.200.11 >=dev-perl/Config-MVP-Reader-INI-2.101.461 virtual/perl-Data-Dumper >=dev-perl/Data-Section-0.200.2 >=dev-perl/DateTime-0.440.0 virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-ExtUtils-Manifest-1.660.0 >=dev-perl/File-Copy-Recursive-0.410.0 dev-perl/File-Find-Rule virtual/perl-File-Path dev-perl/File-ShareDir >=dev-perl/File-ShareDir-Install-0.30.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-pushd dev-perl/JSON-MaybeXS >=dev-perl/Log-Dispatchouli-1.102.220 >=dev-perl/Mixin-Linewise-0.100.0 virtual/perl-Module-CoreList dev-perl/Module-Runtime >=dev-perl/Moose-0.920.0 dev-perl/MooseX-LazyRequire >=dev-perl/MooseX-Role-Parameterized-1.10.0 dev-perl/MooseX-SetOnce dev-perl/MooseX-Types dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/Params-Util >=dev-perl/Path-Tiny-0.52.0 >=dev-perl/Perl-PrereqScanner-1.16.0 virtual/perl-Pod-Simple >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Software-License-0.103.14 virtual/perl-Storable >=dev-perl/String-Formatter-0.100.680 >=dev-perl/String-RewritePrefix-0.6.0 dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/Term-Encoding dev-perl/TermReadKey virtual/perl-Term-ReadLine dev-perl/Term-UI dev-perl/Test-Deep >=dev-perl/Text-Glob-0.80.0 dev-perl/Text-Template dev-perl/Try-Tiny dev-perl/YAML-Tiny virtual/perl-autodie dev-perl/namespace-autoclean virtual/perl-parent virtual/perl-version virtual/perl-ExtUtils-MakeMaker >=dev-perl/File-ShareDir-Install-0.60.0 test? ( >=dev-perl/CPAN-Meta-Check-0.11.0 dev-perl/Test-FailWarnings dev-perl/Test-Fatal dev-perl/Test-File-ShareDir >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=distribution builder; installer not included!
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/Dist-Zilla-Plugin-PromptIfStale-0.40.0 !<=dev-perl/Dist-Zilla-App-Command-update-0.40.0 !<dev-perl/Dist-Zilla-Plugin-CheckExtraTests-0.29.0 !<=dev-perl/Dist-Zilla-PluginBundle-Author-Plicease-2.20.0 !<dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-0.161.230 !<=dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-Filtered-0.1.0 !<=dev-perl/Dist-Zilla-Plugin-Git-2.36.0 !<=dev-perl/Dist-Zilla-Plugin-Keywords-0.6.0 !<dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.220.0 !<=dev-perl/Dist-Zilla-Plugin-NameFromDirectory-0.30.0 !<=dev-perl/Dist-Zilla-Plugin-PodWeaver-4.6.0 !<=dev-perl/Dist-Zilla-Plugin-Prereqs-AuthorDeps-0.5.0 !<dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.161.170 !<=dev-perl/Dist-Zilla-Plugin-Run-0.35.0 !<=dev-perl/Dist-Zilla-Plugin-Test-CheckDeps-0.13.0 !<=dev-perl/Dist-Zilla-Plugin-Test-Version-1.50.0 !<=dev-perl/Dist-Zilla-Plugin-TrialVersionComment-0.3.0 !minimal? ( >=dev-perl/Archive-Tar-Wrapper-0.150.0 >=dev-perl/Data-OptList-0.110.0 dev-perl/Term-ReadLine-Gnu ) >=dev-perl/App-Cmd-0.330.0 virtual/perl-Archive-Tar >=virtual/perl-CPAN-Meta-2.142.60 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/CPAN-Uploader-0.103.4 virtual/perl-Carp >=dev-perl/Class-Load-0.170.0 dev-perl/Config-INI >=dev-perl/Config-MVP-2.200.11 >=dev-perl/Config-MVP-Reader-INI-2.101.461 virtual/perl-Data-Dumper >=dev-perl/Data-Section-0.200.2 >=dev-perl/DateTime-0.440.0 virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-ExtUtils-Manifest-1.660.0 >=dev-perl/File-Copy-Recursive-0.410.0 dev-perl/File-Find-Rule virtual/perl-File-Path dev-perl/File-ShareDir >=dev-perl/File-ShareDir-Install-0.30.0 virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-pushd dev-perl/JSON-MaybeXS >=dev-perl/Log-Dispatchouli-1.102.220 >=dev-perl/Mixin-Linewise-0.100.0 virtual/perl-Module-CoreList dev-perl/Module-Runtime >=dev-perl/Moose-0.920.0 dev-perl/MooseX-LazyRequire >=dev-perl/MooseX-Role-Parameterized-1.10.0 dev-perl/MooseX-SetOnce dev-perl/MooseX-Types dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/Params-Util >=dev-perl/Path-Tiny-0.52.0 >=dev-perl/Perl-PrereqScanner-1.16.0 virtual/perl-Pod-Simple >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Software-License-0.103.14 virtual/perl-Storable >=dev-perl/String-Formatter-0.100.680 >=dev-perl/String-RewritePrefix-0.6.0 dev-perl/Sub-Exporter dev-perl/Sub-Exporter-ForMethods dev-perl/Term-Encoding dev-perl/TermReadKey virtual/perl-Term-ReadLine dev-perl/Term-UI dev-perl/Test-Deep >=dev-perl/Text-Glob-0.80.0 dev-perl/Text-Template dev-perl/Try-Tiny dev-perl/YAML-Tiny virtual/perl-autodie dev-perl/namespace-autoclean virtual/perl-parent virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.015.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=31a0d58fb7bbd0f6e0bcbfe3507c97a3
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1
new file mode 100644
index 000000000000..a13a7724ffa9
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Dist-Zilla-1.0.0 >=dev-perl/Moose-0.340.0 >=dev-perl/MooseX-Types-0.60.0 >=dev-perl/String-Errf-0.1.0 >=dev-perl/namespace-clean-0.60.0 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-CheckDeps-0.10.0 >=virtual/perl-Test-Simple-0.940.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Plugin configuration containing settings for a Git repo
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-Config-Git
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/Dist-Zilla-1.0.0 >=dev-perl/Moose-0.340.0 >=dev-perl/MooseX-Types-0.60.0 >=dev-perl/String-Errf-0.1.0 >=dev-perl/namespace-clean-0.60.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BB/BBYRD/Dist-Zilla-Plugin-Config-Git-0.92.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=d2f6b0cdd5ad9e6711f0c789d5742ff6
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0
new file mode 100644
index 000000000000..178b1339b3f5
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Dist-Zilla dev-perl/Moose >=dev-perl/Path-Tiny-0.70.0 dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker >=dev-perl/Module-Build-Tiny-0.34.0 test? ( virtual/perl-File-Spec virtual/perl-Module-Metadata dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 virtual/perl-if ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
+DESCRIPTION=Copy files from a release (for SCM inclusion, etc.)
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-CopyFilesFromRelease
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Dist-Zilla dev-perl/Moose >=dev-perl/Path-Tiny-0.70.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-CopyFilesFromRelease-0.007.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=0d58b6ed5793c9ffe2243db7802205c8
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.46.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.46.0
new file mode 100644
index 000000000000..75331e7691e8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.46.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/DateTime >=dev-perl/Dist-Zilla-4.200.16 dev-perl/Dist-Zilla-Plugin-Config-Git virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-chdir >=dev-perl/Git-Wrapper-0.21.0 dev-perl/IPC-System-Simple >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/MooseX-Has-Sugar >=dev-perl/Path-Tiny-0.48.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/String-Formatter dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/Types-Path-Tiny dev-perl/Version-Next >=dev-perl/namespace-autoclean-0.90.0 >=virtual/perl-version-0.80.0 virtual/perl-ExtUtils-MakeMaker virtual/perl-Text-ParseWords test? ( >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-CPAN-Meta-Requirements virtual/perl-Encode virtual/perl-Exporter dev-perl/File-Copy-Recursive >=virtual/perl-File-Path-2.70.0 virtual/perl-File-Spec dev-perl/File-Which dev-perl/File-pushd dev-perl/Log-Dispatchouli dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Update your git repository after release
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-Git
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DateTime >=dev-perl/Dist-Zilla-4.200.16 dev-perl/Dist-Zilla-Plugin-Config-Git virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-chdir >=dev-perl/Git-Wrapper-0.21.0 dev-perl/IPC-System-Simple >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime dev-perl/Moose dev-perl/MooseX-Has-Sugar >=dev-perl/Path-Tiny-0.48.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/String-Formatter dev-perl/Try-Tiny dev-perl/Type-Tiny dev-perl/Types-Path-Tiny dev-perl/Version-Next >=dev-perl/namespace-autoclean-0.90.0 >=virtual/perl-version-0.80.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Git-2.046.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=d4781f63daeca5ba751fd19471dd57b3
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0
index abb78fd78815..c9485a07e107 100644
--- a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-perl/Dist-Zilla-4.300.30 >=virtual/perl-Module-Load-0.320.0 dev-perl/Software-License >=dev-perl/Module-Build-Tiny-0.34.0 test? ( dev-perl/JSON ) dev-lang/perl
+BDEPEND=>=dev-perl/Dist-Zilla-4.300.30 >=virtual/perl-Module-Load-0.320.0 dev-perl/Software-License >=dev-perl/Module-Build-Tiny-0.34.0 test? ( dev-perl/JSON dev-perl/Test-Exception ) dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
 DESCRIPTION=Extract License and Copyright from its main_module file
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Dist-Zilla-Plugin-LicenseFromModule-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=6887b5dd663b62305f85cfc14cb2420f
+_md5_=a979d096e1d8d9cd6ff7a3719d755dc7
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0
new file mode 100644
index 000000000000..3d793d740831
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0
@@ -0,0 +1,15 @@
+BDEPEND=!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/Dist-Zilla-5.1.0 dev-perl/Moose dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny >=virtual/perl-Scalar-List-Utils-1.290.0 dev-perl/namespace-autoclean virtual/perl-version >=dev-perl/Module-Build-Tiny-0.34.0 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Module-Metadata dev-perl/Test-Deep dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 virtual/perl-if ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
+DESCRIPTION=A more awesome MakeMaker plugin for Dist::Zilla
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-MakeMaker-Awesome
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<=dev-perl/Dist-Zilla-Plugin-MakeMaker-Fallback-0.11.0 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 >=dev-perl/Dist-Zilla-5.1.0 dev-perl/Moose dev-perl/MooseX-Types-Stringlike dev-perl/Path-Tiny >=virtual/perl-Scalar-List-Utils-1.290.0 dev-perl/namespace-autoclean virtual/perl-version dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-MakeMaker-Awesome-0.48.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=63af766ff12fd7d379810030fd61d0ef
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1
new file mode 100644
index 000000000000..defaf5116687
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Dist-Zilla dev-perl/Moose >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( virtual/perl-File-Spec >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Generate an x_contributors section in distribution metadata
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-Meta-Contributors
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-perl/Dist-Zilla dev-perl/Moose dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Dist-Zilla-Plugin-Meta-Contributors-0.003.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f648b1a0b2a29900ee65fa1c4de12e56
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.11.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.11.0
new file mode 100644
index 000000000000..00589edde2fc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Dist-Zilla-5.22.0 dev-perl/Moose >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/namespace-autoclean >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( >=virtual/perl-CPAN-Meta-2.120.900 virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=List prereqs conditional on operating system
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-OSPrereqs
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/Dist-Zilla-5.22.0 dev-perl/Moose >=virtual/perl-Scalar-List-Utils-1.330.0 dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Dist-Zilla-Plugin-OSPrereqs-0.011.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f5d8f502a50212121c415d7b2addaf78
diff --git a/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.210.0 b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.210.0
new file mode 100644
index 000000000000..793f256637a2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.210.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Dist-Zilla-6.0.0 dev-perl/Moose dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/namespace-autoclean virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-CPAN-Meta-2.120.900 dev-perl/Path-Tiny dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-Version-0.40.0 ) dev-lang/perl
+DESCRIPTION=No line insertion and does Package version with our
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Dist-Zilla-Plugin-OurPkgVersion
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=>=dev-perl/Dist-Zilla-6.0.0 dev-perl/Moose dev-perl/MooseX-Types-Perl dev-perl/PPI dev-perl/namespace-autoclean dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-OurPkgVersion-0.21.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=edd9a1b6eb60f3c9e4a2b1240178e8f8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index d14bb4658761..ca101dffcc80 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Types-Path-Tiny-0.6.0 b/metadata/md5-cache/dev-perl/Types-Path-Tiny-0.6.0
new file mode 100644
index 000000000000..9302ffb37d14
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Types-Path-Tiny-0.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Path-Tiny >=dev-perl/Type-Tiny-0.8.0 >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( virtual/perl-File-Spec >=virtual/perl-File-Temp-0.180.0 dev-perl/File-pushd >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Path::Tiny types and coercions for Moose and Moo
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Types-Path-Tiny
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-perl/Path-Tiny >=dev-perl/Type-Tiny-0.8.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Types-Path-Tiny-0.006.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=017aef25d9c5bca7d10f04d615ce3417
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8c152ecedeb0..a35f7d3aa78c 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.14.2 b/metadata/md5-cache/dev-python/PyQt5-5.14.2
deleted file mode 100644
index 47cb9ce4cc1e..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.20[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.14.2.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66facbda5dd3f60bb72310945402198c
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1 b/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
new file mode 100644
index 000000000000..0462d23cb9fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
+IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.20:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.14.2.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=72aea5a3737914363fa37469db756052
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.0 b/metadata/md5-cache/dev-python/PyQt5-5.15.0
deleted file mode 100644
index 5bae9a784d72..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.23[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
-IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30698f9b376a84356374c0a57fbf8b17
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1 b/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
new file mode 100644
index 000000000000..013e0c65ea4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 ) >=dev-python/sip-4.19.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( virtual/pkgconfig )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/intro
+IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network networkauth opengl positioning printsupport sensors serialport sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.23:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtcore-5.12:5 >=dev-qt/qtxml-5.12:5 bluetooth? ( >=dev-qt/qtbluetooth-5.12:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-qt/qtdbus-5.12:5 ) declarative? ( >=dev-qt/qtdeclarative-5.12:5[widgets?] ) designer? ( >=dev-qt/designer-5.12:5 ) gui? ( >=dev-qt/qtgui-5.12:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.12:5 ) location? ( >=dev-qt/qtlocation-5.12:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.12:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.12:5[ssl=] ) networkauth? ( >=dev-qt/qtnetworkauth-5.12:5 ) opengl? ( >=dev-qt/qtopengl-5.12:5 ) positioning? ( >=dev-qt/qtpositioning-5.12:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.12:5 ) sensors? ( >=dev-qt/qtsensors-5.12:5 ) serialport? ( >=dev-qt/qtserialport-5.12:5 ) sql? ( >=dev-qt/qtsql-5.12:5 ) svg? ( >=dev-qt/qtsvg-5.12:5 ) testlib? ( >=dev-qt/qttest-5.12:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.12:5 ) webkit? ( dev-qt/qtwebkit:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.12:5 ) widgets? ( >=dev-qt/qtwidgets-5.12:5 ) x11extras? ( >=dev-qt/qtx11extras-5.12:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.12:5 )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) networkauth? ( network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) webkit? ( gui network printsupport widgets ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a681c4badb519cc4dc225395b85a53f4
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22
deleted file mode 100644
index 549ebb28e67c..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Private sip module for PyQt5
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2a17fc7f072e09bf311e68299ef2ad09
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
new file mode 100644
index 000000000000..c094acdeaae6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Private sip module for PyQt5
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/12
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2c3a1ffe29cbc0396d3bede78ee42f4
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23
deleted file mode 100644
index 4171df3b8da1..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Private sip module for PyQt5
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.23/sip-4.19.23.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0158edd8c224be3d114c5cca6bd00c7a
diff --git a/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1 b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
new file mode 100644
index 000000000000..c4124122a68d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Private sip module for PyQt5
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/PyQt5-5.12.2
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/12
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.23/sip-4.19.23.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8004c7f1339f7cc7e8ec5bab74aee105
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
index ff2a4a52e70d..e732e58210cc 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] ~dev-python/sip-4.19.22[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] ~dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for QtWebEngine
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQtWebEngine/PyQtWebEngine-5.14.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=966e2e4a58b7d94c68cd0c3f923c5c64
+_md5_=23dc4e53f9de2a51bada945e4dca3d0f
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
index 673d77b3a284..8d1cbe5ba447 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.22[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets] >=dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for QtWebEngine
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pesa/distfiles/PyQtWebEngine-5.15.1.dev2006110847.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3da9c2558b5e0e3e2c5fe1da8a9b962f
+_md5_=49aa30ecdd829055fb1fb47b000cc2c3
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
index 550fcf77938e..46fbd8c2e5dd 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A configurable sidebar-enabled Sphinx theme
 EAPI=7
 HOMEPAGE=https://github.com/bitprophet/alabaster
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c863ea082da956625650b71666f30fd
+_md5_=3b0e496e70b777b5f30a78a8cd82bc2a
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.0 b/metadata/md5-cache/dev-python/amodem-1.15.0
deleted file mode 100644
index 2b8085fa16ad..000000000000
--- a/metadata/md5-cache/dev-python/amodem-1.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Transmit data between two computers using audio
-EAPI=6
-HOMEPAGE=https://github.com/romanz/amodem
-IUSE=python_targets_pypy3 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/romanz/amodem/archive/v1.15.0.tar.gz -> amodem-1.15.0.tar.gz mirror://pypi/a/amodem/amodem-1.15.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8cb5ec83d25623440780d8582a1c93c
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.1 b/metadata/md5-cache/dev-python/amodem-1.15.1
new file mode 100644
index 000000000000..bd253e963ca3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/amodem-1.15.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Transmit data between two computers using audio
+EAPI=7
+HOMEPAGE=https://github.com/romanz/amodem
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/romanz/amodem/archive/v1.15.1.tar.gz -> amodem-1.15.1.tar.gz mirror://pypi/a/amodem/amodem-1.15.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=18c8745393222b6cef139e1ce4a340df
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1 b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
index e35e8855e0dc..1594dbf7a8f6 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=7
 HOMEPAGE=https://pypi.org/project/argcomplete/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.11.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9d6bc5692bca2d73260e2d376a8bc23f
+_md5_=11a285210a005c5012b215693eb933b5
diff --git a/metadata/md5-cache/dev-python/autopep8-1.4.4 b/metadata/md5-cache/dev-python/autopep8-1.4.4
index 366336b922f6..b9b567af858b 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.4.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.4.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pycodestyle-2.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pycodestyle-2.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
 EAPI=7
 HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/pycodestyle-2.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pycodestyle-2.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.4.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=029f7457a5998f9620d8d79e586cf160
+_md5_=ca816eeddd0dda4267487b949d03a6c0
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index 1a1cb11990c2..f9313bee052b 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
 EAPI=7
 HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a87a6f7d4e4ed42d61695d6362d5b0b9
+_md5_=f0f632ddc1116a2b1b84fa53b5fc3eda
diff --git a/metadata/md5-cache/dev-python/backports-os-0.1.1 b/metadata/md5-cache/dev-python/backports-os-0.1.1
index 6c07dab347d4..2f805f4b2aa9 100644
--- a/metadata/md5-cache/dev-python/backports-os-0.1.1
+++ b/metadata/md5-cache/dev-python/backports-os-0.1.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backport of new features in Python's os module
 EAPI=7
 HOMEPAGE=https://github.com/pjdelport/backports.os
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PYTHON
-RDEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/backports[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pjdelport/backports.os/archive/v0.1.1.tar.gz -> backports-os-0.1.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=87a5722862e33767a353e6461b15bbae
+_md5_=0b97035845c26bbf4e3617e47b43631b
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
index 7b1432c51676..77048c339567 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/backports[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/backports[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backport of unittest.mock
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
-IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/backports[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/backports[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd77f76982b5d009e6dc0d79969854aa
+_md5_=00ea2a3e3b28a632723c1511edd4c6b2
diff --git a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1 b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
index 504554eb13db..7b37b119bd7c 100644
--- a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
+++ b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/backports[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Backport of new features in Python's weakref module
 EAPI=7
 HOMEPAGE=https://github.com/PiDelport/backports.weakref https://pypi.org/project/backports.weakref/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2.3
-RDEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/backports[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.weakref/backports.weakref-1.0.post1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca2b50ceb86e69992cdd7ed232490630
+_md5_=02799b92fd541de3ac72bbdfcb3e3acc
diff --git a/metadata/md5-cache/dev-python/bareos-19.2.7 b/metadata/md5-cache/dev-python/bareos-19.2.7
deleted file mode 100644
index 3f511d585b5e..000000000000
--- a/metadata/md5-cache/dev-python/bareos-19.2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=python bindings for bareos network backup suite
-EAPI=7
-HOMEPAGE=https://www.bareos.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.7.tar.gz -> bareos-19.2.7.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dcbcff09df45e6748c838ad4ad72a033
diff --git a/metadata/md5-cache/dev-python/bareos-19.2.8 b/metadata/md5-cache/dev-python/bareos-19.2.8
new file mode 100644
index 000000000000..8d48ec5973ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bareos-19.2.8
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=python bindings for bareos network backup suite
+EAPI=7
+HOMEPAGE=https://www.bareos.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.8.tar.gz -> bareos-19.2.8.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7157e3a21fa23aead748d08faf8da466
diff --git a/metadata/md5-cache/dev-python/blessed-1.17.9 b/metadata/md5-cache/dev-python/blessed-1.17.9
new file mode 100644
index 000000000000..628b1766a6fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/blessed-1.17.9
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library for making terminal apps using colors, keyboard input and positioning
+EAPI=7
+HOMEPAGE=https://github.com/jquast/blessed
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/blessed/blessed-1.17.9.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7daa4761410250a8da0e8581576c4a08
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.7 b/metadata/md5-cache/dev-python/bsddb3-6.2.7
index 894b9fd27596..9e29af6015a5 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.7
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.7
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 )
 DESCRIPTION=Python bindings for Berkeley DB
 EAPI=7
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.7.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=07cc1b4b30bfbac88957f91858db1521
+_md5_=8454244fc312b3a39bbccfe7a57774df
diff --git a/metadata/md5-cache/dev-python/cangjie-1.3 b/metadata/md5-cache/dev-python/cangjie-1.3-r1
similarity index 77%
rename from metadata/md5-cache/dev-python/cangjie-1.3
rename to metadata/md5-cache/dev-python/cangjie-1.3-r1
index 236d4599492a..e456dd6b934e 100644
--- a/metadata/md5-cache/dev-python/cangjie-1.3
+++ b/metadata/md5-cache/dev-python/cangjie-1.3-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/libcangjie dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-i18n/libcangjie
 DESCRIPTION=Python wrapper for libcangjie
-EAPI=6
+EAPI=7
 HOMEPAGE=http://cangjians.github.io/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
@@ -11,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/Cangjians/pycangjie/releases/download/v1.3/cangjie-1.3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2032655b3a98a403a9341709b33dcd67
+_md5_=a85054d00d214493f6b688f15b08593b
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
index 22bab8d5e213..f2dee7c5dd11 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python attributes without the boilerplate
 EAPI=7
 HOMEPAGE=https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic
-IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2221ff941a8f8fed11b88987b8c9abf1
+_md5_=f46b9e977b2a3f5b2f653c0e8ced3996
diff --git a/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1 b/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
index 1e7be0cd0413..245cde3e8121 100644
--- a/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
+++ b/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=Documentation for Cheetah templates
 EAPI=5
-HOMEPAGE=http://www.cheetahtemplate.org/
+HOMEPAGE=https://www.cheetahtemplate.org/
 KEYWORDS=~amd64 ~ia64 ppc x86
 LICENSE=OPL
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://sourceforge/cheetahtemplate/CheetahDocs-0.9.16a1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a82ec7acf3a97884c7266b9bf745b1b3
+_md5_=419a80ab323a188d3e77799da9646b06
diff --git a/metadata/md5-cache/dev-python/cheroot-8.3.0 b/metadata/md5-cache/dev-python/cheroot-8.3.0
deleted file mode 100644
index 6dcc2dd62211..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-8.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-mock-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-xdist-1.2.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=7
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.3.0.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8f0f0c480f05418972866a720c41af9f
diff --git a/metadata/md5-cache/dev-python/cheroot-8.3.0-r1 b/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
index 8d1065a03644..443b68cb31e5 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
+++ b/metadata/md5-cache/dev-python/cheroot-8.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=7
 HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.3.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ca3aae7272db9e2c75f3396408dece1
+_md5_=35452d0962bb10d40de80b4ca98f2046
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.0 b/metadata/md5-cache/dev-python/cheroot-8.4.0
deleted file mode 100644
index 8d8284b24cee..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-8.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-context[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-mock-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/trustme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=7
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.0.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95cb7158b0bf884e0a198d26ea825d9f
diff --git a/metadata/md5-cache/dev-python/cheroot-8.4.1 b/metadata/md5-cache/dev-python/cheroot-8.4.1
deleted file mode 100644
index e1e7fc95f034..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-8.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-context[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-text[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-mock-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/trustme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=7
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-2.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.4.1.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95cb7158b0bf884e0a198d26ea825d9f
diff --git a/metadata/md5-cache/dev-python/ctypesgen-1.0.2 b/metadata/md5-cache/dev-python/ctypesgen-1.0.2
new file mode 100644
index 000000000000..276150f2702a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ctypesgen-1.0.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python wrapper generator for ctypes
+EAPI=7
+HOMEPAGE=https://github.com/davidjamesca/ctypesgen
+IUSE=python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/davidjamesca/ctypesgen/archive/ctypesgen-1.0.2.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=405a24dc888c08bd1cadbe7e45f58b34
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1 b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
index 775dad052de2..868e379585d1 100644
--- a/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+++ b/metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=virtual/blas virtual/lapack sci-libs/amd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/suitesparseconfig:0= sci-libs/umfpack:0= dsdp? ( sci-libs/dsdp:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( >=sci-mathematics/glpk-4.49:0= ) gsl? ( sci-libs/gsl:0= )
 DESCRIPTION=Python package for convex optimization
 EAPI=7
-HOMEPAGE=http://cvxopt.org/ https://github.com/cvxopt/cvxopt
+HOMEPAGE=https://cvxopt.org/ https://github.com/cvxopt/cvxopt
 IUSE=doc +dsdp examples fftw +glpk gsl test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.2.5.tar.gz -> cvxopt-1.2.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab80f3ffb363ead2022582d5c39f106f
+_md5_=eb16fcc502cd8b1586788367b38d6235
diff --git a/metadata/md5-cache/dev-python/dask-2.22.0 b/metadata/md5-cache/dev-python/dask-2.22.0
new file mode 100644
index 000000000000..13a8fa1c05f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2.22.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toolz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/numexpr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3fs-0.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] distributed? ( >=dev-python/distributed-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=7
+HOMEPAGE=https://dask.org/
+IUSE=distributed test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] distributed? ( >=dev-python/distributed-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dask/dask-2.22.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8c1e2cfd0ce76e35a9d5035821dde00c
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.6.0 b/metadata/md5-cache/dev-python/defusedxml-0.6.0
index 3775d16ac67b..e7fe1428e35b 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.6.0
+++ b/metadata/md5-cache/dev-python/defusedxml-0.6.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=XML bomb protection for Python stdlib modules, an xml serialiser
 EAPI=7
 HOMEPAGE=https://pypi.org/project/defusedxml/
-IUSE=examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/defusedxml/defusedxml-0.6.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=14deea0b61282cc2b5391e7db858324a
+_md5_=2cc76d9fa28356e7d2abbfbf297ed152
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1 b/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
index 7b311bd349e9..6f6ffc5316c7 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
+++ b/metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=XML bomb protection for Python stdlib modules, an xml serialiser
 EAPI=7
 HOMEPAGE=https://pypi.org/project/defusedxml/
-IUSE=examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/tiran/defusedxml/archive/v0.7.0.rc1.tar.gz -> defusedxml-0.7.0.rc1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2cbd147f46455f2b296c830a12b6b3e9
+_md5_=d1e108a090dd64ef1d4082ef10cfd39f
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
index 9a31876e67cd..04a060308f5d 100644
--- a/metadata/md5-cache/dev-python/django-redis-4.10.0
+++ b/metadata/md5-cache/dev-python/django-redis-4.10.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/django-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/redis-py-2.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Full featured redis cache backend for Django.
 EAPI=7
 HOMEPAGE=https://github.com/niwinz/django-redis
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-2.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/redis-py-2.10.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc075d5a9cab072f5b728ded4c019e41
+_md5_=6c6ea3bfed79e91487ae32024a6f3869
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r3 b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
index e1abc7c1beaa..6bf6ef755cec 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r3
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=7
 HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2cfeeab0fbd7363ffd0a879b3b82d49
+_md5_=957882e43c5bcb78a6e3e38a41196227
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.5 b/metadata/md5-cache/dev-python/dulwich-0.20.5
new file mode 100644
index 000000000000..399fd771089b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !hppa? ( !ia64? ( dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/geventhttpclient[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ) dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-fastimport[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
+EAPI=7
+HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
+IUSE=doc examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.5.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3c60d5d0980f8a6650cc09852f80ec40
diff --git a/metadata/md5-cache/dev-python/empy-3.3.3 b/metadata/md5-cache/dev-python/empy-3.3.3
index 3d8a7b67a569..ec56fbff4350 100644
--- a/metadata/md5-cache/dev-python/empy-3.3.3
+++ b/metadata/md5-cache/dev-python/empy-3.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A powerful and robust templating system for Python
 EAPI=6
 HOMEPAGE=http://www.alcyone.com/software/empy/
-IUSE=doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~ia64 ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d42abd75c76087b286b15e7def95296
+_md5_=d8a855b2e515d7cedc3559753ae75cf4
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r2 b/metadata/md5-cache/dev-python/fields-5.0.0-r2
index 364c07547358..44e1ed0a187b 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r2
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/characteristic[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/characteristic[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Container class boilerplate killer
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-fields
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9c580586ff963514f010088d5e063728
+_md5_=ebe73285a982bb8941b1ae852a32fdd2
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
index 773637af4517..2232f25ae3d4 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx Themes for Flask related projects and Flask itself
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0aa5dace878857d815f1a622a32a2a43
+_md5_=645e92c4007d6185b3f72b261aeeda79
diff --git a/metadata/md5-cache/dev-python/fsspec-0.8.0 b/metadata/md5-cache/dev-python/fsspec-0.8.0
new file mode 100644
index 000000000000..1dbfa33d0e80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A specification that python filesystems should adhere to
+EAPI=7
+HOMEPAGE=https://github.com/intake/filesystem_spec/ https://pypi.org/project/fsspec/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intake/filesystem_spec/archive/0.8.0.tar.gz -> filesystem_spec-0.8.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6ca6ca973b2dc711142036e384507412
diff --git a/metadata/md5-cache/dev-python/funcy-1.10.1 b/metadata/md5-cache/dev-python/funcy-1.10.1
index fbc5719addfb..d4d17c712add 100644
--- a/metadata/md5-cache/dev-python/funcy-1.10.1
+++ b/metadata/md5-cache/dev-python/funcy-1.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A collection of fancy functional tools focused on practicality
 EAPI=6
 HOMEPAGE=https://github.com/Suor/funcy
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.10.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9dfc75eb1b8c4c4e7c58a75087cbc0a
+_md5_=6835418e80e6d5ceb3aab85a5f403895
diff --git a/metadata/md5-cache/dev-python/funcy-1.14 b/metadata/md5-cache/dev-python/funcy-1.14
index 684e63ea5a5c..e6c426b8a75b 100644
--- a/metadata/md5-cache/dev-python/funcy-1.14
+++ b/metadata/md5-cache/dev-python/funcy-1.14
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A collection of fancy functional tools focused on practicality
 EAPI=6
 HOMEPAGE=https://github.com/Suor/funcy
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.14.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29a350189591cb9d73749e52d4bfa765
+_md5_=34d008503360934ade592637a7f3ba5c
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index c1003fa95d83..6c0fee8aa18a 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/geoip-1.4.8 dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-libs/geoip-1.4.8 dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python bindings for GeoIP
 EAPI=6
 HOMEPAGE=https://github.com/maxmind/geoip-api-python
-IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.3.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0195104378c01a2a7c8e04088409ce91
+_md5_=304e04fd9f61f750bce40b6911bc2401
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1 b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
index 40b6b39bdc34..dd54c56fa534 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Websocket handler for the gevent pywsgi server
 EAPI=7
 HOMEPAGE=https://pypi.org/project/gevent-websocket/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.10.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9690345fe0a2709ce70d13696a08661
+_md5_=5ebc5cc18019818df859f65a6f64d26f
diff --git a/metadata/md5-cache/dev-python/gst-python-1.14.1-r1 b/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
index f2be01658f69..baf9fc01bd8e 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
+++ b/metadata/md5-cache/dev-python/gst-python-1.14.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection] virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection] virtual/pkgconfig
 DESCRIPTION=A Python Interface to GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.1:1.0[introspection] >=media-libs/gst-plugins-base-1.14.1:1.0[introspection]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.14.1.tar.xz
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66288d3e6bad27a5bb466cb652ea1303
+_md5_=7dcbd387f6851df0609adff82a5c0784
diff --git a/metadata/md5-cache/dev-python/gst-python-1.16.2 b/metadata/md5-cache/dev-python/gst-python-1.16.2
index 7f703f574330..191a4650af3c 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.16.2
+++ b/metadata/md5-cache/dev-python/gst-python-1.16.2
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A Python Interface to GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=media-libs/gstreamer-1.16.2:1.0[introspection] >=media-libs/gst-plugins-base-1.16.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.16.2.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f083a4e845283c37450cad7abc53e069
+_md5_=e37781b2a6175a11e66836f3f54c4e5e
diff --git a/metadata/md5-cache/dev-python/helpdev-0.7.1 b/metadata/md5-cache/dev-python/helpdev-0.7.1
index 098d1af69533..d96d0e8772be 100644
--- a/metadata/md5-cache/dev-python/helpdev-0.7.1
+++ b/metadata/md5-cache/dev-python/helpdev-0.7.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helping users and developers to get information about the environment
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/helpdev/helpdev-0.7.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=80aea6e79ae9a0c47933e4aa4986fd4e
+_md5_=ef8495bc1b15709e0ca7f9513808df8f
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index c6ab11b1b8f2..db31a183ea14 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/mercurial ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/mercurial ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=utility lib to generate python package version infos from mercurial tags
 EAPI=5
 HOMEPAGE=https://pypi.org/project/hgdistver/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.25.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=949cd45b8feb7fd320e62e4016dc507a
+_md5_=0c4de6aadf527893e7c915eb14b3f529
diff --git a/metadata/md5-cache/dev-python/html5lib-1.1 b/metadata/md5-cache/dev-python/html5lib-1.1
index a6458348487f..3ba4de146842 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.1
@@ -4,7 +4,7 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=7
 HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3caffd6169bdac95a73c007e6283dff
+_md5_=e647946e8b8aa1ccfcc48b1b4b183dac
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.16.3 b/metadata/md5-cache/dev-python/hypothesis-5.16.3
index ec53b8cca0ed..7508a6065224 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.16.3
+++ b/metadata/md5-cache/dev-python/hypothesis-5.16.3
@@ -4,7 +4,7 @@ DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.16.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=12dfa48583a9e2d4475421f0ae995908
+_md5_=759dd0df2fd8cf30f41564f93cc4bb8b
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.23.8 b/metadata/md5-cache/dev-python/hypothesis-5.23.8
new file mode 100644
index 000000000000..afd2c2572012
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.23.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.23.8.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=092fd3052a2d6f46a6a7f8c4ad137eb8
diff --git a/metadata/md5-cache/dev-python/imagesize-1.1.0 b/metadata/md5-cache/dev-python/imagesize-1.1.0
index 5a71ed5f89eb..c8b62a4a1779 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.1.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure Python module for getting image size from png/jpeg/jpeg2000/gif files
 EAPI=7
 HOMEPAGE=https://github.com/shibukawa/imagesize_py
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92236307b6f916af22f40dc0628a4da6
+_md5_=8544034da3174aa1d2565e82c38295a7
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.0.0 b/metadata/md5-cache/dev-python/iniconfig-1.0.0
index 3a726d3b7518..0d6bcd98910e 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.0.0
+++ b/metadata/md5-cache/dev-python/iniconfig-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Brain-dead simple config-ini parsing
 EAPI=7
 HOMEPAGE=https://github.com/RonnyPfannschmidt/iniconfig
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4f25dec5cbe61b2dd013de934e6717bf
+_md5_=cb970cb9844697e623b31f2ec9837632
diff --git a/metadata/md5-cache/dev-python/ipython-7.17.0 b/metadata/md5-cache/dev-python/ipython-7.17.0
new file mode 100644
index 000000000000..92fb16a13cce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-7.17.0
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/backcall[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pickleshare[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/prompt_toolkit-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.14[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testpath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=7
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipywidgets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/widgetsnbextension[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipyparallel-6.2.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+RDEPEND=dev-python/backcall[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jedi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pickleshare[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/prompt_toolkit-2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-7.17.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=065cd12106ffa4172f7f9ccb2735f3e2
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0 b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
index 370a0c66752e..1c469288d133 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-envs-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Classes for orchestrating Python (virtual) environments.
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.envs
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/namespace-jaraco[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.envs/jaraco.envs-2.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6cb2b4799d806f443249d5eb15ca71b6
+_md5_=cfe8d2dd0e196e4b851ae56cacb75945
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.2.0 b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
index 8726ace57035..96b2b7f5b03d 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=499ecc230a2cc2290c13cb9064e0d508
+_md5_=b9aa132fc6d5a63b925567d97e45c516
diff --git a/metadata/md5-cache/dev-python/jedi-0.14.1 b/metadata/md5-cache/dev-python/jedi-0.14.1
deleted file mode 100644
index 55c19c8cc369..000000000000
--- a/metadata/md5-cache/dev-python/jedi-0.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/parso[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Autocompletion library for Python
-EAPI=7
-HOMEPAGE=https://github.com/davidhalter/jedi
-IUSE=test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-python/parso[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jedi/jedi-0.14.1.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b4bd4516035694e3f64bdf457d30fc7f
diff --git a/metadata/md5-cache/dev-python/jeepney-0.4.3 b/metadata/md5-cache/dev-python/jeepney-0.4.3
index 5a8ee4bb900c..3a66c1b51a5f 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.4.3
+++ b/metadata/md5-cache/dev-python/jeepney-0.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=7
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.4.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e31756da45aa1ba75c31c8ff0c1297b
+_md5_=621435a94127187ff28caeca821f728d
diff --git a/metadata/md5-cache/dev-python/josepy-1.3.0 b/metadata/md5-cache/dev-python/josepy-1.3.0
index a187a32d0c44..71d23c8dc6bd 100644
--- a/metadata/md5-cache/dev-python/josepy-1.3.0
+++ b/metadata/md5-cache/dev-python/josepy-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=JOSE protocol implementation in Python
 EAPI=6
 HOMEPAGE=https://github.com/jezdez/josepy
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<=app-crypt/acme-0.20.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<=app-crypt/acme-0.20.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.3.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d69da0a034934be466c2c26cc149c54
+_md5_=38963ef3af1ad08328de03bb9cd4f596
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1 b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
index 71545985cab4..de5d86436ca6 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Identify specific nodes in a JSON document (according to draft 08)
 EAPI=7
 HOMEPAGE=https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=72ffbd059c2e24a8335c40ed35aff720
+_md5_=887c35a80c2797b65cdd708e48d66858
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index ca67288a6b26..388a34454a64 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
-IUSE=test test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) test? ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=701b4207017b01b9aa939066a3fe0667
+_md5_=f557f48b5fe89d229a9ca0ef240f8dd3
diff --git a/metadata/md5-cache/dev-python/keyring-21.2.1 b/metadata/md5-cache/dev-python/keyring-21.2.1
index 92cf491f8400..5f7ce8a11ba0 100644
--- a/metadata/md5-cache/dev-python/keyring-21.2.1
+++ b/metadata/md5-cache/dev-python/keyring-21.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v21.2.1.tar.gz -> keyring-21.2.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f7d49c10a8a083b6907b13bf1b32eee
+_md5_=1f8bb73f0810b40ec4a60f8e12221699
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0 b/metadata/md5-cache/dev-python/lit-10.0.0
index 9f6d8a49d7aa..e24c5b43ae26 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0
+++ b/metadata/md5-cache/dev-python/lit-10.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm arm64 ppc64 ~x86
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c6a334cb429207dd3df21c21d128aa3a
+_md5_=33bb9bbcc9a2069662a31cfa704fab0e
diff --git a/metadata/md5-cache/dev-python/lit-10.0.1 b/metadata/md5-cache/dev-python/lit-10.0.1
index 65214fa5d89d..ae8830a0da60 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.1
+++ b/metadata/md5-cache/dev-python/lit-10.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=39fdcc7d684b2f72b420936f0fc14a47
+_md5_=28af97f935a6511e8de03091fdaae7e1
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0.9999 b/metadata/md5-cache/dev-python/lit-11.0.0.9999
index cf16e61c51b0..01ffc68aa048 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-11.0.0.9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a493a878f42df6ce57284b750caa3713
+_md5_=95c6c42106d8f76add19500f1a394c09
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0_rc1 b/metadata/md5-cache/dev-python/lit-11.0.0_rc1
index 3a53e1d1a869..60da406085fe 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.0_rc1
+++ b/metadata/md5-cache/dev-python/lit-11.0.0_rc1
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a493a878f42df6ce57284b750caa3713
+_md5_=95c6c42106d8f76add19500f1a394c09
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0.9999 b/metadata/md5-cache/dev-python/lit-12.0.0.9999
index cf16e61c51b0..01ffc68aa048 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-12.0.0.9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a493a878f42df6ce57284b750caa3713
+_md5_=95c6c42106d8f76add19500f1a394c09
diff --git a/metadata/md5-cache/dev-python/lit-9.0.1 b/metadata/md5-cache/dev-python/lit-9.0.1
index a92188cfc660..d47aef92f03f 100644
--- a/metadata/md5-cache/dev-python/lit-9.0.1
+++ b/metadata/md5-cache/dev-python/lit-9.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b4627bda23b5a144ae9fcb38ecda3f2
+_md5_=ab8d534c5670a2ea435ddddb0484001f
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
index e351be347077..f89ebd89c185 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>dev-python/pbr-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=>dev-python/pbr-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Platform-independent file locking module
 EAPI=7
 HOMEPAGE=https://launchpad.net/pylockfile https://pypi.org/project/lockfile/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c53f572041782da495817171a9ddf71
+_md5_=faae8066cf2d1d3d33211187a079404c
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.35.2 b/metadata/md5-cache/dev-python/m2crypto-0.35.2
index 24ed544a2fb7..3818b4e018c1 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.35.2
+++ b/metadata/md5-cache/dev-python/m2crypto-0.35.2
@@ -5,11 +5,11 @@ DESCRIPTION=A Python crypto and SSL toolkit
 EAPI=7
 HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
 IUSE=libressl python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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
 LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.35.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=379d520fc73c25e0e224dbceea69c2a6
+_md5_=9117c804cd2deec8eb00df91965a6c75
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index a25249059ffe..8fd5cdf8c8b0 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -3,13 +3,13 @@ DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=6
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
+IUSE=cairo doc excel examples gtk3 latex test tk wxwidgets python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo gtk3 latex qt5 tk wxwidgets ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo gtk3 latex tk wxwidgets ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1673e3a3cda86b77179c278ce2ce1a1e
+_md5_=35897781e65f4565b11341adc7f0d37d
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.4 b/metadata/md5-cache/dev-python/matplotlib-2.2.4
index bebb71db4607..9f88bfe3564b 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.4
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.4
@@ -3,13 +3,13 @@ DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=6
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo doc excel examples gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
+IUSE=cairo doc excel examples gtk3 latex test tk wxwidgets python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo gtk3 latex qt5 tk wxwidgets ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil:0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo gtk3 latex tk wxwidgets ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81b790967caf37757c768ba36df6d5ee
+_md5_=3e111910570f0b1f878144c9851e1621
diff --git a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1 b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
similarity index 90%
rename from metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
rename to metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
index 7343a8812cdb..1ff5f831aa88 100644
--- a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
@@ -3,13 +3,13 @@ DEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target
 DESCRIPTION=Pure python plotting library with matlab like syntax (py2 version)
 EAPI=6
 HOMEPAGE=https://matplotlib.org/
-IUSE=cairo excel gtk3 latex qt5 test tk wxwidgets python_targets_python2_7 test
+IUSE=cairo excel gtk3 latex test tk wxwidgets python_targets_python2_7 test
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cycler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/python-dateutil:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !<dev-python/matplotlib-3 >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=test? ( cairo gtk3 latex qt5 tk wxwidgets ) || ( python_targets_python2_7 )
+RDEPEND=dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cycler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/python-dateutil:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !<dev-python/matplotlib-3 >=dev-python/pyparsing-1.5.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk3? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=test? ( cairo gtk3 latex tk wxwidgets ) || ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=965a12e309a2c31b8fc5b04e312143db
+_md5_=1ade90d7a1742690f2abeceafe9e76fc
diff --git a/metadata/md5-cache/dev-python/mongomock-3.20.0 b/metadata/md5-cache/dev-python/mongomock-3.20.0
new file mode 100644
index 000000000000..0612ffb2369c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mongomock-3.20.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-5.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pymongo-3.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sentinels-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library to help testing Python code that interacts with MongoDB via Pymongo
+EAPI=7
+HOMEPAGE=https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pymongo-3.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sentinels-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/mongomock/mongomock-3.20.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9930d37d86ad3ac23453ddecfb72bb3c
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5-r1 b/metadata/md5-cache/dev-python/monotonic-1.5-r1
index 539e8fe7f826..5f2608c95bda 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.5-r1
+++ b/metadata/md5-cache/dev-python/monotonic-1.5-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of time.monotonic() for Python 2 & < 3.3
 EAPI=7
 HOMEPAGE=https://github.com/atdt/monotonic
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc21f3bafbc46e0ec282619a3b3d2ee0
+_md5_=5f87fedf8f29d8e571b17d27ca4a1029
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
index 82d340456c5e..68a66a716b04 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.1.0
@@ -1,15 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
-EAPI=6
+EAPI=7
 HOMEPAGE=http://mpmath.org/
-IUSE=gmp matplotlib test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=gmp matplotlib test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=gmp? ( dev-python/gmpy ) matplotlib? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5fabbbe0bfddb1138db23ec1e0966e51
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=05d709b8937945dd42a0fea6a04fd8ff
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
index a0978e8bbf1c..7b8af05a5684 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
 EAPI=7
 HOMEPAGE=https://github.com/Infinidat/munch
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2d3a9fefe6421152ad41c5d4c2a809f8
+_md5_=16272c22e70537f8f01072e73d8b829b
diff --git a/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0 b/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
index 24598a0afad6..b083b1959acf 100644
--- a/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
+++ b/metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install unpack
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Namespace package declaration for sphinxcontrib
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=022f69e39c5b36763a97d5a472992e50
+_md5_=802dd041ad805181f01747928a56ffb9
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r5 b/metadata/md5-cache/dev-python/nose-1.3.7-r5
index 570e1288a1d5..e169ac2bc469 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r5
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r5
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=coverage? ( python_targets_pypy3? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) test? ( python_targets_pypy3? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) )
+DEPEND=coverage? ( python_targets_pypy3? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) test? ( python_targets_pypy3? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python2_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) )
 DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
 EAPI=7
 HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62c9876480b9d99be76756571969e4cd
+_md5_=2cd65d258c91304a0eb7ccc464111bd4
diff --git a/metadata/md5-cache/dev-python/nose-show-skipped-0.1 b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
index 37cd8ac40aec..3ac478ac5af8 100644
--- a/metadata/md5-cache/dev-python/nose-show-skipped-0.1
+++ b/metadata/md5-cache/dev-python/nose-show-skipped-0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A nose plugin to show skipped tests and their messages
 EAPI=6
 HOMEPAGE=https://github.com/cpcloud/nose-show-skipped https://pypi.org/project/nose-show-skipped/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-show-skipped/nose-show-skipped-0.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=835b9f316747e907161651c71c8c7a7a
+_md5_=37b172b16b517ad096a2cfba23046a6f
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.0 b/metadata/md5-cache/dev-python/notebook-6.1.0
new file mode 100644
index 000000000000..1ecc8746f481
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notebook-6.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose_warnings_filters[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install preinst prepare test
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/notebook/notebook-6.1.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=92f009597b8018bab39f977980e382c8
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r1 b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
index d72bc9415f4d..7f719a894fd1 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Python interface to DBus notifications.
 EAPI=6
 HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
-IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b405ef38082070b58116f8751d3ccf5
+_md5_=2102ba9eded89ae9d571ecea56ab9972
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.0 b/metadata/md5-cache/dev-python/numpy-1.19.0
index 8099ea9348b8..93dbc552ddae 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.0
+++ b/metadata/md5-cache/dev-python/numpy-1.19.0
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.0.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e06a4d3f796913f8fba6d1f41a5837a5
+_md5_=9d3f1f018c544edd7f5002f418721d82
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
index c84623b76177..7bfb461d4909 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Theme and extension support for Sphinx documentation
 EAPI=6
 HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.18.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c14ff8bd7d95a674cb93d58ec78a612b
+_md5_=cede684bbe4e17ca970bd97f40d84d06
diff --git a/metadata/md5-cache/dev-python/owslib-0.17.1-r1 b/metadata/md5-cache/dev-python/owslib-0.17.1-r1
index 8ce7083d3d64..8880b94e303c 100644
--- a/metadata/md5-cache/dev-python/owslib-0.17.1-r1
+++ b/metadata/md5-cache/dev-python/owslib-0.17.1-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://geopython.github.io/OWSLib
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/pyproj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] || ( dev-python/elementtree[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-python/pyproj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.17.1.tar.gz -> owslib-0.17.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a5ee5ebc1e9ecc70fb3434ccd39590bd
+_md5_=695c8189e5b0134c4920d8c70bc3b2f7
diff --git a/metadata/md5-cache/dev-python/paver-1.3.4-r1 b/metadata/md5-cache/dev-python/paver-1.3.4-r1
index 397b03af5d0f..8c88b97c8ac9 100644
--- a/metadata/md5-cache/dev-python/paver-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/paver-1.3.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python-based software project scripting tool along the lines of Make
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Paver/ https://github.com/paver/paver
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.3.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8fc14082e8c467b598ca2fd3d2d3f28
+_md5_=68b9afc732588827f94b397d99f3bd7f
diff --git a/metadata/md5-cache/dev-python/peewee-3.1.0 b/metadata/md5-cache/dev-python/peewee-3.1.0
deleted file mode 100644
index 589e9b6b9c76..000000000000
--- a/metadata/md5-cache/dev-python/peewee-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Small python ORM
-EAPI=6
-HOMEPAGE=https://github.com/coleifer/peewee/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/coleifer/peewee/archive/3.1.0.tar.gz -> peewee-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e29b01626e0445369abe3061455dc9a
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1 b/metadata/md5-cache/dev-python/pep8-1.7.1
index d7445fc69e52..787064714218 100644
--- a/metadata/md5-cache/dev-python/pep8-1.7.1
+++ b/metadata/md5-cache/dev-python/pep8-1.7.1
@@ -1,14 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python style guide checker
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/
-IUSE=doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 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
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8560e648fc5cd820847bf2c8c41454dc
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1fa68703d0d4638209362bdb045fe352
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1-r1 b/metadata/md5-cache/dev-python/pep8-1.7.1-r1
deleted file mode 100644
index db96d6e7f566..000000000000
--- a/metadata/md5-cache/dev-python/pep8-1.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python style guide checker
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
-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
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aabf43faabcf2aaa600b60c216f2066b
diff --git a/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415 b/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
index 4605e4bd1cab..4fbab9950d42 100644
--- a/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
+++ b/metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( dev-python/sphinx )
 DEFINED_PHASES=compile install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A library for analysing python pickles safely
 EAPI=7
 HOMEPAGE=https://github.com/CensoredUsername/picklemagic
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/picklemagic-0.0_pre20160415.tar.xz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c94c858b2fbf0ca42e0f3a37d848feca
+_md5_=31abf110d16159a128fcc723e4cb48f2
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index 47613f63a584..5e148bdc368b 100644
--- a/metadata/md5-cache/dev-python/pipfile-0.0.2
+++ b/metadata/md5-cache/dev-python/pipfile-0.0.2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Replacement for the existing standard pip's requirements.txt file
 EAPI=7
 HOMEPAGE=https://github.com/pypa/pipfile
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0 BSD-2
-RDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipfile/archive/v0.0.2.tar.gz -> pipfile-0.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c791c6dc039b59debe48031beba7e638
+_md5_=02fbe416a2fe26af1fb6c8be7f644aaf
diff --git a/metadata/md5-cache/dev-python/pmw-1.3.3-r3 b/metadata/md5-cache/dev-python/pmw-1.3.3-r3
deleted file mode 100644
index 125ed05a3751..000000000000
--- a/metadata/md5-cache/dev-python/pmw-1.3.3-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-python/pmw:0
-DESCRIPTION=Toolkit for building high-level compound Python widgets using the Tkinter module
-EAPI=7
-HOMEPAGE=http://pmw.sourceforge.net/
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=!dev-python/pmw:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=py2
-SRC_URI=mirror://sourceforge/pmw/Pmw.1.3.3.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d9fa882ff4ac6ff754d3c514ac8fec45
diff --git a/metadata/md5-cache/dev-python/polib-1.1.0-r1 b/metadata/md5-cache/dev-python/polib-1.1.0-r1
index a55e8f5e73dd..9b7d10d70f2d 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/polib-1.1.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( dev-python/sphinx )
 DESCRIPTION=A library to manipulate gettext files (.po and .mo files)
 EAPI=7
 HOMEPAGE=https://bitbucket.org/izi/polib/wiki/Home
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e53c3ea4a380dfc343aa91e9fbbb0f7d
+_md5_=8cb3ef613d05414eaaa2e659e140b451
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
index aa0ab53e4340..797decedcebd 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easily displaying tabular data in a visually appealing ASCII table format
 EAPI=7
 HOMEPAGE=https://code.google.com/p/prettytable/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6c4d9a8cc504db05852fa074a131ef3
+_md5_=0033c09e0c5c62cc5ad78f16fe028598
diff --git a/metadata/md5-cache/dev-python/process-tests-2.0.2 b/metadata/md5-cache/dev-python/process-tests-2.0.2
index 2b45e650ea1d..ffe29bdcecbd 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.0.2
+++ b/metadata/md5-cache/dev-python/process-tests-2.0.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tools for testing processes
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=014b49c0096f8ffc207c44afa0f3b7b5
+_md5_=95e4b1ace77c6541f281e2ba329f7a28
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.1 b/metadata/md5-cache/dev-python/process-tests-2.1.1
index 23e7c4b1eeca..3dd33c4e1ddc 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.1
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tools for testing processes
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e4a48cc19553a07c6cbe5d386c98e06d
+_md5_=f941149f6c35012f45e04d88ff99a432
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.5 b/metadata/md5-cache/dev-python/psycopg-2.8.5
index 54a40568d790..15a76b0b667c 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.8.5
+++ b/metadata/md5-cache/dev-python/psycopg-2.8.5
@@ -5,11 +5,11 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=7
 HOMEPAGE=https://www.psycopg.org https://pypi.org/project/psycopg2/
 IUSE=debug python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3a81be1d5c9dd9726ccf8000b86a7a5
+_md5_=26a801354d0ba07e21c2741cbdb38a30
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.34.0 b/metadata/md5-cache/dev-python/pyatspi-2.34.0
index 663544495d5b..23147d65e353 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.34.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.34.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Python client bindings for D-Bus AT-SPI
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2 GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection] !<gnome-extra/at-spi-1.32.0-r1
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection] !<gnome-extra/at-spi-1.32.0-r1
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.34/pyatspi-2.34.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b856bea533afea0905f4fd53fbbff69c
+_md5_=3542383adc5d1f0caaef0a7582b0e720
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.36.0 b/metadata/md5-cache/dev-python/pyatspi-2.36.0
index a231fabf9c48..c4a19586b228 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.36.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.36.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Python client bindings for D-Bus AT-SPI
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2 GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection] !<gnome-extra/at-spi-1.32.0-r1
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection] !<gnome-extra/at-spi-1.32.0-r1
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.36/pyatspi-2.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9dbb1d8383760031cead8a096c94c6ef
+_md5_=195ce1ffb3d3e0eb5d317f7e6cc1a91b
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.6 b/metadata/md5-cache/dev-python/pychm-0.8.6
index b0ddd65c0bd2..29ef933c29f5 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.6
+++ b/metadata/md5-cache/dev-python/pychm-0.8.6
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-libs/chmlib >=dev-python/pytest-4.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-libs/chmlib >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/chmlib
 DESCRIPTION=Python bindings for the chmlib library
 EAPI=7
 HOMEPAGE=https://github.com/dottedmag/pychm
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
-RDEPEND=dev-libs/chmlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-libs/chmlib python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dottedmag/pychm/archive/v0.8.6.tar.gz -> pychm-0.8.6.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a4edb10c9b3e703ab79078289f35563
+_md5_=453c5968a450a6f4607c95b52d8d4124
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.5.0-r1 b/metadata/md5-cache/dev-python/pycodestyle-2.5.0-r1
deleted file mode 100644
index 7b9506ac2d47..000000000000
--- a/metadata/md5-cache/dev-python/pycodestyle-2.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python style guide checker (fka pep8)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pycodestyle/
-IUSE=doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-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
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.5.0.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a3f4043397b80599c57969567c07625d
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.8 b/metadata/md5-cache/dev-python/pycryptodome-3.9.8
index 143d8b28a673..c77014eccaea 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.9.8
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.8
@@ -4,7 +4,7 @@ DESCRIPTION=A self-contained cryptographic library for Python
 EAPI=7
 HOMEPAGE=https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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
 LICENSE=BSD-2 Unlicense
 RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.9.8.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=300c79d055ddc9363486bad6de8dadd4
+_md5_=13fbabcadff7d1ec6c597c4a5ad88c37
diff --git a/metadata/md5-cache/dev-python/pydiff-0.2-r1 b/metadata/md5-cache/dev-python/pydiff-0.2-r1
index b70161090ecf..35134edb06d6 100644
--- a/metadata/md5-cache/dev-python/pydiff-0.2-r1
+++ b/metadata/md5-cache/dev-python/pydiff-0.2-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Diffs two Python files at the bytecode level
 EAPI=7
 HOMEPAGE=https://github.com/myint/pydiff
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydiff/pydiff-0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b768a233ca5ea4d0979786fb53fcb4ba
+_md5_=1b476a00797946e9eb58ff9a461844ee
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.0.2 b/metadata/md5-cache/dev-python/pydocstyle-5.0.2
index b9798a4a2c47..fa0e41bbd510 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-5.0.2
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/snowballstemmer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinxcontrib-issuetracker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinxcontrib-issuetracker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/snowballstemmer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-pep8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tox[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=test? ( dev-python/pytest-pep8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tox[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python docstring style checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/
-IUSE=test doc python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/snowballstemmer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/snowballstemmer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.0.2.tar.gz -> pydocstyle-5.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4fd70d6e75ed45be2bd4db3481c98fc4
+_md5_=79b790c62937741bd1f31191819037d4
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1 b/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
deleted file mode 100644
index 47d6a5dcb9c4..000000000000
--- a/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-pep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tox[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Python docstring style checker
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/pydocstyle/
-IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.0.2.tar.gz -> pydocstyle-5.0.2.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49dbfb734214b3e2f3ccd0f27401fae2
diff --git a/metadata/md5-cache/dev-python/pyenchant-2.0.0 b/metadata/md5-cache/dev-python/pyenchant-2.0.0
index 17522e26c8fb..192f654d33d9 100644
--- a/metadata/md5-cache/dev-python/pyenchant-2.0.0
+++ b/metadata/md5-cache/dev-python/pyenchant-2.0.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( app-text/enchant:0 app-dicts/myspell-en )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( app-text/enchant:0 app-dicts/myspell-en )
 DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=7
 HOMEPAGE=http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=app-text/enchant:0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=app-text/enchant:0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-2.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e8825a94ff4fad5d304c192d3ca447f7
+_md5_=d787847141cad6ae7193cdfd8ee055a3
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index 446af5e432b3..dcfb83ab973b 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.3
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python interface to Fltk library
 EAPI=5
 HOMEPAGE=http://pyfltk.sourceforge.net/
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=LGPL-2
-RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] !dev-python/pyfltk:1 python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.3_py3.tar.gz -> pyFltk-1.3.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eed03ad5b3b81422fde79165dbfe94eb
+_md5_=e1e9a20bae48e19403f1dc4e05608c3b
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r2 b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
index a3fe58d1711b..1a32a27808d9 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r2
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-crypt/gpgme
 DESCRIPTION=A Python wrapper for the GPGME library
 EAPI=7
 HOMEPAGE=https://launchpad.net/pygpgme
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-crypt/gpgme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=295001417786d6ea900056228e489e4f
+_md5_=e40a1e4a733a3b6d9c630bdb002a8d87
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.5 b/metadata/md5-cache/dev-python/pygraphviz-1.5
index 3fc21fbc6763..0e17bff39f62 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.5
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.5
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-gfx/graphviz dev-lang/swig:0 test? ( dev-python/doctest-ignore-unicode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
 EAPI=7
-HOMEPAGE=http://pygraphviz.github.io/
+HOMEPAGE=https://pygraphviz.github.io/
 IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.5.zip
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40a1772bd38c9560ab62d18c5ee215ab
+_md5_=bd4c9d5fbad7709d51501b0a2b53a961
diff --git a/metadata/md5-cache/dev-python/pygresql-5.2 b/metadata/md5-cache/dev-python/pygresql-5.2
new file mode 100644
index 000000000000..5dc95d9fafc5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygresql-5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A Python interface for the PostgreSQL database
+EAPI=6
+HOMEPAGE=https://pygresql.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=POSTGRESQL
+RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.2.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	9613fb90112e2a521b6a8315187c2966	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1570cc55af9194624e96a23e074aadce
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.2 b/metadata/md5-cache/dev-python/pyilmbase-2.5.2
deleted file mode 100644
index 652d084565ab..000000000000
--- a/metadata/md5-cache/dev-python/pyilmbase-2.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/boost-1.62.0-r1:=[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~media-libs/ilmbase-2.5.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=IlmBase Python bindings
-EAPI=7
-HOMEPAGE=https://www.openexr.com
-IUSE=exceptions +numpy test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/boost-1.62.0-r1:=[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~media-libs/ilmbase-2.5.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0/25
-SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> pyilmbase-2.5.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54ed0934812a63a72f5fa71d9ed61f1c
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1 b/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
new file mode 100644
index 000000000000..ef51e3b8c710
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ~media-libs/ilmbase-2.5.2:= sys-libs/zlib python_single_target_python3_6? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_6(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_7(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_8(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_8(-)] ) )
+DESCRIPTION=IlmBase Python bindings
+EAPI=7
+HOMEPAGE=https://www.openexr.com
+IUSE=exceptions +numpy test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ~media-libs/ilmbase-2.5.2:= sys-libs/zlib python_single_target_python3_6? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_6(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_7(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( >=dev-libs/boost-1.62.0-r1:=[python,python_targets_python3_8(-)] numpy? ( >=dev-python/numpy-1.10.4[python_targets_python3_8(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0/25
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> pyilmbase-2.5.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9ae05ebe16b9ab973b9b2ea13c36129
diff --git a/metadata/md5-cache/dev-python/pylast-1.9.0 b/metadata/md5-cache/dev-python/pylast-1.9.0
deleted file mode 100644
index 0a9d3209eb9d..000000000000
--- a/metadata/md5-cache/dev-python/pylast-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=6
-HOMEPAGE=https://github.com/pylast/pylast
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pylast/pylast-1.9.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c0e4b847915b367f8e2a3d7d6d46e10
diff --git a/metadata/md5-cache/dev-python/pymssql-2.1.3 b/metadata/md5-cache/dev-python/pymssql-2.1.3
index 8dcf748ecb52..8511062eee7b 100644
--- a/metadata/md5-cache/dev-python/pymssql-2.1.3
+++ b/metadata/md5-cache/dev-python/pymssql-2.1.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/freetds-0.63[mssql] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-db/freetds-0.63[mssql] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Simple MSSQL python extension module
 EAPI=7
 HOMEPAGE=http://www.pymssql.org/ https://pypi.python.org/pypi/pymssql
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-db/freetds-0.63[mssql] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-db/freetds-0.63[mssql] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pymssql/pymssql-2.1.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90e7cb82754fd2d3a5cce46f7dd93901
+_md5_=38a10176d7804c012a5315798fe03b84
diff --git a/metadata/md5-cache/dev-python/pynacl-1.4.0 b/metadata/md5-cache/dev-python/pynacl-1.4.0
index 7bbd32bbb31b..c008d0df5727 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.4.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=7
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.4.0.tar.gz -> pynacl-1.4.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0731f126715eb6dd9ad2ee855ca96d62
+_md5_=7f9bb491426f97254c75f25ce4243190
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.5 b/metadata/md5-cache/dev-python/pyopengl-3.1.5
index 60b56a1bd7dd..75ade87623db 100644
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),opengl,X] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !prefix? ( media-libs/mesa[llvm] x11-base/xorg-server[-minimal,xorg] ) ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),opengl,X] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !prefix? ( media-libs/mesa[llvm] x11-base/xorg-server[-minimal,xorg] ) ) test? ( media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl )
 DESCRIPTION=Python OpenGL bindings
 EAPI=7
 HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/
-IUSE=test tk python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=tk test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
+RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=8b924507efa61f1ae4b1163cfaf26498
+_md5_=47ea6286107c9bfaf8a8f640b869814c
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
index a32fbbaea05d..1a58f4b01692 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Accelerate module for PyOpenGL
 EAPI=7
 HOMEPAGE=http://pyopengl.sourceforge.net/ https://github.com/mcfletch/pyopengl/ https://pypi.org/project/PyOpenGL-accelerate/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mcfletch/pyopengl/archive/02d11dad9ff18e50db10e975c4756e17bf198464.tar.gz -> pyopengl-3.1.5.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=bfe7bdc02fd5ca7e4d9472fe8701c867
+_md5_=a8bc6c7bbfc9888cb9240136bb199681
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.5.27 b/metadata/md5-cache/dev-python/pyperclip-1.5.27
deleted file mode 100644
index 0037a95182af..000000000000
--- a/metadata/md5-cache/dev-python/pyperclip-1.5.27
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A cross-platform clipboard module for Python.
-EAPI=6
-HOMEPAGE=https://github.com/asweigart/pyperclip
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=|| ( x11-misc/xclip x11-misc/xsel dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.5.27.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e69749451faeddcc63de0b8de6269345
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-7 b/metadata/md5-cache/dev-python/pyproject2setuppy-7
index 6765eb962d64..383e753153d9 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-7
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-7
@@ -4,7 +4,7 @@ DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pyproject2setuppy
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v7.tar.gz -> pyproject2setuppy-7.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2c1ab56869df5564841742b1f00247b7
+_md5_=1a01da3a58fe4c073c23d9fbbcfa37b6
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.1-r1 b/metadata/md5-cache/dev-python/pypy-7.3.1-r2
similarity index 100%
rename from metadata/md5-cache/dev-python/pypy-7.3.1-r1
rename to metadata/md5-cache/dev-python/pypy-7.3.1-r2
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.1-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.1-r2
similarity index 100%
rename from metadata/md5-cache/dev-python/pypy3-7.3.1-r1
rename to metadata/md5-cache/dev-python/pypy3-7.3.1-r2
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
index 67ccb10ce3b0..81fed6593058 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python interface to the sendfile(2) system call
 EAPI=7
 HOMEPAGE=https://github.com/giampaolo/pysendfile
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b6ec0e75c0aa57ff34fdc00ad5a6f85
+_md5_=1ba7134677293390f5c2fc61940b24c4
diff --git a/metadata/md5-cache/dev-python/pytest-3.10.1 b/metadata/md5-cache/dev-python/pytest-3.10.1
index cb4b3465b59d..409a2fef3006 100644
--- a/metadata/md5-cache/dev-python/pytest-3.10.1
+++ b/metadata/md5-cache/dev-python/pytest-3.10.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/more-itertools-6.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pluggy-0.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-40[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !!dev-python/flaky !!dev-python/pytest-capturelog !!<dev-python/pytest-xdist-1.22 )
 DESCRIPTION=Simple powerful testing with Python
 EAPI=7
-HOMEPAGE=http://pytest.org/
+HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.10.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=50d3b67f11081931fe749be91d9e8284
+_md5_=a91611123e2caebe496846012be079e1
diff --git a/metadata/md5-cache/dev-python/pytest-4.5.0 b/metadata/md5-cache/dev-python/pytest-4.5.0
index 8376fa1d7898..026e482c4249 100644
--- a/metadata/md5-cache/dev-python/pytest-4.5.0
+++ b/metadata/md5-cache/dev-python/pytest-4.5.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pluggy-0.11[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1 >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-40[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !!dev-python/flaky )
 DESCRIPTION=Simple powerful testing with Python
 EAPI=7
-HOMEPAGE=http://pytest.org/
+HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.5.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b8e48463b7d976a46e9f3d2da50ed19f
+_md5_=a1aa7a2d2858ed989b08aaf57e3fac15
diff --git a/metadata/md5-cache/dev-python/pytest-4.6.11 b/metadata/md5-cache/dev-python/pytest-4.6.11
index 4bf2243d0e9f..64ec19d31e49 100644
--- a/metadata/md5-cache/dev-python/pytest-4.6.11
+++ b/metadata/md5-cache/dev-python/pytest-4.6.11
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( >=dev-python/atomicwrites-1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!dev-python/flaky !!dev-python/pytest-aiohttp !!dev-python/pytest-asyncio !!dev-python/pytest-django python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Simple powerful testing with Python
 EAPI=7
-HOMEPAGE=http://pytest.org/
+HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.6.11.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eef610ab843b5271f98795d2501434e1
+_md5_=0e718387060f9965d503766b19ffa69d
diff --git a/metadata/md5-cache/dev-python/pytest-6.0.1 b/metadata/md5-cache/dev-python/pytest-6.0.1
index be9a943de15c..96d45166f580 100644
--- a/metadata/md5-cache/dev-python/pytest-6.0.1
+++ b/metadata/md5-cache/dev-python/pytest-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0c4e827ec431e4f81c87bd6487cd50eb
+_md5_=1861531fa2b7edede22ba40c17fb80d0
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
index 36e73a56aa9b..07b74d0db2a6 100644
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=mechanisms for caching across test runs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-cache/ https://bitbucket.org/hpk42/pytest-cache/ https://pythonhosted.org/pytest-cache/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=137c27be597bf8501b9e1bff64aa39ad
+_md5_=ca2a5f5822087908356cb99fae8d28ae
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r3 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r3
deleted file mode 100644
index 3b58dcc6d21a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=mechanisms for caching across test runs
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-cache/ https://bitbucket.org/hpk42/pytest-cache/ https://pythonhosted.org/pytest-cache/
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d8b6ddf211473a300831204efefa34c
diff --git a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2 b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
index 08c4cf257ed0..521050d67843 100644
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/py-1.1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( >=dev-python/py-1.1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=py.test plugin to catch log messages, fork of pytest-capturelog
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pytest-catchlog/ https://github.com/eisensheng/pytest-catchlog
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/py-1.1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/pytest-capturelog python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/py-1.1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/pytest-capturelog python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-catchlog/pytest-catchlog-1.2.2.zip
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a3188759bb3fdf381bd3573a23f0399
+_md5_=22f74f14cff8684c877d20111cbf3871
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.8.1 b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
index 4f8d33f4479f..f53698eb250d 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.8.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fields[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/process-tests-2.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fields[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/process-tests-2.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=py.test plugin for coverage reporting
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/
-IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/coverage-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/coverage-4.4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.8.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a069b6840e759b0173e231ee6ac4c8e2
+_md5_=582d03492fdf338388d8172c67a591d2
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
index c5a58606b57a..84d73b8b206a 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=py.test plugin that stores test expectations by saving the set of failing tests
 EAPI=7
 HOMEPAGE=https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/u-msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/u-msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5bfe88024ffaee1110e220df26f9881a
+_md5_=d3138e45b9de2455d8577ac5eda46ac3
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
index 45e926b82c22..37ec190f3b65 100644
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=pytest plugin to check PEP8 requirements
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-pep8/
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=09933b32cc8016678f5e8ea815d074cc
+_md5_=2991830cab9c445f6aa34e182edbdca2
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
deleted file mode 100644
index a98a8bbb178a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=pytest plugin to check PEP8 requirements
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-pep8/
-IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51ac627316be1c847c296c7d0f4b1df0
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0 b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
index 9ce00e64594f..3a81178d6def 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin to re-run tests to eliminate flaky failures
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-rerunfailures/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-8.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d0ffdfa826d938a982de1adfe973a68
+_md5_=ee6077d8f2404742f4779014a74ee404
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1 b/metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1
index d8ea0484df83..866b9f429550 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=py.test plugin to abort hanging tests
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.4.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5970abf3e29785792dbc3a972cd3df0
+_md5_=8079a119e39fdf4f82cfa124cef99d9a
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2 b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2
index 3e008bba1662..ba5bacf4629d 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pytest-cov[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=py.test plugin to abort hanging tests
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.4.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5970abf3e29785792dbc3a972cd3df0
+_md5_=8079a119e39fdf4f82cfa124cef99d9a
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.34.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.34.0
new file mode 100644
index 000000000000..11ddc5480c7c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.34.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/filelock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Distributed testing and loop-on-failing modes
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.34.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c0d795b62d36b98b5b1b2053801c62aa
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1 b/metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1
index 73769b5df43f..617cbafa6a69 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-libs/gobject-introspection dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/intltool ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-libs/gobject-introspection dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/intltool ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Gettext support, themed icons and scrollkeeper-based documentation in distutils
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/python-team/modules/python-distutils-extra https://launchpad.net/python-distutils-extra
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/2.44/python-distutils-extra-2.44.tar.bz2
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cff996c73a6dff9dc3c0692272842314
+_md5_=e6e0cc300776f3b0a29f2011770b8e24
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.45 b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
index aae8574f076c..46a1f7b1a8d1 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.45
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.45
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-libs/gobject-introspection dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/intltool ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-libs/gobject-introspection dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/intltool ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Gettext support, themed icons and scrollkeeper-based documentation in distutils
 EAPI=7
 HOMEPAGE=https://salsa.debian.org/python-team/modules/python-distutils-extra https://launchpad.net/python-distutils-extra
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/2.45/python-distutils-extra-2.45.tar.bz2
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=baed19ff7ae55b18118ade4841aba0ac
+_md5_=9088ebc177178a997f244001eae4b96b
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4 b/metadata/md5-cache/dev-python/python-editor-1.0.4
index 026a5d70b056..9bb6a92e186d 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Programmatically open an editor, capture the result.
 EAPI=7
 HOMEPAGE=https://github.com/fmoo/python-editor
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5e02edfcddf378127e9435179348f93f
+_md5_=f4eb8359f986ae7edc0184c7c0a0c949
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index d68289888fc3..a25b907cd965 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.34.0 virtual/pkgconfig test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) app-mobilephone/gammu[dbi] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=app-mobilephone/gammu-1.34.0 virtual/pkgconfig test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) app-mobilephone/gammu[dbi] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python bindings for Gammu
 EAPI=6
 HOMEPAGE=https://wammu.eu/python-gammu/
-IUSE=examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc396480e8ccc8d9ce0c89262db8d291
+_md5_=d50c30b6670304355b3d100c2cf90f1f
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1 b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
index d243a65551cb..7d129f18519e 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Google's Python argument parsing library
 EAPI=7
 HOMEPAGE=https://github.com/google/python-gflags
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f21bc53aba11bb28d032bb4b57558a3
+_md5_=fc240b4a44e1ea3cdbe54f4c5d1e1c09
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.2.0 b/metadata/md5-cache/dev-python/python-ldap-3.2.0
index 63850b5e98dd..757afdce3f95 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.2.0
+++ b/metadata/md5-cache/dev-python/python-ldap-3.2.0
@@ -1,15 +1,15 @@
-BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Various LDAP-related Python modules
 EAPI=7
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
-IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=PSF-2
-RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=506af20ffe797d8389c7728b92b21945
+_md5_=297212d839ad369fef219d4b94482025
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index 318cc0fbb0da..39b23cb215a1 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -1,14 +1,14 @@
-BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Various LDAP-related Python modules
 EAPI=7
 HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
-IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=PSF-2
 PROPERTIES=live
-RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1731f1e12d745117e86ccbdc412b99e
+_md5_=2a7fca9a0bd9ad719df9c435d89ae20a
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.18 b/metadata/md5-cache/dev-python/python-magic-0.4.18
index 022b6f7e871f..8965a99f830f 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.18
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.18
@@ -1,15 +1,15 @@
-BDEPEND=test? ( sys-apps/file ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( sys-apps/file ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Access the libmagic file type identification library
 EAPI=7
 HOMEPAGE=https://github.com/ahupp/python-magic
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=sys-apps/file[-python] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=sys-apps/file[-python] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ahupp/python-magic/archive/0.4.18.tar.gz -> python-magic-0.4.18.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b9672968068600e29edd9ccb9e338012
+_md5_=98963bbd869b772e6f2fb802063482cf
diff --git a/metadata/md5-cache/dev-python/python-slip-0.6.5 b/metadata/md5-cache/dev-python/python-slip-0.6.5
index c3d507c5d7a5..5882301304bb 100644
--- a/metadata/md5-cache/dev-python/python-slip-0.6.5
+++ b/metadata/md5-cache/dev-python/python-slip-0.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Miscellaneous convenience, extension and workaround code for Python
 EAPI=5
 HOMEPAGE=https://github.com/nphilipp/python-slip
-IUSE=dbus selinux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=dbus selinux python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-auth/polkit ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-auth/polkit ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=993ec9b5d671d6253d1a2ad2282e6d48
+_md5_=a5315048a40491a8eb41369a9de3463b
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.27 b/metadata/md5-cache/dev-python/python-xlib-0.27
index 1cd4eaebe709..ad3208f6c07e 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.27
+++ b/metadata/md5-cache/dev-python/python-xlib-0.27
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( sys-apps/texinfo )
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( sys-apps/texinfo )
 DESCRIPTION=A fully functional X client library for Python, written in Python
 EAPI=7
 HOMEPAGE=https://github.com/python-xlib/python-xlib
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
 KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=LGPL-2+
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.27/python-xlib-0.27.tar.bz2
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=b3872bf3992239c184e5c5b9a754bcdf
+_md5_=7c995cabb0e1ac1c5c166a887fbc53c7
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.20 b/metadata/md5-cache/dev-python/pytoml-0.1.20
index 8e809f547852..9d57a7a5e438 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.20
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.20
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A TOML-0.4.0 parser/writer for Python
 EAPI=7
 HOMEPAGE=https://github.com/avakar/pytoml
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.20.tar.gz -> pytoml-0.1.20.tar.gz test? ( https://github.com/avakar/toml-test/archive/b212790a6b7367489f389411bda009e5ff765f20.tar.gz -> toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz )
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4ac40a354ae7eba93d9065e9f431d0ec
+_md5_=1d8cf2310b18f45c0f8e0b496bf94c2f
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1 b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
index d94442d93094..3b6d746f1619 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Discrete Wavelet Transforms in Python
 EAPI=7
 HOMEPAGE=https://pywavelets.readthedocs.io/en/latest/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cd590a394ca38594f90f8aae881b6e21
+_md5_=3879c6e1c6afb5e646e85af0c40e255e
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 7b8e77989472..ad47b977e54b 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/m2r[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/m2r[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/m2r[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/m2r[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[gui,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/m2r[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/m2r[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/m2r[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/m2r[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/qtsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( dev-python/qtsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[gui,testlib,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=A dark style sheet for QtWidgets application
 EAPI=7
 HOMEPAGE=https://github.com/ColinDuquesnoy/QDarkStyleSheet
 IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[gui,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v2.8.1.tar.gz -> qdarkstyle-2.8.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa17704fd973703c66680874a8296abe
+_md5_=becb4ba68ad18057f3d39ece3ccaf4d9
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.11.4 b/metadata/md5-cache/dev-python/qscintilla-python-2.11.4
index fa3b555b35e5..524ac88c91ee 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.11.4
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.11.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.4:= ~dev-python/sip-4.19.22[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.4:= ~dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python bindings for QScintilla
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.4:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.4:=
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=233e039decd394118128288add433514
+_md5_=2978188d6f340eb0fcbd9739b49034a2
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.11.5 b/metadata/md5-cache/dev-python/qscintilla-python-2.11.5
index ddaade062e80..e0b7c4ff7168 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.11.5
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.11.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:= >=dev-python/sip-4.19.22[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:= >=dev-python/sip-4.19.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python bindings for QScintilla
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=debug python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.12[gui,printsupport,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-sip-4.19.22:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.11.5:=
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.5/QScintilla-2.11.5.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c5251522cd1792bbdf517642902dec5b
+_md5_=6c2bb46bd8127d1498039ba2caaba72d
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.3.1 b/metadata/md5-cache/dev-python/qtconsole-4.3.1
index 75a135ba5850..815745cc6dee 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.3.1
+++ b/metadata/md5-cache/dev-python/qtconsole-4.3.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/ipython-4.0.0-r2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/nose-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),svg,testlib] ) dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),svg] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Qt-based console for Jupyter with support for rich media output
 EAPI=6
-HOMEPAGE=http://jupyter.org
+HOMEPAGE=https://qtconsole.readthedocs.io
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.3.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0340bc55bc7856a410de46c529ed65c3
+_md5_=6bc326906a6c7035335c70e54e437737
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.7.4 b/metadata/md5-cache/dev-python/qtconsole-4.7.4
index de166844416b..ce148edd7473 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.7.4
+++ b/metadata/md5-cache/dev-python/qtconsole-4.7.4
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/QtPy[python_targets_python3_6(-)?,python_targets_pyth
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Qt-based console for Jupyter with support for rich media output
 EAPI=7
-HOMEPAGE=http://jupyter.org
+HOMEPAGE=https://qtconsole.readthedocs.io
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.7.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=450adfc6ddd9047bdc0212a7a898d941
+_md5_=7c43f143535e60a804fd9307d37f4b56
diff --git a/metadata/md5-cache/dev-python/rebulk-2.0.1 b/metadata/md5-cache/dev-python/rebulk-2.0.1
index 57447bb555c7..5f7d44288e40 100644
--- a/metadata/md5-cache/dev-python/rebulk-2.0.1
+++ b/metadata/md5-cache/dev-python/rebulk-2.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that performs advanced searches in strings
 EAPI=7
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=MIT Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-2.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13c83aad8c97daadd18ba88e82bc41a6
+_md5_=ac562f7a6839280c168f1f5d3e772d8d
diff --git a/metadata/md5-cache/dev-python/reno-2.11.3 b/metadata/md5-cache/dev-python/reno-2.11.3
index a7737da0ff19..a8067a1c3219 100644
--- a/metadata/md5-cache/dev-python/reno-2.11.3
+++ b/metadata/md5-cache/dev-python/reno-2.11.3
@@ -1,14 +1,14 @@
-BDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.11.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a4c39e9b936a70752c90336ee4f8a06d
+_md5_=c5b2288f9534b7bcf9cead889133c262
diff --git a/metadata/md5-cache/dev-python/reno-2.7.0 b/metadata/md5-cache/dev-python/reno-2.7.0
index 6ea674b36e34..9714c202ae96 100644
--- a/metadata/md5-cache/dev-python/reno-2.7.0
+++ b/metadata/md5-cache/dev-python/reno-2.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
 EAPI=6
 HOMEPAGE=https://pypi.org/project/reno/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pbr-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.7.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84fa6dd1f3f28a737d4aa3f9151bc108
+_md5_=c6f737056a76bd56230a3e1a2b58b5da
diff --git a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0 b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
index 9cb101ebccab..ccb301384e46 100644
--- a/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+++ b/metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Use requests to talk HTTP via a UNIX domain socket
 EAPI=7
 HOMEPAGE=https://github.com/msabramo/requests-unixsocket
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-unixsocket/requests-unixsocket-0.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a434430bc075fe130e9f7aaadad9d8a1
+_md5_=7dbae03cf74a4c35178b0fdefb0e687b
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
index 42b00c941600..4b62e3295baa 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A pure python RFC3339 validator
 EAPI=7
 HOMEPAGE=https://github.com/naimetti/rfc3339-validator
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> rfc3339-validator-0.1.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2f2f64185710dc8241af908f43a0f545
+_md5_=c2b228bf38d216a735777549384a5286
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.2.0 b/metadata/md5-cache/dev-python/rfc3986-1.2.0
index 3b4ef1a45505..58e7da01b1b4 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.2.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01c44507a179c144e5b9752833741bf1
+_md5_=59f067aa2284264cc2644951b0152f78
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.4.0 b/metadata/md5-cache/dev-python/rfc3986-1.4.0
index ceb2755e0e17..6f2907070259 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.4.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.4.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
-IUSE=idna test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86
+IUSE=idna test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.4.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=be8043905e021adf228f79edd846d050
+_md5_=f74ac96290652048fe19b56fab878016
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index 24a87d2c35eb..c4efa54d08da 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python RFC3986 validator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=128cfa07bd5c3a740a3bbc4f64ed9563
+_md5_=85e6237e4f83ff0a1a2d99237901756d
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index 53e41a336d9c..698e1a5c18db 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=7
 HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1d9f3cb33245e208806878738027906
+_md5_=ceb76524714be2d283cb4dadb9861310
diff --git a/metadata/md5-cache/dev-python/ryu-4.26-r1 b/metadata/md5-cache/dev-python/ryu-4.26-r1
index 02da56f25910..0469f61af06a 100644
--- a/metadata/md5-cache/dev-python/ryu-4.26-r1
+++ b/metadata/md5-cache/dev-python/ryu-4.26-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Component-based Software-defined Networking Framework
 EAPI=6
-HOMEPAGE=http://osrg.github.io/ryu/
+HOMEPAGE=https://ryu-sdn.org/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.26.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34e1ec885ca55fae7042f1c8b4a6311b
+_md5_=0ad50288b1d33acbab488c3ce7e7a8c8
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.2 b/metadata/md5-cache/dev-python/secretstorage-3.1.2
index 27ccc0628944..48dfef32f196 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.2
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=7
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-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
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d9173fa726a179fe039ad3d0a877fac8
+_md5_=731662c2a66f50bf4ff06d3a91859465
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.13 b/metadata/md5-cache/dev-python/simpy-3.0.13
index f60cab1182f9..f7f734ed991f 100644
--- a/metadata/md5-cache/dev-python/simpy-3.0.13
+++ b/metadata/md5-cache/dev-python/simpy-3.0.13
@@ -2,7 +2,7 @@ BDEPEND=doc? ( || ( ( dev-lang/python:3.8[tk] dev-python/sphinx[python_targets_p
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Object-oriented, process-based discrete-event simulation language
 EAPI=7
-HOMEPAGE=http://simpy.readthedocs.org/en/latest/
+HOMEPAGE=https://simpy.readthedocs.org
 IUSE=doc test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-3.0.13.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef0e3a8a447fb74ed40db338cc6abbfa
+_md5_=e37a392ae2869750e235b4d09872509f
diff --git a/metadata/md5-cache/dev-python/sip-4.19.22 b/metadata/md5-cache/dev-python/sip-4.19.22
deleted file mode 100644
index 62683b6435f3..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4739ff9e9a5d8c11fefe7cc647951e74
diff --git a/metadata/md5-cache/dev-python/sip-4.19.22-r1 b/metadata/md5-cache/dev-python/sip-4.19.22-r1
new file mode 100644
index 000000000000..f5574c059ad1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.19.22-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/12
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.22/sip-4.19.22.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2ad800d721d13a592394b020b47523d
diff --git a/metadata/md5-cache/dev-python/sip-4.19.23 b/metadata/md5-cache/dev-python/sip-4.19.23
deleted file mode 100644
index c12a4f3b1bd9..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.19.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=7
-HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/12
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.23/sip-4.19.23.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9d2a725f26ca8c8f8f117717e7fc02f1
diff --git a/metadata/md5-cache/dev-python/sip-4.19.23-r1 b/metadata/md5-cache/dev-python/sip-4.19.23-r1
new file mode 100644
index 000000000000..3dfdad7db440
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sip-4.19.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=7
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/12
+SRC_URI=https://www.riverbankcomputing.com/static/Downloads/sip/4.19.23/sip-4.19.23.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff7f6234aa7c9e2190052e404e1e821a
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0 b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
index 05ab74a9d5a5..de0f4bf2f1ed 100644
--- a/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+++ b/metadata/md5-cache/dev-python/snowballstemmer-2.0.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Stemmer algorithms generated from Snowball algorithms
 EAPI=7
 HOMEPAGE=https://snowballstem.org/ https://github.com/snowballstem/snowball https://pypi.org/project/snowballstemmer/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-2.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b615190dec231dca9c84c8ba152fe475
+_md5_=2f420fc6b05923902f9825c37665dbd7
diff --git a/metadata/md5-cache/dev-python/sphinx-1.7.5-r2 b/metadata/md5-cache/dev-python/sphinx-1.7.5-r2
index c42de942bb16..d2c99fb912db 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.7.5-r2
+++ b/metadata/md5-cache/dev-python/sphinx-1.7.5-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-2.1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/docutils-0.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) net? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python documentation generator
 EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org/
+HOMEPAGE=https://www.sphinx-doc.org/
 IUSE=doc latex net test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.7.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb8bad7235f3db329eddb90434a4bd18
+_md5_=9a3dd95d7c1cffd838c5b279b3b3d0a0
diff --git a/metadata/md5-cache/dev-python/sphinx-2.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
index 8280b2182b0e..8a20b6b7d55f 100644
--- a/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-2.0.1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/sphinxcontrib-websupport dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng )
 DESCRIPTION=Python documentation generator
 EAPI=7
-HOMEPAGE=http://www.sphinx-doc.org/
+HOMEPAGE=https://www.sphinx-doc.org/
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-2.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d1d21666de8b655f66dd878dcdbe6d3
+_md5_=47cdef7ce3496ede857fadaff26c5310
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
index c9c33b778849..cc1f36a778b9 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx theme integrates the Bootstrap CSS / JavaScript framework
 EAPI=7
 HOMEPAGE=https://ryan-roemer.github.io/sphinx-bootstrap-theme/README.html
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=46a0ae8589588c500002f7c8130e5165
+_md5_=0b13af05772f3799a90086b4d43bcd6a
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
index e486b0dc5f05..b769570def7d 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Enhanced Sphinx theme (based on Python 3 docs)
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx_py3doc_enhanced_theme/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=896038bba3ec6528d057b6ef2e18aa70
+_md5_=9353819f09f7f918dc102e34ce5efd46
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
deleted file mode 100644
index b1307001b048..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Sphinx websupport extension
-EAPI=6
-HOMEPAGE=http://www.sphinx-doc.org
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-RDEPEND=>=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0446b08ad58b799a97ebf117e28c199e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
index 4ba5db1f129e..1a7d16599a3e 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=doc examples +sqlite test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc examples +sqlite test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.11.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=85d001eab6b0e6516ba5ec89b49d33bc
+_md5_=78095bd1d7dc042be3154397bd8d304d
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
index 10cd8aac7ede..cd9e952b4543 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite?] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite?] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0[sqlite?] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite?] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite?] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[sqlite?] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+IUSE=examples +sqlite test test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.17.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=979c5860f9518ab83a1b0c00d54c94e6
+_md5_=0fc538c06547e09895d5d6ba65931c25
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
index cef840d9af2d..6532c11de897 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Strict, simple, lightweight RFC3339 functions
 EAPI=7
 HOMEPAGE=https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/danielrichman/strict-rfc3339/archive/version-0.7.tar.gz -> strict-rfc3339-version-0.7.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d2bcb3e5d480e50f9317aa883e1f8b9e
+_md5_=c3480ca45924946a4e12593631c049af
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.10.1 b/metadata/md5-cache/dev-python/subvertpy-0.10.1
index 66cf5fd7e5d5..d98e098ec5e8 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.10.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/subversion-1.4 dev-libs/apr-util python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-vcs/subversion-1.4 dev-libs/apr-util python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Alternative Python bindings for Subversion
 EAPI=6
 HOMEPAGE=https://jelmer.uk/code/subvertpy/ https://pypi.org/project/subvertpy
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-vcs/subversion-1.4 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/subvertpy/subvertpy-0.10.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a5e53fd06e65cddd86a68a590e56927
+_md5_=d958a699aca998329d0cb57bad2b62a5
diff --git a/metadata/md5-cache/dev-python/sure-1.4.11 b/metadata/md5-cache/dev-python/sure-1.4.11
index 848be4022e2e..ccd6df55558e 100644
--- a/metadata/md5-cache/dev-python/sure-1.4.11
+++ b/metadata/md5-cache/dev-python/sure-1.4.11
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/sure
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.4.11.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=82e9788c50dc0c5ac82054b77ec7cf41
+_md5_=96fb0ca19021ad94e40da26692da381b
diff --git a/metadata/md5-cache/dev-python/tenacity-6.1.0 b/metadata/md5-cache/dev-python/tenacity-6.1.0-r1
similarity index 55%
rename from metadata/md5-cache/dev-python/tenacity-6.1.0
rename to metadata/md5-cache/dev-python/tenacity-6.1.0-r1
index 63d26a186ae6..86366aeb91da 100644
--- a/metadata/md5-cache/dev-python/tenacity-6.1.0
+++ b/metadata/md5-cache/dev-python/tenacity-6.1.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=General-purpose retrying library
 EAPI=7
 HOMEPAGE=https://github.com/jd/tenacity
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-6.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=85a7d074ff34d69173bce038579fdedb
+_md5_=2a186d477cf0c887d3d60100b311dbd7
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index 016b224c8d0b..54aa0476c4a6 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=ANSII Color formatting for output in terminal
 EAPI=7
 HOMEPAGE=https://pypi.org/project/termcolor/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=03b9dee6e157c63018b3860fb3fdc9bc
+_md5_=0446d0b0b907f526cf81dddc0639059d
diff --git a/metadata/md5-cache/dev-python/testpath-0.4.4-r1 b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
index 774cc78f3d96..a888a91a78c4 100644
--- a/metadata/md5-cache/dev-python/testpath-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/testpath-0.4.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Test utilities for code working with files and commands
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.4.4.tar.gz -> testpath-0.4.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=49c8344c2eb29966e976a68f851bc00b
+_md5_=4cd4074f3fe0839d989edd24b296cf87
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index cb597147345a..54641778e48e 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=6
 HOMEPAGE=https://github.com/SimonSapin/tinycss/ https://tinycss.readthedocs.io/en/latest/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a2b843055ff86155d37d62c1ab55f24
+_md5_=da3dee02d409dd76cb153c56f87d3125
diff --git a/metadata/md5-cache/dev-python/twine-3.2.0 b/metadata/md5-cache/dev-python/twine-3.2.0
index 999a98d0d231..658dd09aac7a 100644
--- a/metadata/md5-cache/dev-python/twine-3.2.0
+++ b/metadata/md5-cache/dev-python/twine-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of utilities for publishing packages on PyPI
 EAPI=7
 HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.2.0.tar.gz -> twine-3.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51da5ae6fc93b3aed5318b687f18f91a
+_md5_=505b4e3bac592f89a52ecd3d483737bc
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.6.0 b/metadata/md5-cache/dev-python/u-msgpack-2.6.0
index 87e2bed971d2..ed4f1e42e735 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.6.0
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.6.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A portable, lightweight MessagePack serializer and deserializer
 EAPI=7
 HOMEPAGE=https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.6.0.tar.gz -> u-msgpack-2.6.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b358719f95004c3939f33e5fff8ad8b
+_md5_=8688287799d18175078eeb679e70a47d
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.7.0 b/metadata/md5-cache/dev-python/u-msgpack-2.7.0
new file mode 100644
index 000000000000..1cecc3de4df2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A portable, lightweight MessagePack serializer and deserializer
+EAPI=7
+HOMEPAGE=https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.7.0.tar.gz -> u-msgpack-2.7.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6b969220ef7b6d6c6b375636b1e1af50
diff --git a/metadata/md5-cache/dev-python/ujson-3.1.0 b/metadata/md5-cache/dev-python/ujson-3.1.0
new file mode 100644
index 000000000000..11fa218a40a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ujson-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Ultra fast JSON encoder and decoder for Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ujson/
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/ujson/ujson-3.1.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7fae640d1d3f43dc98dec044efdf4fdc
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
index 0eba498c0d50..b173294e222f 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Drop-in replacement for python stdlib csv module supporting unicode
 EAPI=7
 HOMEPAGE=https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2eafd09d697c9d011b294e4d02a8ab5e
+_md5_=35c20fb9cc851944b750e01c3787f787
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.0 b/metadata/md5-cache/dev-python/urwid-2.1.0
index 8209fd0e4ff8..3fde9aef8e79 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.0
+++ b/metadata/md5-cache/dev-python/urwid-2.1.0
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[ncurses] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[ncurses] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[ncurses] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[ncurses] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9[ncurses] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[ncurses] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[ncurses] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[ncurses] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Curses-based user interface library for Python
 EAPI=7
 HOMEPAGE=http://urwid.org/ https://pypi.org/project/urwid/
-IUSE=examples doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e6307ed0884d500b53bf0d37dc56914
+_md5_=d840126b3929f6323302071334871e62
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.1.0 b/metadata/md5-cache/dev-python/vcrpy-4.1.0
new file mode 100644
index 000000000000..8a67d4891348
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vcrpy-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up testing
+EAPI=7
+HOMEPAGE=https://github.com/kevin1024/vcrpy
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.1.0.tar.gz -> vcrpy-4.1.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=54103bcd94ccbbe7398109394d18e105
diff --git a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0 b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
index 86ff92389625..fee2db974c98 100644
--- a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+++ b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Use version control tags to discover version numbers
 EAPI=5
 HOMEPAGE=https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.16.0.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=392e6a580580911601fe38abc1aec77c
+_md5_=c458bb97b3fe90085bb3787aae9f0331
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.29 b/metadata/md5-cache/dev-python/virtualenv-20.0.29
new file mode 100644
index 000000000000..31973e23a743
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.29
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/towncrier[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/towncrier[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/towncrier[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=7
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.0.29.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=592d199276d6f6b84d6a99d4a588c939
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.11.5 b/metadata/md5-cache/dev-python/voluptuous-0.11.5
index 8347fc96dd80..f86a63cab0d3 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.11.5
+++ b/metadata/md5-cache/dev-python/voluptuous-0.11.5
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python data validation library.
 EAPI=7
 HOMEPAGE=https://github.com/alecthomas/voluptuous
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.11.5.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ab1f57c8af8c5dc45dcba29a8071d2d
+_md5_=caeed974c8df26f65ab084b48973dc5a
diff --git a/metadata/md5-cache/dev-python/webcolors-1.10 b/metadata/md5-cache/dev-python/webcolors-1.10
deleted file mode 100644
index 0279633fdb05..000000000000
--- a/metadata/md5-cache/dev-python/webcolors-1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Color names and value formats defined by the HTML and CSS specifications
-EAPI=7
-HOMEPAGE=https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/webcolors/webcolors-1.10.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7a3d1f5edcd257e2bf2085e0920916cf
diff --git a/metadata/md5-cache/dev-python/wsproto-0.15.0 b/metadata/md5-cache/dev-python/wsproto-0.15.0
index eea6f7933a98..ab3270f23819 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.15.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.15.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/h11-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-python/dataclasses[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/h11-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=WebSockets state-machine based protocol implementation
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/h11-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-python/dataclasses[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/h11-0.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.15.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d22149899605d2040629de6910b56b4f
+_md5_=96d1eeea3d199a88cc488554c7ed59c8
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.8 b/metadata/md5-cache/dev-python/wstools-0.4.8
index 7cc033a78505..7073d9f592ac 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.8
+++ b/metadata/md5-cache/dev-python/wstools-0.4.8
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=WSDL parsing services package for Web Services for Python
 EAPI=7
 HOMEPAGE=https://github.com/pycontribs/wstools https://pypi.org/project/wstools/
-IUSE=test test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.8.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3ed1550ae8a8a613f4c656bf00a66dbb
+_md5_=0bad3b6d4f3a5fd7cd5bd87225a4408b
diff --git a/metadata/md5-cache/dev-python/xlrd-1.2.0 b/metadata/md5-cache/dev-python/xlrd-1.2.0
index 458accd0af4e..29e50baeaa97 100644
--- a/metadata/md5-cache/dev-python/xlrd-1.2.0
+++ b/metadata/md5-cache/dev-python/xlrd-1.2.0
@@ -2,7 +2,7 @@ BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library to extract data from Microsoft Excel spreadsheets
 EAPI=7
-HOMEPAGE=http://www.python-excel.org/
+HOMEPAGE=https://www.python-excel.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-1.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b25f772d3eff10dc724a972a448bd270
+_md5_=4048d4f8076ad30bdd38a74dd3dcc523
diff --git a/metadata/md5-cache/dev-python/yarl-1.5.1 b/metadata/md5-cache/dev-python/yarl-1.5.1
new file mode 100644
index 000000000000..5b922be8446c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yarl-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/multidict-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Yet another URL library
+EAPI=7
+HOMEPAGE=https://github.com/aio-libs/yarl/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/y/yarl/yarl-1.5.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=59a3af19e9a01808578e0f2442a5391f
diff --git a/metadata/md5-cache/dev-python/zope-component-4.4.1 b/metadata/md5-cache/dev-python/zope-component-4.4.1
index db0819339a28..5c85fbf13720 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/namespace-zope[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-event[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zope-interface-4.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=test? ( dev-python/namespace-zope[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zope-interface-4.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Zope Component Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.component https://docs.zope.org/zope.component/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=ZPL
-RDEPEND=dev-python/namespace-zope[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-event[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zope-interface-4.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/namespace-zope[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zope-interface-4.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.4.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7a377da2e26682e29f458d6af0460caf
+_md5_=b5c6afc03a5bd0d706f3c62b92c0144d
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.3.1 b/metadata/md5-cache/dev-python/zope-configuration-4.3.1
index 03bcf4d655ee..37378599a09c 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.3.1
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.3.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope Configuration Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.configuration https://docs.zope.org/zope.configuration/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
-RDEPEND=dev-python/zope-i18nmessageid[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zope-schema-4.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/zope-i18nmessageid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zope-schema-4.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.3.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=838526c3a61d77394f770c56db0bd5b9
+_md5_=795b1a191bf471214da0ecbe516e0d91
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.3 b/metadata/md5-cache/dev-python/zope-exceptions-4.3
index 42595c5dc138..afeb9ce8e0fb 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.3
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testrunner[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testrunner[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=General purpose exceptions for Zope packages
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
-RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95318c920f1c2ce16c94b45ec2e1dc56
+_md5_=e5bd9cd190f0c714748a0bfcb8e7009b
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
index c1b8372682f8..7a14a402d64f 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope i18nmessageid Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.i18nmessageid http://docs.zope.org/zope.i18nmessageid/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-5.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e1182673cc431124967a4128746edc3a
+_md5_=66c6e1435b5413f35b18e438665d5c63
diff --git a/metadata/md5-cache/dev-python/zope-schema-4.9.3 b/metadata/md5-cache/dev-python/zope-schema-4.9.3
index 65d9368a0cd6..78a89e5238a9 100644
--- a/metadata/md5-cache/dev-python/zope-schema-4.9.3
+++ b/metadata/md5-cache/dev-python/zope-schema-4.9.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-testrunner[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-testrunner[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope schema Architecture
 EAPI=7
 HOMEPAGE=https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
-RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-4.9.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f2949df8a2376a0d11b4d6aecce20e7
+_md5_=faf916415e139140b71524a81dfabf3d
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.1 b/metadata/md5-cache/dev-python/zope-testrunner-5.1
index ad5b0f2a58de..a61bca13380d 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.1
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Zope testrunner script
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner
-IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ZPL
-RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=409b9ee8d4dcb4c869d6b97f4bd1403a
+_md5_=bd6312f39b2f5cc46fe743029c5eb94f
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 64ad3d6b8ece..4a47b6adefc2 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
index e2945da5bb8f..dce00e4fbd75 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d80384d4bf8b0170f734a99ee9edb23
+_md5_=deee6244d4298b9bae3d37b7e290677e
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
index 0f7ad1350f59..5580535f08b6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_msgs[ros_messages_cxx(-)] dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d80384d4bf8b0170f734a99ee9edb23
+_md5_=deee6244d4298b9bae3d37b7e290677e
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
index 28ea66d8f1a9..9e168571679d 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521bf30aafef812aae87a005c04d0500
+_md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
index 950662d163f6..64653c315ecb 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Plugin for transparently sending depth images using PNG compression
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_depth_image_transport https://github.com/ros-perception/image_transport_plugins
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521bf30aafef812aae87a005c04d0500
+_md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
index 046db63d4b39..5ae175ca8d10 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=314c7143b7b53834fd9856c4c427d582
+_md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index ee1264c0bc8a..4c1cef843c36 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=314c7143b7b53834fd9856c4c427d582
+_md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
index c1a6fbf5585c..c285c3c01cb9 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da38ef6a09d930e6d462717f8355ff7
+_md5_=e28097cc705e599902a138ef76cf4088
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 13f34d731b34..dc2efc4a908d 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da38ef6a09d930e6d462717f8355ff7
+_md5_=e28097cc705e599902a138ef76cf4088
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
index 3b7b5bbd5b31..bc72c2f69c3e 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.8.tar.gz -> depthimage_to_laserscan-1.0.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9001c7b240b4ea3c87868e410f39e505
+_md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 949bad340d93..b1270c87a23a 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9001c7b240b4ea3c87868e410f39e505
+_md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
index 6ea309150be1..5491f3faa13b 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.0.tar.gz -> dynamic_reconfigure-1.7.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c8e8baa5c74e4a1d783bf6a9307387
+_md5_=5ce78cfbe04334f68528756e66072afe
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 259e23a5a319..41bdc887243c 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c8e8baa5c74e4a1d783bf6a9307387
+_md5_=5ce78cfbe04334f68528756e66072afe
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.2 b/metadata/md5-cache/dev-ros/image_proc-1.15.2
index 0e464508b9a7..f9f324416d9c 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d1cab9cbc25699f774129e55de76e2
+_md5_=c717f6ff2c5c1c0362c8d712a7c794bb
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index d20301efb3fa..5fdf8dd5df5b 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/roscpp dev-libs/console_bridge:= media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d1cab9cbc25699f774129e55de76e2
+_md5_=c717f6ff2c5c1c0362c8d712a7c794bb
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2 b/metadata/md5-cache/dev-ros/image_view-1.15.2
deleted file mode 100644
index 11474beeb024..000000000000
--- a/metadata/md5-cache/dev-ros/image_view-1.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Simple viewer for ROS image topics
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8141dbe91fe5f566ee1bb082e1d5408
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2-r1 b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
new file mode 100644
index 000000000000..59f1f5433cf3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Simple viewer for ROS image topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index 4c330a30f093..2ec334f42e8d 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8141dbe91fe5f566ee1bb082e1d5408
+_md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
index 12690f99aa08..2c5e336ff5ef 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63b70f3e8d4bb1a869be081829f979ef
+_md5_=470bfb8d39b27cbaf6b2e960b585a7ef
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index 07293e19479e..7883f9d63d22 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63b70f3e8d4bb1a869be081829f979ef
+_md5_=470bfb8d39b27cbaf6b2e960b585a7ef
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
index 554739c53aff..27b2c1214942 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b2fd172315e335530976ec56e5ab607
+_md5_=74fc7a5d1a6af63c16fbfd2bdc50b049
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index d858cc727bd4..688968a21e82 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_cb_detector https://github.com/ros-perception/calibration
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b2fd172315e335530976ec56e5ab607
+_md5_=74fc7a5d1a6af63c16fbfd2bdc50b049
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.11 b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
index d74ddbaac029..c548255c6e84 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=928580a640be09799b2d537f2d7990f7
+_md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index b95250d053b3..bd75ae151f80 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ros/laser_geometry dev-ros/pluginlib dev-ros/angles dev-ros/dynamic_reconfigure dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=928580a640be09799b2d537f2d7990f7
+_md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
index 7a37e6868163..f16795480711 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66daa314118b10711f88ec5629a5ef4
+_md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 2b3331cda131..fdb13193ba46 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66daa314118b10711f88ec5629a5ef4
+_md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
index bdf230fdfaa4..8b512fbdd9c7 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.1.tar.gz -> opencv_apps-2.0.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=996f277f5edd0928949f1fb064f925ed
+_md5_=0ffc28c764e0676746b7d4a932844880
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index d8670c61e8a2..b7ac78d6e6de 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslaunch dev-ros/rostest dev-ros/rosbag dev-ros/rosservice dev-ros/rostopic dev-ros/image_proc dev-ros/topic_tools dev-ros/compressed_image_transport ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b56cb0eba749cbd19e4821c7ac52c2b6
+_md5_=eb9c64172d963edbe55bd45f25351765
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.4 b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
index f60c15ffdd42..c1dd5a918b2f 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -1,6 +1,6 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=071f9945e8e7dae278c249a929834ba0
+_md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index 7fa214738486..7da6e15b65d1 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=071f9945e8e7dae278c249a929834ba0
+_md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
deleted file mode 100644
index 7a00237248d7..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Set of tools for recording from and playing back ROS message
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
index f979a049f056..3ba59ecb2e22 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
+_md5_=f8ee30278fb18467d5297c02a04a80e1
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 6b4eff56bfe2..87da980c6f36 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/pluginlib dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b376a886272105ae167556a4bccaf26f
+_md5_=f8ee30278fb18467d5297c02a04a80e1
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.7 b/metadata/md5-cache/dev-ros/roslaunch-1.15.7
deleted file mode 100644
index 81135c7638f4..000000000000
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Tool for easily launching multiple ROS nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0516d5fd31e564acfb84127d1b2e221b
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.7 b/metadata/md5-cache/dev-ros/rosnode-1.15.7
deleted file mode 100644
index f34372df16e6..000000000000
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91cfe798c6aaf51a4e7279f89823655
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.8 b/metadata/md5-cache/dev-ros/rosnode-1.15.8
index 8a7180e30b41..2eb79d6a5978 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91cfe798c6aaf51a4e7279f89823655
+_md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 9bba13fdc605..d95e0c5a1487 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91cfe798c6aaf51a4e7279f89823655
+_md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
index b45842148715..e34f979f7757 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb045b5894ab4e11e07fb3ae01949c9a
+_md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index 8b9b522b5126..30dccc5031b3 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb045b5894ab4e11e07fb3ae01949c9a
+_md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
deleted file mode 100644
index 33008c274414..000000000000
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=Unit tests for rosbag_storage
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index a9941bb74af1..50725b48e61f 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/rosbag_storage dev-ros/rosbag dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0af2801fcc7f9a908b68b2ca52127fff
+_md5_=ccb741cd674addcfa76d8f54ba889e57
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
deleted file mode 100644
index 36290d96f826..000000000000
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=C++ implementation of the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
deleted file mode 100644
index c9e74319f248..000000000000
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
-DESCRIPTION=C++ implementation of the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=+python_single_target_python3_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
index 3468b4e691e3..e0da809a3612 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
+_md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index a6e896ff5ff5..6d8e33090489 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e5fecdde253ed2037b490e81e167990
+_md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 1b03ecf29446..ff30fb225680 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index fc1cd36da1e8..95637de690aa 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Ruby/NTLM HTTP provides NTLM authentication over http
 EAPI=5
 HOMEPAGE=http://www.mindflowsolutions.net/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ntlm-http-0.1.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfb60d272928708d11e6c1a96b1189cf
+_md5_=ccf78e7117742e8cb9273466d1f3222d
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.9.0 b/metadata/md5-cache/dev-ruby/omniauth-1.9.0
deleted file mode 100644
index d26e5d47494f..000000000000
--- a/metadata/md5-cache/dev-ruby/omniauth-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby24(-)] <dev-ruby/rack-3:*[ruby_targets_ruby24(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby24(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby25(-)] <dev-ruby/rack-3:*[ruby_targets_ruby25(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby25(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby26(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/rack-test[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A generalized Rack framework for multiple-provider authentication
-EAPI=6
-HOMEPAGE=https://github.com/intridea/omniauth
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby24(-)] <dev-ruby/rack-3:*[ruby_targets_ruby24(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby24(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby25(-)] <dev-ruby/rack-3:*[ruby_targets_ruby25(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby25(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby26(-)] <dev-ruby/hashie-3.7.0:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intridea/omniauth/archive/v1.9.0.tar.gz -> omniauth-1.9.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f759fee5805b3af4ba3d639838780ae8
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
index 1a742dcacc6a..6055d0d613b3 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=OpenSSL CBC-MAC (CCM) ruby gem
 EAPI=6
 HOMEPAGE=https://github.com/SmallLars/openssl-ccm
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.2.2
 SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f5037004dffd95d14b76634d23e219b
+_md5_=e7a4e7a44cae6ae17f6d681d3961543f
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.0 b/metadata/md5-cache/dev-ruby/optimist-3.0.0
deleted file mode 100644
index ef9a34f481bf..000000000000
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/chronic[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/chronic[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/chronic[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A commandline option parser for Ruby that just gets out of your way.
-EAPI=6
-HOMEPAGE=https://manageiq.github.io/optimist/
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/optimist-3.0.0.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=566e37fc63496f374b91b1e10340f6d3
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index 3a8e09e99751..378b8e83cfac 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Robust options validation for Ruby methods
 EAPI=5
 HOMEPAGE=https://github.com/durran/optionable
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/optionable-0.2.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56a96bd752c1974bbd625ae1eff4a026
+_md5_=62cc2c23ae55c74c903bb6f9447fe67a
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index c82ebd17b15e..6634e83c28a7 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/tilt[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/tilt[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/tilt[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Ruby routines for parsing org-mode files
 EAPI=5
 HOMEPAGE=https://github.com/wallyqs/org-ruby
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rubypants-0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a695cb39432f042d8de37edbbef88418
+_md5_=f6a43393f8fcfe6b3d83aa2094ef0ffb
diff --git a/metadata/md5-cache/dev-ruby/paint-2.1.0 b/metadata/md5-cache/dev-ruby/paint-2.1.0
deleted file mode 100644
index 5f30c3398727..000000000000
--- a/metadata/md5-cache/dev-ruby/paint-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Terminal painter
-EAPI=6
-HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/janlelis/paint/archive/v2.1.0.tar.gz -> paint-2.1.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cafc0edbc56cc92650a73f61d97987e7
diff --git a/metadata/md5-cache/dev-ruby/paint-2.1.1 b/metadata/md5-cache/dev-ruby/paint-2.1.1
deleted file mode 100644
index e4187b8eeead..000000000000
--- a/metadata/md5-cache/dev-ruby/paint-2.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Terminal painter
-EAPI=7
-HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/janlelis/paint/archive/v2.1.1.tar.gz -> paint-2.1.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=949e58d002fce000c30cee5ca4c0705e
diff --git a/metadata/md5-cache/dev-ruby/paramesan-0.1.1 b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
index b6775d15d3a5..51b8f47fbd75 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-0.1.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Parameterized tests in Ruby
 EAPI=6
 HOMEPAGE=https://github.com/jpace/paramesan
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpace/paramesan/archive/v0.1.1.tar.gz -> paramesan-0.1.1.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9a3cbd745fa099da7eebf25b0db9b763
+_md5_=4082f55aca0133f24586924aecfc11ca
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0 b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
index bcd1b5570d0f..55fe95eeac4a 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.13.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=net-libs/libpcap ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Libpcap bindings for ruby compat
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/pcaprub
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=net-libs/libpcap ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=net-libs/libpcap ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=test
 SLOT=0.13
 SRC_URI=https://rubygems.org/gems/pcaprub-0.13.0.gem
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=badd58764f0200fd72e9da6b8af36329
+_md5_=996a4e30a6a8234d3ed8aa250d5e8e3b
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 14137721cf68..3b790db8cfde 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] !!dev-ruby/psych[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Library performing operations with permutations of sequences (strings, arrays)
 EAPI=5
 HOMEPAGE=https://flori.github.com/permutation
-IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=|| ( Ruby-BSD BSD-2 )
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/permutation-0.1.8.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a03fe7e390718ccad3ebd137f736e22
+_md5_=4040ccd498c3e933dbd154e68e780704
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b4a0a27b2aab..25b33a77c666 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/bibtex2html-1.98 b/metadata/md5-cache/dev-tex/bibtex2html-1.98
deleted file mode 100644
index d01acdeadc16..000000000000
--- a/metadata/md5-cache/dev-tex/bibtex2html-1.98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-tex/hevea )
-DESCRIPTION=A bibtex to HTML converter
-EAPI=5
-HOMEPAGE=https://www.lri.fr/~filliatr/bibtex2html/
-IUSE=doc +ocamlopt
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b1ea90e0f3c7fa6f480d97b6fd13bdad
diff --git a/metadata/md5-cache/dev-tex/latex2html-2017.2-r2 b/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
index afb11b998f07..38ecc54f102b 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
+++ b/metadata/md5-cache/dev-tex/latex2html-2017.2-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Convertor written in Perl that converts LATEX documents to HTML
 EAPI=6
 HOMEPAGE=https://www.latex2html.org/
 IUSE=gif png
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base media-libs/netpbm dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/support/latex2html/latex2html-2017.2.tar.gz
-_md5_=d22460082ccdb9cc3d3c851bcdafc492
+_md5_=34b2da6d67a203d15432383b1f0918ac
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2e9e4ce31e9c..eca22cdd2327 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1 b/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1
deleted file mode 100644
index bab1bf70dabf..000000000000
--- a/metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.37.0
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=Cargo subcommand that visualizes crate dependency graph in a tree-like format
-EAPI=7
-HOMEPAGE=https://github.com/sfackler/cargo-tree
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 Boost-1.0 MIT
-RDEPEND=<virtual/rust-1.44.0
-SLOT=0
-SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cargo-tree/0.29.0/download -> cargo-tree-0.29.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fixedbitset/0.1.9/download -> fixedbitset-0.1.9.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/ordermap/0.3.5/download -> ordermap-0.3.5.crate https://crates.io/api/v1/crates/petgraph/0.4.13/download -> petgraph-0.4.13.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.5/download -> proc-macro-error-0.4.5.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.5/download -> proc-macro-error-attr-0.4.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rustversion/1.0.2/download -> rustversion-1.0.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.45/download -> serde_json-1.0.45.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.8/download -> structopt-0.3.8.crate https://crates.io/api/v1/crates/structopt-derive/0.4.1/download -> structopt-derive-0.4.1.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.4.0/download -> syn-mid-0.4.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	59ecae2c29d723be70671fd182038195	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d01f3d5964a286d513c9a16b5511a39
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.10 b/metadata/md5-cache/dev-util/ccache-3.7.10
index 84f2b8fcd2c7..e74a358ed2c4 100644
--- a/metadata/md5-cache/dev-util/ccache-3.7.10
+++ b/metadata/md5-cache/dev-util/ccache-3.7.10
@@ -4,11 +4,11 @@ DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.10/ccache-3.7.10.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2d1b7ec1c878c9dda17aa4f13378657f
+_md5_=71b971b476bde88ad17bb42d82f6edb3
diff --git a/metadata/md5-cache/dev-util/cmake-3.17.2 b/metadata/md5-cache/dev-util/cmake-3.17.4
similarity index 96%
rename from metadata/md5-cache/dev-util/cmake-3.17.2
rename to metadata/md5-cache/dev-util/cmake-3.17.4
index 6a911bfc2519..24077061367a 100644
--- a/metadata/md5-cache/dev-util/cmake-3.17.2
+++ b/metadata/md5-cache/dev-util/cmake-3.17.4
@@ -10,6 +10,6 @@ LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://cmake.org/files/v3.17/cmake-3.17.2.tar.gz
+SRC_URI=https://cmake.org/files/v3.17/cmake-3.17.4.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	f274d2f953f93e2d88cd3e0b2ce376a9	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff7b1c10c3a068c209710f519f70098b
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.1 b/metadata/md5-cache/dev-util/cmake-3.18.1
new file mode 100644
index 000000000000..b6b7ff3e1dd8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.18.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	f274d2f953f93e2d88cd3e0b2ce376a9	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d822506327eb5e85a35736438631344d
diff --git a/metadata/md5-cache/dev-util/debugedit-4.15.1 b/metadata/md5-cache/dev-util/debugedit-4.15.1
index 0e5e12f968b9..1f39ece1959e 100644
--- a/metadata/md5-cache/dev-util/debugedit-4.15.1
+++ b/metadata/md5-cache/dev-util/debugedit-4.15.1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 >=dev-libs/elfutils-0.176-r1 dev-libs
 DESCRIPTION=Stand-alone debugedit from RPM
 EAPI=7
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 >=dev-libs/elfutils-0.176-r1 dev-libs/nss
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.15.x/rpm-4.15.1.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0a048bbe755afe7517721fb53798ddfc
+_md5_=fb7f2bbb70a9254f47caa7c132c3e77c
diff --git a/metadata/md5-cache/dev-util/diffoscope-153 b/metadata/md5-cache/dev-util/diffoscope-154
similarity index 98%
rename from metadata/md5-cache/dev-util/diffoscope-153
rename to metadata/md5-cache/dev-util/diffoscope-154
index 568251d5a5ab..2774d56e61bc 100644
--- a/metadata/md5-cache/dev-util/diffoscope-153
+++ b/metadata/md5-cache/dev-util/diffoscope-154
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libarchive-c[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) gzip? ( app-arch/gzip ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( virtual/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-153.tar.gz
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-154.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a85a6138cd89a5c900bce6a7729fe62e
diff --git a/metadata/md5-cache/dev-util/dwarves-1.12 b/metadata/md5-cache/dev-util/dwarves-1.12
deleted file mode 100644
index 5fc742c7cc81..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.12.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ceac71dd3d81320f4bb2a8ab84f9bb8
diff --git a/metadata/md5-cache/dev-util/dwarves-1.13 b/metadata/md5-cache/dev-util/dwarves-1.13
deleted file mode 100644
index bc7a5e80058a..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.13.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a47a32116dc0c5f9448524198acbc795
diff --git a/metadata/md5-cache/dev-util/dwarves-1.15 b/metadata/md5-cache/dev-util/dwarves-1.15
deleted file mode 100644
index 9bed00880f3d..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.15.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8786cb20c8ececc7b7ae5d11aa30ac1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.16 b/metadata/md5-cache/dev-util/dwarves-1.16
deleted file mode 100644
index 8452440add98..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.16.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8786cb20c8ececc7b7ae5d11aa30ac1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.16-r1 b/metadata/md5-cache/dev-util/dwarves-1.16-r1
deleted file mode 100644
index 33d26021c47d..000000000000
--- a/metadata/md5-cache/dev-util/dwarves-1.16-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.178 sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=6
-HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.16.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=132a8e785e8f8e0e279f6c41ec9cb6d6
diff --git a/metadata/md5-cache/dev-util/dwarves-1.17 b/metadata/md5-cache/dev-util/dwarves-1.17
index c9c8c19cf3ec..487ea7766bc6 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.17
+++ b/metadata/md5-cache/dev-util/dwarves-1.17
@@ -4,11 +4,11 @@ DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
 IUSE=debug python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.17.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ceb719daee1783db859196218e4a7cf2
+_md5_=db56254c60c8863337c1a6067e31112e
diff --git a/metadata/md5-cache/dev-util/global-6.6.4 b/metadata/md5-cache/dev-util/global-6.6.4
index e0e5854f3958..89a65ca4ea34 100644
--- a/metadata/md5-cache/dev-util/global-6.6.4
+++ b/metadata/md5-cache/dev-util/global-6.6.4
@@ -5,10 +5,10 @@ DESCRIPTION=tag system to find an object location in various sources
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/global/global.html
 IUSE=doc emacs vim
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses emacs? ( >=app-editors/emacs-23.1:* ) vim? ( || ( app-editors/vim app-editors/gvim ) ) || ( dev-libs/libltdl:0 sys-devel/libtool:2 )
 SLOT=0
 SRC_URI=mirror://gnu/global/global-6.6.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	504a3383c45504fde86b00426619a709	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6db05cf1d3a2d0645aa50907cd8620f
+_md5_=988da614a176ed39b5d1954a37cb9a07
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0 b/metadata/md5-cache/dev-util/lldb-10.0.0
index f9b03ec01ceb..a7b1d5a249d8 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.0
+++ b/metadata/md5-cache/dev-util/lldb-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ~sys-devel/clang-10.0.0[xml] ~sys-devel/llvm-10.0.0 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24eacc08b4a13bbe9fd0fe65b4be4d5b
+_md5_=2e0ca033cd4a9a80aa6aeadc5583424e
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
index e25ee42280ed..13e73300493d 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 DESCRIPTION=LXQt Build Tools
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.7.0/lxqt-build-tools-0.7.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4363799a9fa5c9ce9d80d8ff8ba4c97a
+_md5_=f865a0ce45f5fbea0d80042786b65a3c
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 77de45a70fdd..2cbabdd41c8e 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/darcs-2.14.4 b/metadata/md5-cache/dev-vcs/darcs-2.14.4
new file mode 100644
index 000000000000..2c28cec79e43
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/darcs-2.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?] >=dev-haskell/graphviz-2999.18.1:=[profile?] <dev-haskell/graphviz-2999.20.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.20:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?] >=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.4.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-8.0.1:= curl? ( net-misc/curl ) terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 >=dev-haskell/quickcheck-2.8.2 <dev-haskell/quickcheck-2.14 >=dev-haskell/shelly-1.6.8 <dev-haskell/shelly-1.10 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=a distributed, interactive, smart revision control system
+EAPI=7
+HOMEPAGE=http://darcs.net/
+IUSE=+curl +terminfo +threaded doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?] >=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/cryptohash-0.11:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?] >=dev-haskell/graphviz-2999.18.1:=[profile?] <dev-haskell/graphviz-2999.20.1:=[profile?] >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?] >=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.20:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] >=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?] >=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.4.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?] >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?] >=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-8.0.1:= curl? ( net-misc/curl ) terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/2.14.4
+SRC_URI=https://hackage.haskell.org/package/darcs-2.14.4/darcs-2.14.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d9d81f5879f2184cc9086fd5d159585d
diff --git a/metadata/md5-cache/dev-vcs/git-annex-8.20200617 b/metadata/md5-cache/dev-vcs/git-annex-8.20200617
new file mode 100644
index 000000000000..76dc6423ff5e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-annex-8.20200617
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= dev-haskell/hslogger:= >=dev-haskell/http-client-0.5.0:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-0.7:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= dev-haskell/text:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.4.3:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-3? ( >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= ) !network-3? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.20:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git >=dev-haskell/cabal-2.2.0.1 dev-lang/perl doc? ( www-apps/ikiwiki net-misc/rsync )
+DESCRIPTION=manage files with git, without checking their contents into git
+EAPI=7
+HOMEPAGE=http://git-annex.branchable.com/
+IUSE=+assistant benchmark +dbus debuglocks doc +magicmime +network-3 +pairing +s3 +torrentparser +webapp +webdav
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=AGPL-3
+RDEPEND=dev-haskell/aeson:= dev-haskell/async:= dev-haskell/attoparsec:= >=dev-haskell/bloomfilter-2.0.0:= dev-haskell/byteable:= dev-haskell/case-insensitive:= >=dev-haskell/concurrent-output-1.10:= dev-haskell/conduit:= >=dev-haskell/connection-0.2.6:= dev-haskell/crypto-api:= >=dev-haskell/cryptonite-0.23:= dev-haskell/data-default:= dev-haskell/disk-free-space:= dev-haskell/dlist:= dev-haskell/edit-distance:= >=dev-haskell/exceptions-0.6:= >=dev-haskell/feed-1.0.0:= >=dev-haskell/filepath-bytestring-1.4.2.1.1:= dev-haskell/free:= dev-haskell/hslogger:= >=dev-haskell/http-client-0.5.0:= dev-haskell/http-client-tls:= >=dev-haskell/http-conduit-2.3.0:= >=dev-haskell/http-types-0.7:= dev-haskell/ifelse:= dev-haskell/memory:= dev-haskell/microlens:= dev-haskell/monad-control:= dev-haskell/monad-logger:= >=dev-haskell/mtl-2:= >=dev-haskell/network-uri-2.6:= dev-haskell/old-locale:= >=dev-haskell/optparse-applicative-0.14.1:= >=dev-haskell/persistent-2.8.1:= >=dev-haskell/persistent-sqlite-2.8.1:= dev-haskell/persistent-template:= >=dev-haskell/quickcheck-2.10.0:2= dev-haskell/random:= dev-haskell/regex-tdfa:= dev-haskell/resourcet:= dev-haskell/safesemaphore:= dev-haskell/sandi:= dev-haskell/securemem:= dev-haskell/socks:= dev-haskell/split:= >=dev-haskell/stm-2.3:= dev-haskell/stm-chans:= dev-haskell/tagsoup:= >=dev-haskell/tasty-0.7:= dev-haskell/tasty-hunit:= dev-haskell/tasty-quickcheck:= dev-haskell/tasty-rerun:= dev-haskell/text:= >=dev-haskell/unix-compat-0.5:= dev-haskell/unliftio-core:= dev-haskell/unordered-containers:= dev-haskell/utf8-string:= >=dev-haskell/uuid-1.2.6:= dev-haskell/vector:= >=dev-lang/ghc-8.4.3:= assistant? ( >=dev-haskell/hinotify-0.3.10:= dev-haskell/mountpoints:= ) benchmark? ( dev-haskell/criterion:= ) dbus? ( >=dev-haskell/dbus-0.10.7:= >=dev-haskell/fdo-notify-0.3:= ) magicmime? ( dev-haskell/magic:= ) network-3? ( >=dev-haskell/network-3.0.0.0:= dev-haskell/network-bsd:= ) !network-3? ( >=dev-haskell/network-2.6.3.0:= <dev-haskell/network-3.0.0.0:= ) pairing? ( dev-haskell/network-info:= dev-haskell/network-multicast:= ) s3? ( >=dev-haskell/aws-0.20:= ) torrentparser? ( >=dev-haskell/torrent-10000.0.0:= ) webapp? ( dev-haskell/blaze-builder:= dev-haskell/clientsession:= >=dev-haskell/path-pieces-0.2.1:= >=dev-haskell/shakespeare-2.0.11:= dev-haskell/wai:= dev-haskell/wai-extra:= >=dev-haskell/warp-3.2.8:= >=dev-haskell/warp-tls-3.2.2:= >=dev-haskell/yesod-1.4.3:= >=dev-haskell/yesod-core-1.6.0:= >=dev-haskell/yesod-form-1.4.8:= >=dev-haskell/yesod-static-1.5.1:= ) webdav? ( >=dev-haskell/dav-1.0:= ) dev-vcs/git
+RESTRICT=test
+SLOT=0
+SRC_URI=https://hackage.haskell.org/package/git-annex-8.20200617/git-annex-8.20200617.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ae716d036ba2e9ebdbb0d128784c39c7
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-10.0.0 b/metadata/md5-cache/dev-vcs/hg-evolve-10.0.1
similarity index 97%
rename from metadata/md5-cache/dev-vcs/hg-evolve-10.0.0
rename to metadata/md5-cache/dev-vcs/hg-evolve-10.0.1
index 2319e993ec23..43a92f683573 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-10.0.0
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-10.0.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-vcs/mercurial-4.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.0.0.tar.gz
+SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-10.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cb2d9e1f4471c6e34bfa49134f4398ec
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.4.1 b/metadata/md5-cache/dev-vcs/mercurial-5.4.2
similarity index 98%
rename from metadata/md5-cache/dev-vcs/mercurial-5.4.1
rename to metadata/md5-cache/dev-vcs/mercurial-5.4.2
index 19488d56bed7..2f0a30552193 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.4.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.4.2
@@ -11,6 +11,6 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.1.tar.gz
+SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.2.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	0dda1d9008ac0b2530588115a772d99d	elisp-common	504a3383c45504fde86b00426619a709	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e7021b36dd374f8eb5fc89c09b4ef1db
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 76c09443d717..3cc2703c429d 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index d0d9679e8791..e2c6f48c0b10 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.4 b/metadata/md5-cache/games-emulation/m64py-0.2.4
index 086ffe8fc33b..785e13fa18a7 100644
--- a/metadata/md5-cache/games-emulation/m64py-0.2.4
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.4
@@ -6,9 +6,9 @@ HOMEPAGE=http://m64py.sourceforge.net/
 IUSE=7z rar python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0
-RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySDL2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 7z? ( || ( dev-python/pylzma[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/p7zip ) ) rar? ( || ( dev-python/rarfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unrar app-arch/rar ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySDL2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 7z? ( app-arch/p7zip ) rar? ( || ( dev-python/rarfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unrar app-arch/rar ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/m64py/m64py-0.2.4/m64py-0.2.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5e875f6746d96129a721f7eb4e38135
+_md5_=229d1f3ea03201f1bd7cc64429060b90
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 7c4bb2b29436..4b39823a5c57 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4-r3 b/metadata/md5-cache/gnome-base/libglade-2.6.4-r3
index f6d78030b908..c11084b8a3d9 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r3
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Library to construct graphical interfaces at runtime
 EAPI=6
 HOMEPAGE=https://library.gnome.org/devel/libglade/stable/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f796128dbff42bc7cc6903a0fca35ff5
+_md5_=b03760e96ecfde44a1052ba092683f7c
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.48.8 b/metadata/md5-cache/gnome-base/librsvg-2.48.8
new file mode 100644
index 000000000000..ae86faf327c6
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/librsvg-2.48.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.38.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) >=virtual/rust-1.39[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
+IUSE=+introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.38.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://gnome/sources/librsvg/2.48/librsvg-2.48.8.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e6ffe0b7cc4f531d80cfabbe2dc5053
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3fed1ce14687..d98ec953d44a 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.36.0 b/metadata/md5-cache/gnome-extra/yelp-3.36.0
new file mode 100644
index 000000000000..ef3a08a87334
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-3.36.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.13 dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/3.36/yelp-3.36.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b95a44af279b4371c9907569460290a
diff --git a/metadata/md5-cache/games-board/teg-0.11.2-r1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
similarity index 55%
rename from metadata/md5-cache/games-board/teg-0.11.2-r1
rename to metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
index 003055813bb6..411d6b5937f2 100644
--- a/metadata/md5-cache/games-board/teg-0.11.2-r1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl ) app-text/tidy-html5 nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome Risk Clone
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=XSL stylesheets for yelp
 EAPI=6
-HOMEPAGE=https://github.com/wfx/teg
-IUSE=+client debug ggz nls robot server
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl )
+HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
-SRC_URI=https://github.com/wfx/teg/archive/0.11.2.tar.gz -> teg-0.11.2.tar.gz
+SRC_URI=mirror://gnome/sources/yelp-xsl/3.36/yelp-xsl-3.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5427cda653f37fb2c4cdaa489daf47b6
+_md5_=f241f2baa0d7f6ba44409a71e8b9c01e
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index bafd8f9a88f1..309d4a0dda9f 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/ark-20.04.3-r1 b/metadata/md5-cache/kde-apps/ark-20.04.3-r1
new file mode 100644
index 000000000000..ce6444a47d44
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-20.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/libarchive:=[bzip2?,lzma?,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Archiving tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/libarchive:=[bzip2?,lzma?,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92f0fe59bcb0161faa9f91ef8254a86e
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1 b/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
new file mode 100644
index 000000000000..f7786ab7e086
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-calendar-20.04.3:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-apps/akonadi-mime-20.04.3:5 >=kde-apps/akonadi-notes-20.04.3:5 >=kde-apps/kalarmcal-20.04.3:5 >=kde-apps/kcalutils-20.04.3:5 || ( >=kde-frameworks/kdav-5.70.0:5 >=kde-apps/kdav-20.04.3:5 ) >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kimap-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/kmbox-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/libkgapi-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=dev-qt/qtxmlpatterns-5.14.2:5 test? ( >=kde-apps/kimap-20.04.3:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtnetworkauth-5.14.2:5 >=dev-qt/qtspeech-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-calendar-20.04.3:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-apps/akonadi-mime-20.04.3:5 >=kde-apps/akonadi-notes-20.04.3:5 >=kde-apps/kalarmcal-20.04.3:5 >=kde-apps/kcalutils-20.04.3:5 || ( >=kde-frameworks/kdav-5.70.0:5 >=kde-apps/kdav-20.04.3:5 ) >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kimap-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/kmbox-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/libkgapi-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9289b41a023ac94f36d21470e7004df7
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
new file mode 100644
index 000000000000..12efabf230a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kldap-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/libkleo-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kross-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/KMail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kldap-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/libkleo-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kross-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16e5cc742cbfcad309fd540930b20b0a
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 0e5bea58e924..1608a0dc3fd1 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.2-r1 b/metadata/md5-cache/kde-misc/kdiff3-1.8.2-r1
deleted file mode 100644
index ca27196324f0..000000000000
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend to diff3 based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kdiff3 https://userbase.kde.org/KDiff3
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.2.tar.xz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f21281d0cbe6f02964e00d6f78daaa9
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.3 b/metadata/md5-cache/kde-misc/kdiff3-1.8.3
deleted file mode 100644
index a0abd5cb47e9..000000000000
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend to diff3 based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kdiff3 https://userbase.kde.org/KDiff3
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.3.tar.xz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba7e31776463688a83b6808f7dadd604
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1 b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1
deleted file mode 100644
index 0e825a34a7de..000000000000
--- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/libksane-19.04.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/libpng:0= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Simple image scanning application based on libksane and KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.skanlite
-IUSE=debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/libksane-19.04.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/libpng:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/skanlite/2.1/skanlite-2.1.0.1.tar.xz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=135829452c75abbcdf694980e9dd1a4a
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index b0322db8e429..064502b74486 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4-r1
similarity index 86%
rename from metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4
rename to metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4-r1
index bcc79c3b2d79..1440333c24c8 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4-r1
@@ -1,17 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=consolekit +pam seccomp test debug test
+IUSE=consolekit +pam test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.19.4:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=seccomp? ( pam )
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( sys-libs/pam ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.4/kscreenlocker-5.19.4.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9223b540e751b5492497e1febe2ab11e
+_md5_=ff9406985a28c8cedba2562bd1ef1453
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.19.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.19.4
index e5e03d579f29..ea6c394aea48 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.19.4
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.19.4
@@ -11,4 +11,4 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.4/powerdevil-5.19.4.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6963c893a28b448415d376047f69d58
+_md5_=dc36ca1e11d0c41f09b68f2b94bb8791
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 35bc6c04eca0..35c62d33f5b9 100644
Binary files a/metadata/md5-cache/lxqt-base/Manifest.gz and b/metadata/md5-cache/lxqt-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-0.15.1 b/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
index 88872e0025de..5036df9c0bf5 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
@@ -5,10 +5,10 @@ DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=+backlight
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.5.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libXScrnSaver backlight? ( sys-auth/polkit-qt ) !lxqt-base/lxqt-l10n
 SLOT=0/0.15
 SRC_URI=https://github.com/lxqt/liblxqt/releases/download/0.15.1/liblxqt-0.15.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ac20d3d70cca760138e51f00c41c65f
+_md5_=6f556b437625e6cc949b52eb2c95aec8
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.3 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
index 6682856d1ad5..d8d770a9d630 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5
 DESCRIPTION=Qt GUI for System Statistics
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/libsysstat/releases/download/0.4.3/libsysstat-0.4.3.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86803d80ab9638f55f7a737188ff8df7
+_md5_=3e1aaa9ef2a53db954352cd1c83f1e6b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
index dd8023dbd325..085e42420f86 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-about/releases/download/0.15.0/lxqt-about-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af194331d49ab451ac2e42247c2bfa4d
+_md5_=07722284ad91a9503d3aef3e9a35892e
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
index f9ef08daab24..a2a8cb63a4cf 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-b
 DESCRIPTION=LXQt system administration tool
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* kde-frameworks/kwindowsystem:5 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-admin/releases/download/0.15.0/lxqt-admin-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77159e418a6a7e140e70191605e6b460
+_md5_=454071c6762a0a72aedb1e23236f6888
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
index 16a22dc5af1d..8addcf1b619f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=+monitor +touchpad
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.15* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext x11-libs/libXi ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/0.15.0/lxqt-config-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=468e618070fc9eadfa02dd40422abf48
+_md5_=5a74e2fac8e1e4b50538f94d88a17269
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
index 5ffcdd4ef901..44f27587cc7f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 =lxqt-base/liblxqt-0.15* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-globalkeys/releases/download/0.15.0/lxqt-globalkeys-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2d84ae5031cb587e6b46ab1df9f7e7
+_md5_=eb82cb57bd9b948e24d3681059e779f2
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
index 9ab6ac9dab20..372ac3ad6e55 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=+about admin archiver +display-manager +filemanager lximage minimal nls +policykit powermanagement processviewer screenshot +sddm ssh-askpass sudo terminal +trash
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.15* =lxqt-base/lxqt-globalkeys-0.15* =lxqt-base/lxqt-notificationd-0.15* =lxqt-base/lxqt-panel-0.15* =lxqt-base/lxqt-qtplugin-0.15* =lxqt-base/lxqt-runner-0.15* =lxqt-base/lxqt-session-0.15* virtual/ttf-fonts =x11-themes/lxqt-themes-0.15* about? ( =lxqt-base/lxqt-about-0.15* ) admin? ( =lxqt-base/lxqt-admin-0.15* ) archiver? ( app-arch/lxqt-archiver ) display-manager? ( sddm? ( >=x11-misc/sddm-0.11.0 ) !sddm? ( x11-misc/lightdm ) ) filemanager? ( =x11-misc/pcmanfm-qt-0.15* ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-0.15* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.15* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.15* ) sudo? ( =lxqt-base/lxqt-sudo-0.15* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
 REQUIRED_USE=trash? ( filemanager )
 SLOT=0
-_md5_=5c36177524e489234ccc3592599c8208
+_md5_=d4e6cf5c0707df0f6190b64976f9b315
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
index 7d9fa120ae70..4f95f6141fbe 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt notification daemon and library
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-notificationd/releases/download/0.15.0/lxqt-notificationd-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fff83d2a2d1e631331c0d8e62691878c
+_md5_=9f13b60f850d3738975d0428f41d1d08
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
index 786f292018aa..badff059125e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15*
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-openssh-askpass/releases/download/0.15.0/lxqt-openssh-askpass-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34f9a0bd4afe40423202fcb4a93fbef6
+_md5_=40cddae611954462155f695f414ec9ae
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
index 9e35b55f32f9..6cb4da99bb36 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=LXQt desktop panel and plugins
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch lm-sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.15* =lxqt-base/lxqt-globalkeys-0.15* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) lm-sensors? ( sys-apps/lm-sensors ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-panel/releases/download/0.15.1/lxqt-panel-0.15.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e860df9f2385b5387d9926e088c10e51
+_md5_=9d46ab5849c4e2001b12bdc91b9a71cc
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
index 4be1b1169519..c14af9a00b5f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-policykit/releases/download/0.15.0/lxqt-policykit-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74e7334efa5c2a0d6eb712d2fc37beec
+_md5_=0098be78ec2e5b16e3903aa0f3285680
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
index fbd702b9006e..648564428638 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.15* sys-power/upower !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-powermanagement/releases/download/0.15.0/lxqt-powermanagement-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca9a70c42ca65ce050e0077888d33cc8
+_md5_=e78d1b839eda2524f79ea73e5144eca6
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
index 24be03112d69..111e641bd66b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.5.0 dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.5.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.15*
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-qtplugin/releases/download/0.15.1/lxqt-qtplugin-0.15.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a6408d2abc1757ba269cc3ce897ddeb
+_md5_=0cd0c4a31d339bed1e3991281764acc1
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
index ede5cfb5d030..e42c882b17b6 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-
 DESCRIPTION=LXQt quick launcher
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.15* =lxqt-base/lxqt-globalkeys-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-runner/releases/download/0.15.0/lxqt-runner-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6b72d24a693ccca88d07694a0b973f3
+_md5_=c640c1b2bf33eacb37e7b3962e6f1bbf
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
index af38cf18bbb4..9a5e9d412b50 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt Session Manager
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
 IUSE=+udev
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.15* x11-libs/libX11 x11-misc/xdg-user-dirs udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-session/releases/download/0.15.0/lxqt-session-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d10d0d2dcabcc78b6439d9d530fcfd6
+_md5_=684116ba9a988e52da49b263a88d0e1c
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
index 16dd29fb9ca2..6e52dc067878 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
@@ -4,10 +4,10 @@ DEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt GUI frontend for sudo
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-sudo/releases/download/0.15.0/lxqt-sudo-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2eee65351fcac54178c129470da5702d
+_md5_=3064ad03c54e806a788792167b2644e3
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 6a72cc231aed..2738f10bd102 100644
Binary files a/metadata/md5-cache/mate-base/Manifest.gz and b/metadata/md5-cache/mate-base/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r2 b/metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r3
similarity index 71%
rename from metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r2
rename to metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r3
index 15328878db7d..f15e42af82bf 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r2
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) ) xtrans? ( x11-libs/xtrans ) >=dev-lang/perl-5 dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.10.40 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.22
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) ) xtrans? ( x11-libs/xtrans ) >=dev-lang/perl-5 dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.10.40 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.22
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=https://mate-desktop.org/
 IUSE=debug elogind gnome-keyring ipv6 systemd +xtrans
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !<gnome-base/gdm-2.20.4
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !<gnome-base/gdm-2.20.4
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-session-manager-1.22.3.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a4f208bdf79cb271b91631eeac08680
+_md5_=0b00534c1b8cb8190792ca6a1505378d
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r2 b/metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r3
similarity index 72%
rename from metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r2
rename to metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r3
index e601236e7258..e15953b35e0c 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r2
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) ) xtrans? ( x11-libs/xtrans ) >=dev-lang/perl-5 dev-util/glib-utils >=sys-devel/gettext-0.19.8:* virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) ) xtrans? ( x11-libs/xtrans ) >=dev-lang/perl-5 dev-util/glib-utils >=sys-devel/gettext-0.19.8:* virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.24
 DESCRIPTION=MATE session manager
 EAPI=6
 HOMEPAGE=https://mate-desktop.org/
 IUSE=debug elogind gnome-keyring ipv6 systemd +xtrans
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) ) xtrans? ( x11-libs/xtrans ) virtual/libintl x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !<gnome-base/gdm-2.20.4
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) ) xtrans? ( x11-libs/xtrans ) virtual/libintl x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !<gnome-base/gdm-2.20.4
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-session-manager-1.24.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9b3800604ea424a1e3b8bdb2fc7e703
+_md5_=cfde30d18ab57b419fd3267f70ff7ddf
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 8d3ace4d8a2e..e3268648c8df 100644
Binary files a/metadata/md5-cache/mate-extra/Manifest.gz and b/metadata/md5-cache/mate-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.1 b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.1-r1
similarity index 96%
rename from metadata/md5-cache/mate-extra/mate-power-manager-1.22.1
rename to metadata/md5-cache/mate-extra/mate-power-manager-1.22.1-r1
index 859c96307a2d..4901a22d16f6 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.1
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.1-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://mate-desktop.org
 IUSE=+applet elogind gnome-keyring policykit systemd test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.9.23:= policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) )
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.9.23:= policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) )
 REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-power-manager-1.22.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d37bc395bc994c14fe7c264fbf41284
+_md5_=00b8d014125b9c860dcf72149c180c0a
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.2 b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.2-r1
similarity index 96%
rename from metadata/md5-cache/mate-extra/mate-power-manager-1.22.2
rename to metadata/md5-cache/mate-extra/mate-power-manager-1.22.2-r1
index f7b7d7e10134..4f82f83d9c50 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.2
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.2-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://mate-desktop.org
 IUSE=+applet elogind gnome-keyring policykit systemd test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.9.23:= policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) )
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.9.23:= policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) )
 REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-power-manager-1.22.2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d37bc395bc994c14fe7c264fbf41284
+_md5_=00b8d014125b9c860dcf72149c180c0a
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.24.1 b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.1-r1
similarity index 95%
rename from metadata/md5-cache/mate-extra/mate-power-manager-1.24.1
rename to metadata/md5-cache/mate-extra/mate-power-manager-1.24.1-r1
index 7cd769aad3e0..b31096f9d0d5 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.24.1
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.1-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://mate-desktop.org
 IUSE=+applet elogind gnome-keyring policykit systemd test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.99.8:= virtual/libintl policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) )
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.99.8:= virtual/libintl policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) )
 REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-power-manager-1.24.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8718075f8848b74e695ecdd38520906
+_md5_=542d8491390f946455e9c78de445f29d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 00ec340f2c90..b129ababa0b2 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/noto-20200521 b/metadata/md5-cache/media-fonts/noto-20200521
index e6b449293c46..19f2d52b1bc6 100644
--- a/metadata/md5-cache/media-fonts/noto-20200521
+++ b/metadata/md5-cache/media-fonts/noto-20200521
@@ -4,11 +4,11 @@ DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=7
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
 IUSE=cjk +extra X
-KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 sparc ~x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/49313785484cd4d1f4c0329ee3a8801f158f5ba1.tar.gz -> noto-20200521.tar.gz
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=c3daeee9a0b6247b9546785700d6d995
+_md5_=cd96991500a37a96ddcafc4543612045
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 2a4948b60a87..8943795447a3 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/cairosvg-1.0.22 b/metadata/md5-cache/media-gfx/cairosvg-1.0.22
deleted file mode 100644
index 02d8d2367a81..000000000000
--- a/metadata/md5-cache/media-gfx/cairosvg-1.0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/tinycss[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/cssselect[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=CLI and library to export SVG to PDF, PostScript, and PNG
-EAPI=5
-HOMEPAGE=https://cairosvg.org/
-IUSE=python_targets_python2_7 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/tinycss[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/cssselect[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-1.0.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4d688aa383d326e7f3c2aa6266ae022
diff --git a/metadata/md5-cache/media-gfx/digikam-7.0.0_rc b/metadata/md5-cache/media-gfx/digikam-7.0.0
similarity index 98%
rename from metadata/md5-cache/media-gfx/digikam-7.0.0_rc
rename to metadata/md5-cache/media-gfx/digikam-7.0.0
index 9034eda766c9..a9c740cce443 100644
--- a/metadata/md5-cache/media-gfx/digikam-7.0.0_rc
+++ b/metadata/md5-cache/media-gfx/digikam-7.0.0
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2-only] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=media-gfx/exiv2-0.27:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.3.0:=[contrib,contribdnn] media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-frameworks/kcontacts-5.60.0:5 ) calendar? ( >=kde-frameworks/kcalendarcore-5.60.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) heif? ( media-libs/x265:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) marble? ( >=dev-qt/qtconcurrent-5.12.3:5 >=kde-apps/marble-19.04.3:5 >=kde-frameworks/kbookmarks-5.60.0:5 ) mediaplayer? ( media-libs/qtav[opengl] media-video/ffmpeg:= ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server(+)] ) panorama? ( media-gfx/hugin ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/unstable/digikam/digikam-7.0.0-rc.tar.xz
+SRC_URI=mirror://kde/stable/digikam/7.0.0/digikam-7.0.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	ecm	e341cb3583b4219b5c207e24915b0264	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kde.org	805aef05bd5352355744e28a6ab5ae3c	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64ae8583537f5b2cdf08a28d03075941
diff --git a/metadata/md5-cache/media-gfx/eog-3.36.3 b/metadata/md5-cache/media-gfx/eog-3.36.3
new file mode 100644
index 000000000000..4d082bbb60ac
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-3.36.3
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.16 app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Eye of GNOME image viewer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
+IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+REQUIRED_USE=exif? ( jpeg )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/3.36/eog-3.36.3.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=04d12cc30ebe62816875e1569d3557a6
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.10.0 b/metadata/md5-cache/media-gfx/gthumb-3.10.0
new file mode 100644
index 000000000000..eb8272670bfb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gthumb-3.10.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils dev-util/itstool sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.54.0:2 >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 >=dev-libs/json-glib-0.15.0 >=net-libs/webkit-gtk-1.10.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2.0 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) sys-libs/zlib virtual/jpeg:0= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Image viewer and browser for Gnome
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/gthumb
+IUSE=cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.54.0:2 >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 >=dev-libs/json-glib-0.15.0 >=net-libs/webkit-gtk-1.10.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2.0 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) sys-libs/zlib virtual/jpeg:0= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gthumb/3.10/gthumb-3.10.0.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a70255e4d7c576609b03844b037283e
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.15.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
index 03acb13ed68e..ab14ec7aef53 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=Qt Image Viewer
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.15.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lximage-qt/releases/download/0.15.0/lximage-qt-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d60e826fcc5835aac49267c4091aa70
+_md5_=72e65c9dadbaa25af9684c290c214f53
diff --git a/metadata/md5-cache/media-gfx/slic3r-9999 b/metadata/md5-cache/media-gfx/slic3r-9999
index aa70c6a514d1..4d3eafaff1a2 100644
--- a/metadata/md5-cache/media-gfx/slic3r-9999
+++ b/metadata/md5-cache/media-gfx/slic3r-9999
@@ -10,4 +10,4 @@ RDEPEND=!=dev-lang/perl-5.16* >=dev-libs/boost-1.55[threads] dev-perl/Class-XSAc
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6ec2bcc0ec58461325fdb925fa34f3e
+_md5_=f5ea380f0b549989dbe9513e6a92efe4
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6b660d3112b2..0668ff5d88ae 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
index 88404929bdd0..fceb11b59d89 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+DEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c84401c1d20926fb25115b5db04c215a
+_md5_=77472acc7a82f56c6ed8467479d0df88
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.1
index 5ea467d25a19..f34b20f6ee30 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.1
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+DEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.3.1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8aa5c64ce423b4e5db8e7fc99a2f5ad3
+_md5_=7bdb3e06cdd4edf0b52d090083a7989c
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2
index 65f792f5a717..ea92dd93ce35 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+DEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.3.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8aa5c64ce423b4e5db8e7fc99a2f5ad3
+_md5_=7bdb3e06cdd4edf0b52d090083a7989c
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.6-r4 b/metadata/md5-cache/media-libs/audiofile-0.3.6-r4
index 310196e9d592..48a44a4165be 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.6-r4
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.6-r4
@@ -4,10 +4,10 @@ DESCRIPTION=An elegant API for accessing audio files
 EAPI=6
 HOMEPAGE=http://www.68k.org/~michael/audiofile/
 IUSE=flac abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.6.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b24cc5e10cf752963723392e81bf2be9
+_md5_=d1124c3f747beeb1f525b5dc3a9d31e3
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
new file mode 100644
index 000000000000..a7dd6ed9b870
--- /dev/null
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( virtual/jack libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) oss? ( virtual/os-headers )
+DESCRIPTION=Plugins for the video editor media-video/avidemux
+EAPI=7
+HOMEPAGE=http://fixounet.free.fr/avidemux
+IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( virtual/jack libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) !<media-libs/avidemux-plugins-2.7.4
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=2.7
+SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e251b2f14e22b23dfd7302117c0599c2
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.8-r1 b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
new file mode 100644
index 000000000000..152ced52fd3c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenGL Mathematics
+EAPI=7
+HOMEPAGE=http://glm.g-truc.net/
+IUSE=test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( HappyBunny MIT )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz -> glm-0.9.9.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b76fe5bdaccd871d79dd316b5ae718f
diff --git a/metadata/md5-cache/media-libs/libao-1.2.2 b/metadata/md5-cache/media-libs/libao-1.2.2
deleted file mode 100644
index 15c87f47ab78..000000000000
--- a/metadata/md5-cache/media-libs/libao-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Audio Output library
-EAPI=6
-HOMEPAGE=https://www.xiph.org/ao/
-IUSE=alsa nas mmap pulseaudio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/xiph/libao/archive/1.2.2.tar.gz -> libao-1.2.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b44e9fb013187623f1a97e54ae7cf2b
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r10
similarity index 96%
rename from metadata/md5-cache/media-libs/libmad-0.15.1b-r9
rename to metadata/md5-cache/media-libs/libmad-0.15.1b-r10
index e04d2a3eb2d5..68cdd9272483 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r9
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r10
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=366966da5a9c116faf22d48a10ee2f80
+_md5_=8218a5c3e36b63d51a566b30159c9cfd
diff --git a/metadata/md5-cache/media-libs/libvisual-0.4.0-r3 b/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
index d24d3bcc2569..6872fe9205c1 100644
--- a/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
+++ b/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Libvisual is an abstraction library that comes between applications and audio visualisation plugins
 EAPI=5
-HOMEPAGE=http://libvisual.sourceforge.net
+HOMEPAGE=http://libvisual.org/
 IUSE=debug nls static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0.4
 SRC_URI=mirror://sourceforge/libvisual/libvisual-0.4.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e696a7b6d23542b1d8d9a7c95ce280af
+_md5_=57e100dff7db95b2382e35eaef71ad2f
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.6 b/metadata/md5-cache/media-libs/lilv-0.24.6-r1
similarity index 100%
rename from metadata/md5-cache/media-libs/lilv-0.24.6
rename to metadata/md5-cache/media-libs/lilv-0.24.6-r1
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.8 b/metadata/md5-cache/media-libs/lilv-0.24.8-r1
similarity index 98%
rename from metadata/md5-cache/media-libs/lilv-0.24.8
rename to metadata/md5-cache/media-libs/lilv-0.24.8-r1
index 25ba776471fb..879cf2af410f 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.8
+++ b/metadata/md5-cache/media-libs/lilv-0.24.8-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.8.tar.bz2
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=18b7273db6ba78e5a4d8899904cfac60
+_md5_=c389335617109894ebc04b466e51242f
diff --git a/metadata/md5-cache/media-libs/lvtk-1.2.0 b/metadata/md5-cache/media-libs/lvtk-1.2.0
index 023647a77a37..8b043c14f8bf 100644
--- a/metadata/md5-cache/media-libs/lvtk-1.2.0
+++ b/metadata/md5-cache/media-libs/lvtk-1.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lvtk/lvtk/archive/1.2.0.tar.gz -> lvtk-1.2.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=fb0de1af5a6764eb256e853a3e726130
+_md5_=7511b5ee75e55af46ea7a4c6ec63bb7e
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r3 b/metadata/md5-cache/media-libs/portmidi-217-r3
index cebb5584f572..0cd1d0645c9d 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r3
+++ b/metadata/md5-cache/media-libs/portmidi-217-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for real time MIDI input and output
 EAPI=7
 HOMEPAGE=http://portmedia.sourceforge.net/
 IUSE=debug doc java python static-libs test-programs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=media-libs/alsa-lib python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	16d46032afaca1d6d0621f82084880cb	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83ab64b5d975fd9346ede37a36638617
+_md5_=d2e3e967fcebf7fc527e69f83dfb6928
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 61c16e6e831c..55acc1f6aad5 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/ams-lv2-1.1.0 b/metadata/md5-cache/media-plugins/ams-lv2-1.1.0
deleted file mode 100644
index 302972680857..000000000000
--- a/metadata/md5-cache/media-plugins/ams-lv2-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=media-sound/jack-audio-connection-kit-0.120 >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2 || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig
-DESCRIPTION=A port of the AMS internal modules to LV2 plugins to create modular synthesizers
-EAPI=5
-HOMEPAGE=https://objectivewave.wordpress.com/ams-lv2/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=media-sound/jack-audio-connection-kit-0.120 >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2
-SLOT=0
-SRC_URI=https://github.com/blablack/ams-lv2/archive/v1.1.0.tar.gz -> ams-lv2-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=faad54c5a8d41d168fa221e0b00c63fd
diff --git a/metadata/md5-cache/media-plugins/ams-lv2-1.2.2 b/metadata/md5-cache/media-plugins/ams-lv2-1.2.2
new file mode 100644
index 000000000000..c2f04bf80dac
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/ams-lv2-1.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2 virtual/jack || ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig
+DESCRIPTION=A port of the AMS internal modules to LV2 plugins to create modular synthesizers
+EAPI=6
+HOMEPAGE=https://objectivewave.wordpress.com/ams-lv2/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/gtkmm-2.24.0:2.4 >=media-libs/lv2-1.10.0 >=media-libs/lvtk-1.2.0[gtk2] >=sci-libs/fftw-3.3.3:3.0 >=x11-libs/cairo-1.10.0 >=x11-libs/gtk+-2.24:2 virtual/jack
+SLOT=0
+SRC_URI=https://github.com/blablack/ams-lv2/archive/1.2.2.tar.gz -> ams-lv2-1.2.2.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=6aa8015cdf9b223a9dbba6dbb83dc98d
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
index 0069dd7593d0..03a29df559a8 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
@@ -10,4 +10,4 @@ RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.timidity/archive/2.3.0-Matrix.tar.gz -> kodi-audiodecoder-timidity-2.3.0-Matrix.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=056f4cce952c3d1f97105a7577aa311a
+_md5_=a1a7441d56a360a9ba8492b24262ad3b
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index fafae25a0a68..4aea08e1ca00 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8fbbdb76e0fae835ad01f5adb956edc
+_md5_=49d4ece896fe80ed8d74a51748298e70
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
new file mode 100644
index 000000000000..6c8278858ccf
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac
+DESCRIPTION=Flac encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.flac
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-flac-3.0.0.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bfc1679efe8dba62469840bd9a305cd4
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
new file mode 100644
index 000000000000..42bc5590f269
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
+DESCRIPTION=Lame MP3 encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.lame
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-lame-3.0.0.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
new file mode 100644
index 000000000000..ea5e0276f750
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
+DESCRIPTION=Lame MP3 encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.lame
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/3.0.1-Matrix.tar.gz -> kodi-audioencoder-lame-3.0.1.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
new file mode 100644
index 000000000000..c135d0ed3f3c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
+DESCRIPTION=Vorbis encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/3.0.1-Matrix.tar.gz -> kodi-audioencoder-vorbis-3.0.1.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f29d6b1fe9088ea12fb31132e45a3d1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
new file mode 100644
index 000000000000..2b59e981fee3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-19*
+DESCRIPTION=WAV encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.wav
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-19*
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-wav-3.0.0.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1ae135ec47c89c09900fb17fcf3a935d
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
index 339d1cbec5d2..a0b2d2be6fea 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
@@ -4,10 +4,10 @@ DEPEND==media-tv/kodi-18* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
 DESCRIPTION=HEIF image decoder for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.1.0-Leia.tar.gz -> kodi-imagedecoder-heif-1.1.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cc432426c8ca6eb47fb55408bbef8de
+_md5_=e36fe40225ed7bc57a44f6d1abf9b737
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
index 0070b0ff9298..a0d09eb07e96 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
+RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-argustv-6.0.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1db694c1500dc9e59bbc7c46991f170
+_md5_=f26c506c599eb92a6556e98c93155378
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index 5aec60d187b0..7c5da9b1c65a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/jsoncpp
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=364f2693a9a4c1dfa6b091b60fe288ec
+_md5_=d6cfb504107e26694cfdfa34f142986b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
index 10198b58074f..bd80de31972b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
 DESCRIPTION=Kodi's DVBLink client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-dvblink-7.0.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=317139f0439721b2334645993751bfd0
+_md5_=13543830c91c73f559baac3d4ca04038
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
index 172a7d5781ae..18ccef7c27ab 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
 DESCRIPTION=Kodi's DVBLink client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75c8c917acc5b30460cf06536066fe60
+_md5_=4d4e54839bcb5c7a1c62491cf4964add
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
index 330123098b0e..9674723c35dc 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
+DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's DVBViewer client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
+RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/6.0.6-Matrix.tar.gz -> kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ce3626215ce0e9d496f3de3f64aff22
+_md5_=d056bb44c05330ffe4a0387fda8750d5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
index 841fe7ee6cc4..fb0866b5412a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's DVBViewer client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d402bfe1408350a07bda74cc5b08694
+_md5_=e16066c6cf49a1fd887ae265e719e825
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
index cfc886143eec..47ac652dd560 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-19* sys-libs/zlib dev-libs/rapidxml
+DEPEND==dev-libs/libplatform-2* dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 DESCRIPTION=Kodi's IPTVSimple client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-19* sys-libs/zlib dev-libs/rapidxml
+RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/6.2.4-Matrix.tar.gz -> kodi-pvr-iptvsimple-6.2.4.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3337f351437df74f7ad4f0e5829d67d
+_md5_=77aacc9e4ec699b4ee88edc5acd21862
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
index 7ae42c644d51..cc9048561815 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 sys-libs/zlib dev-libs/rapidxml
+DEPEND==dev-libs/libplatform-2* dev-libs/pugixml ~media-tv/kodi-9999 sys-libs/zlib
 DESCRIPTION=Kodi's IPTVSimple client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 sys-libs/zlib dev-libs/rapidxml
+RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml ~media-tv/kodi-9999 sys-libs/zlib
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0190a8c3bd59c98910f880dcdfda6e57
+_md5_=dbe322f2f0b12c786f8dae8e5628467a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
index 079ba6ace0c5..98e55c1ca818 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
+DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's MediaPortal TVServer client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
+RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-6.0.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1be5109a60ac16e57ece6a4521d6ebf4
+_md5_=34543d523f85ad11097bf7d1a2038939
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
index 300769b1b53f..d9b5a9099d11 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's MediaPortal TVServer client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=261222fba76531ff0ca82db7fb46981f
+_md5_=051c9888bc284e5f7b8a55f313b7b1b6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5
index afd8caff1709..50feb02ff358 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
+DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's NextPVR client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
+RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/6.0.5-Matrix.tar.gz -> kodi-pvr-nextpvr-6.0.5.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe52319624876b3991a2d151de265b66
+_md5_=a2120dd8024c50251ab7d03fc06569b7
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index 15a27ea3cf1e..3ae941a771e2 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 DESCRIPTION=Kodi's NextPVR client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7808600feab266963b30f9d0a50f2912
+_md5_=99da183dd46c8e33aa6890afc9641f38
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
index 9bc0ee2fabfb..293ab57594b6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's Stalker client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
+RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-stalker-6.0.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a35e639fdba029ce4751fca42bead41
+_md5_=11fd1952b8bfecfb6df8c36c53f2606f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index 4b07ff7ef24c..a909d7b0609e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
+DEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's Stalker client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=248dbf0bec6d2127ba5db89ae84b4339
+_md5_=d7ac2301adfd99f61865c806e642817f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
index 2e473769fa77..c81986ec1585 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+DEPEND==media-tv/kodi-19* dev-libs/tinyxml2 =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
+RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2 =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-vbox-7.0.0.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c74970ca991f9e2dc8b99472e8f22aa
+_md5_=99faadace00664867833ff3030aa59c1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
index 5bd893c16075..f1a4aa22aaa6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
+DEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2 =dev-libs/libplatform-2*
 DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
 EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2
+RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2 =dev-libs/libplatform-2*
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4e2dc22af1c488730d63beaafe81fb7
+_md5_=df52d50d107427f5de26062e3dc94c69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
index 1fc54e0cd96b..625052a6de24 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
+DEPEND==media-tv/kodi-19* media-libs/glm virtual/opengl
 DESCRIPTION=Asteroids screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.asteroids
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-asteroids-2.4.2.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1c59fff7645a32d55ec7f063b9c6eb7
+_md5_=b7abc6fdd371c4e630c9c2d6ef17d24f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
index 993874e2f8cb..c549687eec15 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999
+DEPEND=~media-tv/kodi-9999 media-libs/glm virtual/opengl
 DESCRIPTION=Asteroids screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.asteroids
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c0a71eba8363c48992bf347e8a462a6
+_md5_=0968dc5de9f5d86e0b0b9f21e9882b76
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
index fd9387d9f9ff..c6ad749bd52b 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
+DEPEND=media-libs/glm =media-tv/kodi-19* virtual/opengl
 DESCRIPTION=Greynetic screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.greynetic
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.3.1-Matrix.tar.gz -> kodi-screensaver-greynetic-2.3.1.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=658f60428734f3544ae4da9d2ae76b39
+_md5_=2fb4455af8c71f63e5d506411f014342
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
index 7c6a37e89c39..1ef0b55524da 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999
+DEPEND=media-libs/glm ~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Greynetic screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.greynetic
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70819a89a1f095452bc8ba749cc6391b
+_md5_=1d8c96c21d4e0df3466797a8d6f79ff5
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
index b48e2c05c98a..c31fe89e3403 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
+DEPEND==media-tv/kodi-19* media-libs/glm virtual/opengl
 DESCRIPTION=Ping-pong screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.pingpong
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.2.2-Matrix.tar.gz -> kodi-screensaver-pingpong-2.2.2.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a51b4ae17b2ff284455c1df1d22bcd53
+_md5_=876c4600cd55a66cc1c751e01654ec77
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
index 1bce1b01dcde..6bf51c65622c 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999
+DEPEND=~media-tv/kodi-9999 media-libs/glm virtual/opengl
 DESCRIPTION=Ping-pong screensaver for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.pingpong
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=934c73f9ad33be2507416b6893ce4215
+_md5_=4d5c5032e4695f5debc15fd2c1361400
diff --git a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3 b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
index 593262ade4dc..0e6437a5ecd1 100644
--- a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
+++ b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~media-libs/libvisual-0.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=collection of visualization plugins for use with the libvisual framework
 EAPI=5
-HOMEPAGE=http://libvisual.sourceforge.net/
+HOMEPAGE=http://libvisual.org/
 IUSE=alsa debug gtk jack mplayer opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 SLOT=0.4
 SRC_URI=mirror://sourceforge/libvisual/libvisual-plugins-0.4.0.tar.gz mirror://gentoo/libvisual-plugins-0.4.0-patches-4.tar.bz2 mirror://gentoo/libvisual-plugins-0.4.0-m4-1.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b1d65338d94b94f8ea8b95e59c6133c
+_md5_=acfc1ee4f4d75fc0d634d922f9dcce19
diff --git a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4 b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4
new file mode 100644
index 000000000000..032b88b29494
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/pkgconfig-0-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~media-libs/libvisual-0.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=collection of visualization plugins for use with the libvisual framework
+EAPI=7
+HOMEPAGE=http://libvisual.org/
+IUSE=alsa debug gtk jack mplayer opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~media-libs/libvisual-0.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0.4
+SRC_URI=mirror://sourceforge/libvisual/libvisual-plugins-0.4.0.tar.gz mirror://gentoo/libvisual-plugins-0.4.0-patches-4.tar.bz2 mirror://gentoo/libvisual-plugins-0.4.0-m4-1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=98bff0ac7fc1963960f4f1a286b5ced5
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f97aa684a7d1..61ec7d95b098 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/audacity-2.3.2 b/metadata/md5-cache/media-sound/audacity-2.3.2
deleted file mode 100644
index ea2f8ef74e8e..000000000000
--- a/metadata/md5-cache/media-sound/audacity-2.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( >=media-video/ffmpeg-1.2:= ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free crossplatform audio editor
-EAPI=7
-HOMEPAGE=https://web.audacityteam.org/
-IUSE=alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( >=media-video/ffmpeg-1.2:= ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.3.2.tar.gz doc? ( https://dev.gentoo.org/~polynomial-c/dist/audacity-manual-2.3.2.zip )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=666e69d35dbb168dd40f7a8b055141ec
diff --git a/metadata/md5-cache/media-sound/audacity-2.4.2 b/metadata/md5-cache/media-sound/audacity-2.4.2
new file mode 100644
index 000000000000..6ce0379508ca
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-2.4.2
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/expat media-libs/libsndfile media-libs/libsoundtouch media-libs/portaudio[alsa?] media-libs/soxr media-sound/lame x11-libs/wxGTK:3.0-gtk3[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( >=media-libs/libmad-0.15.1b ) ogg? ( media-libs/libogg ) portmidi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free crossplatform audio editor
+EAPI=7
+HOMEPAGE=https://web.audacityteam.org/
+IUSE=alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame +lv2 mad midi nls ogg oss portmidi +portmixer portsmf sbsms +soundtouch twolame vamp +vorbis +vst
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat media-libs/libsndfile media-libs/libsoundtouch media-libs/portaudio[alsa?] media-libs/soxr media-sound/lame x11-libs/wxGTK:3.0-gtk3[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( >=media-libs/libmad-0.15.1b ) ogg? ( media-libs/libogg ) portmidi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.4.2.tar.gz doc? ( https://dev.gentoo.org/~fordfrog/distfiles/audacity-manual-2.4.2.zip )
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7fc4e245a05bb7fc0b847a11ca417722
diff --git a/metadata/md5-cache/media-sound/chuck-1.4.0.1 b/metadata/md5-cache/media-sound/chuck-1.4.0.1
new file mode 100644
index 000000000000..3ffc0d1fb968
--- /dev/null
+++ b/metadata/md5-cache/media-sound/chuck-1.4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=app-eselect/eselect-chuck media-libs/libsndfile alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Strongly-timed, concurrent, and on-the-fly audio programming language
+EAPI=7
+HOMEPAGE=http://chuck.cs.princeton.edu/
+IUSE=+alsa jack examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-chuck media-libs/libsndfile alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+REQUIRED_USE=|| ( alsa jack )
+SLOT=0
+SRC_URI=http://chuck.cs.princeton.edu/release/files/chuck-1.4.0.1.tgz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=32f68185cf2817dd2e8bdff22d0fa538
diff --git a/metadata/md5-cache/media-sound/darkice-1.3 b/metadata/md5-cache/media-sound/darkice-1.3
index a909edf5ae81..600e2374befb 100644
--- a/metadata/md5-cache/media-sound/darkice-1.3
+++ b/metadata/md5-cache/media-sound/darkice-1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A live audio streamer
 EAPI=6
 HOMEPAGE=http://www.darkice.org/
 IUSE=aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis
-KEYWORDS=amd64 ~hppa ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ppc sparc ~x86
 LICENSE=GPL-3
 RDEPEND=aac? ( media-libs/faac ) aacplus? ( >=media-libs/libaacplus-2.0.0 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( aac aacplus mp3 opus twolame vorbis ) || ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/darkice/darkice-1.3.tar.gz
-_md5_=21ac7923ae149812f907b68134590260
+_md5_=a5e50acb801fdbcb1361b897b2139d59
diff --git a/metadata/md5-cache/media-sound/guimup-0.3.2 b/metadata/md5-cache/media-sound/guimup-0.3.2
deleted file mode 100644
index 993d3b80478f..000000000000
--- a/metadata/md5-cache/media-sound/guimup-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-cpp/gtkmm-3.2.0:3.0 dev-libs/libunique:3 >=media-libs/libmpdclient-2.3 >=net-libs/libsoup-2.36 virtual/pkgconfig
-DESCRIPTION=A client for MPD with a clean, GTK interface
-EAPI=5
-HOMEPAGE=http://coonsden.com
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-3.2.0:3.0 dev-libs/libunique:3 >=media-libs/libmpdclient-2.3 >=net-libs/libsoup-2.36
-SLOT=0
-SRC_URI=mirror://sourceforge/musicpd/guimup_0.3.2_src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=750db7f82ff49284dd83a16d545010c2
diff --git a/metadata/md5-cache/media-sound/lame-3.100-r1 b/metadata/md5-cache/media-sound/lame-3.100-r1
deleted file mode 100644
index 3758e020d19c..000000000000
--- a/metadata/md5-cache/media-sound/lame-3.100-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=frontend? ( >=sys-libs/ncurses-5.7-r7:0= sndfile? ( >=media-libs/libsndfile-1.0.2 ) ) virtual/pkgconfig cpu_flags_x86_mmx? ( dev-lang/nasm ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=LAME Ain't an MP3 Encoder
-EAPI=6
-HOMEPAGE=http://lame.sourceforge.net/
-IUSE=debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=frontend? ( >=sys-libs/ncurses-5.7-r7:0= sndfile? ( >=media-libs/libsndfile-1.0.2 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/lame/lame-3.100.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=63df5ae6e62d83bc3f750ba57f91a678
diff --git a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2 b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
similarity index 73%
rename from metadata/md5-cache/media-sound/music-file-organizer-1.0.2
rename to metadata/md5-cache/media-sound/music-file-organizer-1.0.3
index 61707515492d..04e26e2f3dba 100644
--- a/metadata/md5-cache/media-sound/music-file-organizer-1.0.2
+++ b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=postinst
 DEPEND=media-libs/taglib dev-libs/icu:= virtual/pkgconfig
-DESCRIPTION=Organizes audio files into directories based on metadata tags, along with other metadata utilities.
-EAPI=5
+DESCRIPTION=Organizes audio files into directories based on metadata tags
+EAPI=7
 HOMEPAGE=https://git.zx2c4.com/music-file-organizer/about/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-libs/icu:=
 SLOT=0
-SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.2.tar.xz
-_md5_=06acbfb6091dcef4d423f34d0a3c74e8
+SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.3.tar.xz
+_md5_=ffc78e51b9e52edce89705cb1ba2ccd5
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
index ec2607cce495..6d35a984c416 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-
 DESCRIPTION=Qt GUI Pulseaudio Mixer
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pavucontrol-qt/releases/download/0.15.0/pavucontrol-qt-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0333b72ffc8016fab2eebf1fec044bbc
+_md5_=d653348cd98fb520e8defac407d4b7e5
diff --git a/metadata/md5-cache/media-sound/twolame-0.4.0 b/metadata/md5-cache/media-sound/twolame-0.4.0
index 389db1d23c91..60cd4c6e9cd5 100644
--- a/metadata/md5-cache/media-sound/twolame-0.4.0
+++ b/metadata/md5-cache/media-sound/twolame-0.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=An optimised MPEG Audio Layer 2 (MP2) encoder
 EAPI=7
 HOMEPAGE=https://www.twolame.org
 IUSE=+sndfile static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sndfile? ( >=media-libs/libsndfile-1.0.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.4.0.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c5bee889a37de36f59d514cf0b25014
+_md5_=2f4f69eb9a68825f1e62d026c34864b8
diff --git a/metadata/md5-cache/media-sound/vmpk-0.7.2 b/metadata/md5-cache/media-sound/vmpk-0.7.2
new file mode 100644
index 000000000000..c109f82603d2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/vmpk-0.7.2
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Virtual MIDI Piano Keyboard
+EAPI=7
+HOMEPAGE=http://vmpk.sourceforge.net/
+IUSE=dbus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vmpk/vmpk-0.7.2.tar.bz2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=577aa9e728df1e32aab9748e678ada13
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 76b413171bed..d5da2e5fbc36 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/mythtv-31.0 b/metadata/md5-cache/media-tv/mythtv-31.0-r2
similarity index 88%
rename from metadata/md5-cache/media-tv/mythtv-31.0
rename to metadata/md5-cache/media-tv/mythtv-31.0-r2
index 346d793be1e2..681a8bf67ff2 100644
--- a/metadata/md5-cache/media-tv/mythtv-31.0
+++ b/metadata/md5-cache/media-tv/mythtv-31.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig opengl? ( virtual/opengl ) python? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) virtual/pkgconfig
 DEFINED_PHASES=config configure info install postinst prepare setup
-DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML dev-qt/qtwebkit:5 media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( dev-lang/python:3.7 dev-python/future[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/mysqlclient[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/simplejson[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/future[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/mysqlclient[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/simplejson[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML dev-qt/qtwebkit:5 media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( dev-lang/python:3.7 dev-python/future[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/mysqlclient[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/requests-cache[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/simplejson[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/future[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/mysqlclient[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/requests-cache[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/simplejson[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
 DESCRIPTION=Open Source DVR and media center hub
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
@@ -12,4 +12,4 @@ REQUIRED_USE=bluray? ( xml ) cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v31.0.tar.gz -> mythtv-31.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=e55518c8b00be20b43dd93fccdb32015
+_md5_=d03cc7886f9d64c87ca0078a02a6156b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 836b6b22ef17..c326f00e5f9e 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
index 8da48c4b544b..5dbcf17c5be0 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Official plugins for Nagios
 EAPI=7
 HOMEPAGE=http://nagios-plugins.org/
 IUSE=ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.3.1.tar.gz
-_md5_=c9817bf806f9d9a8de89ccf92c33c383
+_md5_=be2b499b9e52bb694c1d8f86c893c2bc
diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.21 b/metadata/md5-cache/net-analyzer/nfdump-1.6.21
new file mode 100644
index 000000000000..8d5cb7a54dbd
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.21
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+DESCRIPTION=A set of tools to collect and process netflow data
+EAPI=7
+HOMEPAGE=https://github.com/phaag/nfdump
+IUSE=debug doc ftconv nfprofile nftrack readpcap sflow static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap )
+SLOT=0/1.6.15
+SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.21.tar.gz -> nfdump-1.6.21.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ec61c709e09081edf5a2312fbca63488
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 3e6678877d56..a451066612ff 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.14.12 b/metadata/md5-cache/net-dns/bind-9.14.12
index 7e06e321aac6..729d3005502d 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.12
+++ b/metadata/md5-cache/net-dns/bind-9.14.12
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.12/bind-9.14.12.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=a6351fbca7f42f953ae5a555bec1bbef
+_md5_=ee4e5f045534da2c1ab8759847ef4564
diff --git a/metadata/md5-cache/net-dns/bind-9.16.4 b/metadata/md5-cache/net-dns/bind-9.16.4
index 293b415d30dd..732206406893 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.4
+++ b/metadata/md5-cache/net-dns/bind-9.16.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.16.4/bind-9.16.4.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=3efb9d7fc904b33a484a06fc145fcc3c
+_md5_=3b8fd01dd59c26af3c555c1ccb574144
diff --git a/metadata/md5-cache/net-dns/bind-9.16.3 b/metadata/md5-cache/net-dns/bind-9.16.5
similarity index 96%
rename from metadata/md5-cache/net-dns/bind-9.16.3
rename to metadata/md5-cache/net-dns/bind-9.16.5
index f33f90026009..2ecfe8dbc20d 100644
--- a/metadata/md5-cache/net-dns/bind-9.16.3
+++ b/metadata/md5-cache/net-dns/bind-9.16.5
@@ -11,6 +11,6 @@ RDEPEND=!libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libress
 REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_7 ) )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.3/bind-9.16.3.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.5/bind-9.16.5.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=be6b8f2b9e3136ef036bb56f27a0f281
+_md5_=cbbaf2339e227d0bee530e3e2c136245
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.3 b/metadata/md5-cache/net-dns/bind-tools-9.16.3
deleted file mode 100644
index f0ec09a53911..000000000000
--- a/metadata/md5-cache/net-dns/bind-tools-9.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
-EAPI=7
-HOMEPAGE=https://www.isc.org/software/bind
-IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://downloads.isc.org/isc/bind9/9.16.3/bind-9.16.3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6048efbac6ca2de4f06b7433f997470d
diff --git a/metadata/md5-cache/net-dns/ddclient-3.9.1 b/metadata/md5-cache/net-dns/ddclient-3.9.1
index 38c4084e4e76..2080e7dd6c0a 100644
--- a/metadata/md5-cache/net-dns/ddclient-3.9.1
+++ b/metadata/md5-cache/net-dns/ddclient-3.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl client used to update dynamic DNS entries
 EAPI=7
 HOMEPAGE=https://ddclient.net/
 IUSE=examples iproute2
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/ddclient acct-user/ddclient dev-lang/perl dev-perl/Data-Validate-IP dev-perl/Digest-SHA1 dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL virtual/perl-Digest-SHA virtual/perl-JSON-PP iproute2? ( sys-apps/iproute2 )
 SLOT=0
 SRC_URI=https://github.com/ddclient/ddclient/archive/v3.9.1.tar.gz -> ddclient-3.9.1.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b065821c31e541dd1608c3b2fb881e77
+_md5_=e8618845f7ddfc75704dd8e599546949
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 175c56b66c06..b530637d6a6a 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3 b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
index 63081a16d13d..4928e5b272d8 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
 DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=7
 HOMEPAGE=http://www.firewalld.org/
-IUSE=gui +nftables +iptables kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gui +nftables +iptables kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.1.tar.gz -> firewalld-0.7.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdadf6c9df81ccbad550d51f72b6bd97
+_md5_=893d0faf09518cdcffa9960cabea5be4
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
index 2078be3ea585..76f98008a528 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
 DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=7
 HOMEPAGE=http://www.firewalld.org/
-IUSE=gui +nftables +iptables kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gui +nftables +iptables kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield nftables? ( net-firewall/nftables ) iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.3.tar.gz -> firewalld-0.7.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24351fb1899ecf88cc51862cf8d7c015
+_md5_=28cfc3644a46431de610c1b26a231cdc
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
deleted file mode 100644
index c0fd76f3b707..000000000000
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-DESCRIPTION=Single Packet Authorization and Port Knocking application
-EAPI=7
-HOMEPAGE=https://www.cipherdyne.org/fwknop/
-IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server +python_single_target_python2_7 kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-REQUIRED_USE=nfqueue? ( server ) python? ( ^^ ( python_single_target_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
-SLOT=0
-SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=712fcf72e51ea0421e56a1cc2d13870b
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
deleted file mode 100644
index 91c9d7bee099..000000000000
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Single Packet Authorization and Port Knocking application
-EAPI=6
-HOMEPAGE=https://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop
-IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server +python_single_target_python2_7 kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-REQUIRED_USE=nfqueue? ( server ) python? ( ^^ ( python_single_target_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
-SLOT=0
-SRC_URI=https://github.com/mrash/fwknop/archive/2.6.9.tar.gz -> fwknop-2.6.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ca82c26719f8170ab981546f72271a4
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 093db43c3774..946f5772638c 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.3 b/metadata/md5-cache/net-fs/nfs-utils-2.4.3
index ccdcad7e9e86..f852e137c060 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.3
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.3
@@ -5,7 +5,7 @@ DESCRIPTION=NFS client and server daemons
 EAPI=7
 HOMEPAGE=http://linux-nfs.org/
 IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
 REQUIRED_USE=kerberos? ( nfsv4 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=27945f903690f4e2904283d9a4c8d494
+_md5_=7feda24bfd584fcd5b44e13d7a00609c
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 231b4e3e077f..731c595e9f08 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.12-r3 b/metadata/md5-cache/net-im/spectrum2-2.0.12-r4
similarity index 56%
rename from metadata/md5-cache/net-im/spectrum2-2.0.12-r3
rename to metadata/md5-cache/net-im/spectrum2-2.0.12-r4
index ea924a3dd049..8ba6b32deaab 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.12-r3
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.12-r4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( >=dev-libs/libpqxx-6.4.5:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( <=dev-libs/libpqxx-7.0.0:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=An open source instant messaging transport
 EAPI=7
 HOMEPAGE=https://www.spectrum.im
 IUSE=doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
 KEYWORDS=amd64
 LICENSE=GPL-2+
-RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( >=dev-libs/libpqxx-6.4.5:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
-REQUIRED_USE=|| ( mysql postgres sqlite )
+RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( <=dev-libs/libpqxx-7.0.0:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( irc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.12.tar.gz -> spectrum2-2.0.12.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0d837ed65321a74cd67705bbd8658be
+_md5_=119c135e25d1d67f2f59fddd6f649122
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.13-r1 b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
similarity index 56%
rename from metadata/md5-cache/net-im/spectrum2-2.0.13-r1
rename to metadata/md5-cache/net-im/spectrum2-2.0.13-r2
index f1bc4ea90bf4..3bbf9ee67599 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.13-r1
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( >=dev-libs/libpqxx-6.4.5:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( <=dev-libs/libpqxx-7.0.0:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat ) doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=An open source instant messaging transport
 EAPI=7
 HOMEPAGE=https://www.spectrum.im
 IUSE=doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= net-im/swift:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( >=dev-libs/libpqxx-6.4.5:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
-REQUIRED_USE=|| ( mysql postgres sqlite )
+RDEPEND=acct-group/spectrum acct-user/spectrum dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= dev-libs/log4cxx dev-libs/jsoncpp:= dev-libs/openssl:0= dev-libs/popt dev-libs/protobuf:= net-dns/libidn:0= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= frotz? ( !games-engines/frotz ) irc? ( net-im/libcommuni ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) postgres? ( <=dev-libs/libpqxx-7.0.0:= ) purple? ( dev-libs/glib net-im/pidgin:= ) sms? ( app-mobilephone/smstools ) sqlite? ( dev-db/sqlite:3 ) twitter? ( net-misc/curl ) whatsapp? ( net-im/transwhat )
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( irc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.13.tar.gz -> spectrum2-2.0.13.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b42a6c75c30ba3178c399e4aa6759606
+_md5_=1e3381c25d280c6b63289b7a3fd799ef
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r1 b/metadata/md5-cache/net-im/swift-4.0.2-r2
similarity index 98%
rename from metadata/md5-cache/net-im/swift-4.0.2-r1
rename to metadata/md5-cache/net-im/swift-4.0.2-r2
index 5db57e8050ea..3446617d9fe8 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r1
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67666a459957a4918abac351d3a08444
+_md5_=00f37be325442380816e93b5f1927875
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5dc091f86913..9f68486210bf 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libntlm-1.6 b/metadata/md5-cache/net-libs/libntlm-1.6
index 3f98baebf606..57ce7abccedb 100644
--- a/metadata/md5-cache/net-libs/libntlm-1.6
+++ b/metadata/md5-cache/net-libs/libntlm-1.6
@@ -3,8 +3,8 @@ DESCRIPTION=Microsoft's NTLM authentication (libntlm) library
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/libntlm/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.nongnu.org/libntlm/releases/libntlm-1.6.tar.gz
-_md5_=d551b71d9979055463c4fad71449eecf
+_md5_=81bbd84333a6879a0bb3908568d0f7ef
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
index baeab78f5d6c..8784eee1bf7e 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1
 DESCRIPTION=A simple C language RPC framework
 EAPI=7
 HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
-IUSE=python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 python_single_target_python2_7? ( dev-python/simplejson[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/simplejson[python_targets_python3_6(-)] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 python_single_target_python3_6? ( dev-python/simplejson[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6be0df53127d35fc43b095e3c5319d3
+_md5_=f15220d4636886519172a61b1d1d1794
diff --git a/metadata/md5-cache/net-libs/xrootd-4.12.0 b/metadata/md5-cache/net-libs/xrootd-4.12.0
index 6401f75c4909..1b96a7968068 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.0
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
-IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
-RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.12.0/xrootd-4.12.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d234934a517f9b23ce987dcbc0a1091
+_md5_=e8b46de4ab1c50c9059138de4917845c
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index cfe65762e665..67433a75bfd3 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12 b/metadata/md5-cache/net-mail/rss2email-3.12
new file mode 100644
index 000000000000..7efbf83a7ded
--- /dev/null
+++ b/metadata/md5-cache/net-mail/rss2email-3.12
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
+EAPI=7
+HOMEPAGE=https://github.com/rss2email/rss2email
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.tar.gz -> rss2email-3.12.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2a2ce8974637da7dd454f523454a236
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
index ad1e6af3fe46..4e035a2dfe6a 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
@@ -12,4 +12,4 @@ REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=60a1a4afeaa7cfaae41263259aa06f0b
+_md5_=3a53efce7d8e91e4afe00461b086aef1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 996cb6184f2a..0b1c5a8cf613 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/openssh-8.3_p1-r4 b/metadata/md5-cache/net-misc/openssh-8.3_p1-r4
index 11ac4c441239..ddf1dced803d 100644
--- a/metadata/md5-cache/net-misc/openssh-8.3_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-8.3_p1-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.3p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.3p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-AES-CTR-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-PeakTput-14.20.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.5.1/openssh-8.3p1+x509-12.5.1.diff.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=c8eb65f6aa433de3b7b6d67b4aa0318f
+_md5_=c0cee3e8b742cc2c3f4a2ba6ada0a87a
diff --git a/metadata/md5-cache/net-misc/pps-tools-1.0.2 b/metadata/md5-cache/net-misc/pps-tools-1.0.2
index 6e8373d4e40a..0f290d6f1621 100644
--- a/metadata/md5-cache/net-misc/pps-tools-1.0.2
+++ b/metadata/md5-cache/net-misc/pps-tools-1.0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=User-space tools for LinuxPPS
 EAPI=6
 HOMEPAGE=https://github.com/redlab-i/pps-tools
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/redlab-i/pps-tools/archive/v1.0.2.tar.gz -> pps-tools-1.0.2.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7968c8584a72a74b14a31923789fea02
+_md5_=a78be904b825c6db1847e9318eb52ff5
diff --git a/metadata/md5-cache/net-misc/proxychains-4.14 b/metadata/md5-cache/net-misc/proxychains-4.14
index 96f7409e9c43..7527c33f8a95 100644
--- a/metadata/md5-cache/net-misc/proxychains-4.14
+++ b/metadata/md5-cache/net-misc/proxychains-4.14
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
 EAPI=7
 HOMEPAGE=https://github.com/rofl0r/proxychains-ng/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.barfooze.de/pub/sabotage/tarballs/proxychains-ng-4.14.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=87cea7088ee9946a38c744e89a71dfb9
+_md5_=436366620d961a5bea160cd5a204bd7e
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.2-r1 b/metadata/md5-cache/net-misc/rsync-3.2.2-r1
index af05c1242436..6ebe3fbad8e3 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.2-r1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=7
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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 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
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd336a5619da919d79dda47a0000d2df
+_md5_=7e310b729736997d5029baa66633793e
diff --git a/metadata/md5-cache/net-misc/s3cmd-1.6.1 b/metadata/md5-cache/net-misc/s3cmd-1.6.1
deleted file mode 100644
index fd420dd05286..000000000000
--- a/metadata/md5-cache/net-misc/s3cmd-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line client for Amazon S3
-EAPI=6
-HOMEPAGE=https://s3tools.org/s3cmd
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-magic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/s3tools/s3cmd-1.6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a30144f9764577f91dc217180210f8c
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.0 b/metadata/md5-cache/net-misc/s3cmd-2.0.0
deleted file mode 100644
index 9e5dd76977c7..000000000000
--- a/metadata/md5-cache/net-misc/s3cmd-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Command line client for Amazon S3
-EAPI=6
-HOMEPAGE=https://s3tools.org/s3cmd
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~ia64 x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-magic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc33f60dcdad11ac04f1cc1858e15cbe
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index f4c915e9e438..0481bae9f81e 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/newsboat-2.13 b/metadata/md5-cache/net-news/newsboat-2.13
index bddd108ac3f9..1f373cb9f0ca 100644
--- a/metadata/md5-cache/net-news/newsboat-2.13
+++ b/metadata/md5-cache/net-news/newsboat-2.13
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.13/newsboat-2.13.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=392f03e7bd85048fbdc737901c6def14
+_md5_=cb94459713803ba565f7d890744af21d
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 331d7c082706..f31447b2bfb1 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-5.1.1 b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
index 1c8c1378a4ce..6fd59d680faa 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
+++ b/metadata/md5-cache/net-proxy/mitmproxy-5.1.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/blinker-1.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hypothesis-4.50.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parver-0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zstandard-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-python/blinker-1.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] test? ( >=dev-python/flask-1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hypothesis-4.50.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/parver-0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytest-3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/zstandard-0.8.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
 DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
 EAPI=7
 HOMEPAGE=https://mitmproxy.org/
-IUSE=test test python_targets_python3_6 python_targets_python3_7
+IUSE=test test python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/blinker-1.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/brotlipy-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/certifi-2015.11.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/click-6.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.9[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/flask-1.0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyper-h2-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/hyperframe-5.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/kaitaistruct-0.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ldap3-2.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/passlib-1.6.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/publicsuffix-2.20190205[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyasn1-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyperclip-1.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ruamel-yaml-0.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sortedcontainers-1.5.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=www-servers/tornado-4.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/urwid-2.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/wsproto-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v5.1.1.tar.gz -> mitmproxy-5.1.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb34deafc9ec0e761b08ff130537fba6
+_md5_=434440c8b752b0bf6eb20af501f0cfdb
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 106fe8a69a81..80c2e2fa9dff 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729
index 9f294face11f..c6ecc29635ce 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.wireguard.com/
 IUSE=debug +module module-src kernel_linux kernel_linux module
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
+RDEPEND=module? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200729.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6586fc41ad2f9aa99ebb536af694b0cc
+_md5_=7efead65e1758bfce024dfb0956e454c
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-9999 b/metadata/md5-cache/net-vpn/wireguard-modules-9999
deleted file mode 100644
index 756863041b51..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-modules-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
-EAPI=7
-HOMEPAGE=https://www.wireguard.com/
-IUSE=debug +module module-src kernel_linux kernel_linux module
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=!<virtual/wireguard-1 module? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	8ec5b53812bce105ae7943930e4660f8	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6586fc41ad2f9aa99ebb536af694b0cc
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
index 4f1ab7893dfb..f0b4117d8d60 100644
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.wireguard.com/
 IUSE=+wg-quick kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
+RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200513.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0c5c97b2cdd3a996ec40b5f1d2f67afa
+_md5_=b036cda3064eb58de937a94202974be6
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 8f64a0128177..3bcc809ad3c4 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
new file mode 100644
index 000000000000..7caa6a86aa01
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( virtual/jack ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=6
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) jack? ( virtual/jack ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) dtv? ( fec ) pager? ( filter analog ) qt5? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
+RESTRICT=!test? ( test )
+SLOT=0/3.7.13.5
+SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-1-qt5.tar.xz https://dev.gentoo.org/~zerochaos/patches/gnuradio-3.7.13-codec2.tar.xz https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cae9882228209e4d646e1d510e316887
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
new file mode 100644
index 000000000000..bfe8e316d3ba
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 ) !<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=7
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/boost:0=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:0=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) dev-libs/log4cpp python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) sci-libs/fftw:3.0= sci-libs/mpir sci-libs/volk alsa? ( media-libs/alsa-lib:= ) fec? ( sci-libs/gsl sci-libs/scipy ) filter? ( sci-libs/scipy ) grc? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_6? ( dev-python/PyQt5[opengl,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[opengl,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( sci-libs/scipy ) uhd? ( python_single_target_python3_6? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) utils? ( python_single_target_python3_6? ( dev-python/click[python_targets_python3_6(-)] dev-python/click-plugins[python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/click[python_targets_python3_7(-)] dev-python/click-plugins[python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( sci-libs/gsl dev-libs/gmp sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=test
+SLOT=0/3.8.1.0
+SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.1.0/gnuradio-3.8.1.0.tar.xz https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5868c26793f4e4aef49f19ece741394a
diff --git a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1 b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
index 6266877d26b4..58fb34b8fc8c 100644
--- a/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
+++ b/metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A collection of tools to configure IEEE 802.11 wireless LAN cards
 EAPI=7
 HOMEPAGE=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 IUSE=multicall
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.30.pre9.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=24280cff433067bde8911df637a2a1fa
+_md5_=26e0afcbda20eea5bb863941b6d1577c
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 6fd15b471c5c..5337d1303dad 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
index b493e9c0851f..4a1b9d6a6838 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ~sci-chemistry/openbabel-2.4.1 sys-libs/zlib >=dev-lang/swig-2 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~sci-chemistry/openbabel-2.4.1 sys-libs/zlib >=dev-lang/swig-2 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for OpenBabel (including Pybel)
 EAPI=6
 HOMEPAGE=http://openbabel.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ~sci-chemistry/openbabel-2.4.1 sys-libs/zlib
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~sci-chemistry/openbabel-2.4.1 sys-libs/zlib
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.4.1.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a640722436640dbabe7630cb44d12bb7
+_md5_=f810f34fb4f2adddc00842933d51ae84
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
deleted file mode 100644
index a0985e16d102..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=A Python-extensible molecular graphics system
-EAPI=7
-HOMEPAGE=https://www.pymol.org/
-IUSE=web python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sci-chemistry/chemical-mime-data python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a58008ce405db59834b6aca5465b98c
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index c5a12309e1be..995aad701206 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40 b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
index e4c1b554b754..48b298e1cc16 100644
--- a/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
+++ b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3
 DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=6
 HOMEPAGE=https://github.com/drahnr/oregano
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 || ( gnome-base/dconf gnome-base/gconf ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=https://github.com/drahnr/oregano/archive/v0.84.40.tar.gz -> drahnr-oregano-0.84.40.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52001cb2814e696204ff2f5873e99059
+_md5_=2542f2484e4440bb7bb1ba29bf39791a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 947f71d5c734..cb1b3de6c927 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index 41f3ed642992..54bdebdfc500 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.3
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format
 EAPI=5
 HOMEPAGE=http://gna.org/projects/bmrblib/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.3.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1a33fb262abc10b7f275bb862d1aa48
+_md5_=84e14a0165fcc90d096bea4696c2bd69
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.4 b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
index 308d92f3ba77..dfd1caa21ac5 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.4
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.4
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bmrblib
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bmrblib/bmrblib-1.0.4.tar.bz2
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=101c989ce6970c583c35794afeb33a21
+_md5_=361f38b1aea6d8177c65df46bd989000
diff --git a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3 b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3
index 2a5281346d10..7f6b23384609 100644
--- a/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3
+++ b/metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1+
 RDEPEND=virtual/cblas virtual/blas virtual/lapack dev-libs/gmp[cxx] =sci-libs/givaro-4.1*
 SLOT=0
-SRC_URI=https://github.com/linbox-team/fflas-ffpack/releases/download/2.4.3/fflas-ffpack-2.4.3.tar.gz
+SRC_URI=https://github.com/linbox-team/fflas-ffpack/releases/download/v2.4.3/fflas-ffpack-2.4.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb2874f6f4d12d67d1a1f3f9f696a016
+_md5_=b439cbeb36c149a9e1dd2d7cd345c501
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.8-r1 b/metadata/md5-cache/sci-libs/fftw-3.3.8-r1
index a9c5aa56d615..ad892629c14e 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.8-r1
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=6
 HOMEPAGE=http://www.fftw.org/
 IUSE=cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 LICENSE=GPL-2+
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.8.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec546d3e34864ecee1779ddbca6283ca
+_md5_=c31f60790d72aa6bb3590511f0ff04d8
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1 b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
index ec598734d5ec..85d11ead65fe 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi szip threads unsupported zlib
-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
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( ?? ( cxx mpi ) threads? ( !cxx !mpi !fortran !hl ) )
 SLOT=0/1.10.5
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df36fc5814edb5f35eec303ac334e41e
+_md5_=5eccefc6a39738d535ed8f711f688097
diff --git a/metadata/md5-cache/sci-libs/lapack-3.8.0-r1 b/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
index 7add05ad1f2a..7fc2ad888419 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
+++ b/metadata/md5-cache/sci-libs/lapack-3.8.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=BLAS,CBLAS,LAPACK,LAPACKE reference implementations
 EAPI=7
 HOMEPAGE=http://www.netlib.org/lapack/
 IUSE=lapacke deprecated doc eselect-ldso
-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
 LICENSE=BSD
 RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) !app-eselect/eselect-cblas !sci-libs/blas-reference !sci-libs/cblas-reference !sci-libs/lapack-reference !sci-libs/lapacke-reference virtual/fortran doc? ( app-doc/blas-docs )
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.8.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b855b5ce797bbf00dae4bdc3f103ad5
+_md5_=40bc89f8382cd27013054cb913113e1e
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.10 b/metadata/md5-cache/sci-libs/minfx-1.0.10
deleted file mode 100644
index 9bcc5f759517..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/minfx/minfx-1.0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.11 b/metadata/md5-cache/sci-libs/minfx-1.0.11
index bf4a819d47e1..36c8b2184058 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.11
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Numerical optimisation library
 EAPI=5
 HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f57e02b6a9a3ae24c47b3679c2e5daf8
+_md5_=88156668f6c4513ba6d9701ab1b39977
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1 b/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
deleted file mode 100644
index 6a6a16759b8c..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/minfx/minfx-1.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4 b/metadata/md5-cache/sci-libs/minfx-1.0.4
deleted file mode 100644
index 4e0b8f55d5ea..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/minfx/minfx-1.0.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98 b/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
deleted file mode 100644
index 9431cfe19197..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/minfx-1.0.4_pre98.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5138ae0e2a08cd39192b8a23bc747e4
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.5 b/metadata/md5-cache/sci-libs/minfx-1.0.5
deleted file mode 100644
index 4c5954becdba..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/minfx/minfx-1.0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.6 b/metadata/md5-cache/sci-libs/minfx-1.0.6
deleted file mode 100644
index 0b24dfd67992..000000000000
--- a/metadata/md5-cache/sci-libs/minfx-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Numerical optimisation library
-EAPI=5
-HOMEPAGE=http://gna.org/projects/minfx
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/minfx/minfx-1.0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index 026fc40f4d50..e71d8faaddc8 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-36[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-lang/swig >=dev-python/cython-0.22[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-36[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/fortran python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Scientific algorithms library for Python
 EAPI=6
 HOMEPAGE=https://www.scipy.org/
-IUSE=doc sparse test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc sparse test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/numpy-1.10[lapack,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/fortran python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.1.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.1.0/scipy-html-1.1.0.zip -> scipy-1.1.0-html.zip https://docs.scipy.org/doc/scipy-1.1.0/scipy-ref-1.1.0.pdf -> scipy-1.1.0-ref.pdf )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	fortran-2	1a8c9d0b2d30f756bae6be4e9b39e46b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b6994ce3716bc4c8e5bca54f22f4fa1
+_md5_=884465db4f9245dbbcf8c07709ebfa02
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 83774c9d146d..5c5a1da943b6 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.8 b/metadata/md5-cache/sci-mathematics/z3-4.8.8
index 4bba66b47c3e..6b67fe9a9c17 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.8
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.8
@@ -5,11 +5,11 @@ DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.8.tar.gz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=864750aa53cb5da103c8706c54286fee
+_md5_=1322b9d99a3880c974afdd42e7366bb6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 15fb27a49879..73207cebd891 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.11.13 b/metadata/md5-cache/sys-apps/hwloc-1.11.13
index 0777c8e12f04..af170b5f5b13 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.11.13
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.13
@@ -4,10 +4,10 @@ DESCRIPTION=displays the hardware topology in convenient formats
 EAPI=6
 HOMEPAGE=https://www.open-mpi.org/projects/hwloc/
 IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libpciaccess-0.13.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) plugins? ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/5
 SRC_URI=https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.13.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa26bcb866c335dece93b613a576b94d
+_md5_=4cd40c67ed98bf2331e8eb5aa910654b
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.6.4 b/metadata/md5-cache/sys-apps/pciutils-3.6.4
index b82ef55a2519..858926b64018 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.6.4
+++ b/metadata/md5-cache/sys-apps/pciutils-3.6.4
@@ -1,5 +1,6 @@
+BDEPEND=kmod? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
+DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=7
 HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
@@ -10,4 +11,4 @@ RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[
 SLOT=0
 SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.6.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1805d02c40d7f4f936fa2422f5edd312
+_md5_=6fbb580c356d9d8a15ddd58fe6d4e293
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.7.0 b/metadata/md5-cache/sys-apps/pciutils-3.7.0
index 6c9595e7700d..aec438487437 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.7.0
+++ b/metadata/md5-cache/sys-apps/pciutils-3.7.0
@@ -1,5 +1,6 @@
+BDEPEND=kmod? ( virtual/pkgconfig )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
+DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=7
 HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
@@ -10,4 +11,4 @@ RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[
 SLOT=0
 SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.7.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=34e952d4bf500817c01c718d6aa6a33b
+_md5_=009f009cf25902ed254cab8056326962
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
index 35b82c3fd672..5524d5a881de 100644
--- a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line tools for building SSL client-server applications
 EAPI=7
 HOMEPAGE=https://www.fehcom.de/ipnet/ucspi-ssl.html
 IUSE=bindist perl libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=https://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99e.tgz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	qmail	d71e87f6dc80bb9af62fd46856dc0a92	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b350d39de2dbd7272c4a7b267746e3f9
+_md5_=2e0f2ecb7e1b3869913253ee9f3e7019
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.35.2 b/metadata/md5-cache/sys-apps/util-linux-2.35.2
index e20770f335e7..88439e8f7208 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.35.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.35.2
@@ -5,7 +5,7 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU split-usr python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) ppc? ( sys-libs/librtas ) ppc64? ( sys-libs/librtas ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=31cc49e801db9880fb4b5086254c0924
+_md5_=9424e204d3758e2ca4e52614631f35c4
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
new file mode 100644
index 000000000000..08423e6b882a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
+DESCRIPTION=portal backend implementation that is using GTK+ and various pieces of GNOME
+EAPI=7
+HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
+IUSE=wayland X
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
+SLOT=0
+SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.7.1/xdg-desktop-portal-gtk-1.7.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=30cc7b1ee10b28500e5e2ccc270d455a
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 6b2c462080a8..47d992e175ef 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r4 b/metadata/md5-cache/sys-auth/polkit-0.115-r4
index ce89f120cc62..c55363752279 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13daff37a9b350142b38c318a3c72408
+_md5_=878bb3dcf08c1555bd32666eae6afae2
diff --git a/metadata/md5-cache/sys-auth/polkit-0.116-r1 b/metadata/md5-cache/sys-auth/polkit-0.116-r1
index f3de0a75db4c..25dca0002f81 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.116-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.116-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5df4713cdbe7fa5e9cc577703a77dcd0
+_md5_=5722ae2b0534b91d33f0bd58642eaf5f
diff --git a/metadata/md5-cache/sys-auth/polkit-0.117 b/metadata/md5-cache/sys-auth/polkit-0.117
new file mode 100644
index 000000000000..3846263fa38b
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/polkit-0.117
@@ -0,0 +1,17 @@
+BDEPEND=acct-user/polkitd app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-lang/spidermonkey:68[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] )
+DESCRIPTION=Policy framework for controlling privileges for system-wide services
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit
+IUSE=consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2
+PDEPEND=consolekit? ( sys-auth/consolekit[policykit] ) gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
+RDEPEND=dev-lang/spidermonkey:68[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
+REQUIRED_USE=^^ ( consolekit elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.117.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ceed067f75a0cfb47478cc6fb355c013
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index f8a3acdf1e6f..a712b0969aa8 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.5-r1 b/metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
index 7e76987c6381..b1329b612ad5 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug +gtk +libkms +pango +split-usr static-libs +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) udev? ( virtual/udev ) !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.5.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1c333231eac36f823983322fff43794
+_md5_=de77e58076e5a247485cb7ad30656d66
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index feacc642be36..37652fef2a1c 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.9.0 b/metadata/md5-cache/sys-cluster/libqb-1.9.0
index e879e7d799d1..9d5d4d3439f9 100644
--- a/metadata/md5-cache/sys-cluster/libqb-1.9.0
+++ b/metadata/md5-cache/sys-cluster/libqb-1.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
 EAPI=7
 HOMEPAGE=https://github.com/ClusterLabs/libqb
 IUSE=debug doc examples systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=https://github.com/ClusterLabs/libqb/archive/v1.9.0.tar.gz -> libqb-1.9.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b2b1d2568d40c8e5008d30da0d60fa9
+_md5_=fb8d5ab3a79c8387653bc74a62f6dd44
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 8439eb3b05dd..e880bfd322dc 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-2.34-r2
new file mode 100644
index 000000000000..486224299c5d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-2.34-r2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib sys-devel/gnuconfig
+DESCRIPTION=Tools necessary to build programs
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+REQUIRED_USE=default-gold? ( gold )
+RESTRICT=!test? ( test )
+SLOT=2.34
+SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2fc02b524a6b022ffa725929e860c23
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.2 b/metadata/md5-cache/sys-devel/binutils-config-5.2
deleted file mode 100644
index 12888d69977d..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-config-5.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install preinst
-DESCRIPTION=Utility to change the binutils version being used
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions
-SLOT=0
-_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=be17041179493c0a53316ea012d7463d
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.3.2 b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
index d19e123a7c05..873ee7eb6fd4 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.3.2
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.3.2
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to change the binutils version being used
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
 IUSE=+native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.3.2.tar.xz
 _eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=f4e013c53bd40b1ac0c5b6eb1a57ee5e
+_md5_=4d1a83d4bd4ca7aefec8145956e3a04e
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2
new file mode 100644
index 000000000000..4ebfebcc0c2a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib sys-devel/gnuconfig
+DESCRIPTION=Tools necessary to build programs
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
+KEYWORDS=-* ~hppa
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+REQUIRED_USE=default-gold? ( gold )
+RESTRICT=!test? ( test )
+SLOT=2.34
+SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f43cd0d97317e090f2f167a3b4cba29
diff --git a/metadata/md5-cache/sys-devel/bison-3.6.4 b/metadata/md5-cache/sys-devel/bison-3.6.4
index 32367e21aff2..9157799955d0 100644
--- a/metadata/md5-cache/sys-devel/bison-3.6.4
+++ b/metadata/md5-cache/sys-devel/bison-3.6.4
@@ -5,11 +5,11 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 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
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.6.4.tar.xz mirror://gentoo/bison-3.6.3-patches-01.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.6.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.6.3-patches-01.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ee39dfe4d85efdc9bab365f62d1360d1
+_md5_=2190f33f819172c884410a95e2c9d2e5
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0 b/metadata/md5-cache/sys-devel/clang-10.0.0
index 0516010e1796..7c744aacf51b 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0 )
 RDEPEND=~sys-devel/llvm-10.0.0:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9b6963fe573fa757c192d565ec307f7
+_md5_=50fbadc43bf3250a64a4be1e3fd4316a
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.0 b/metadata/md5-cache/sys-devel/clang-common-10.0.0
index 217c07fa8fd2..813daf52d0fd 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0b717d4880e97df30f3c9c6efc7bd2c7
+_md5_=886b10c625deca52b7b2a114a9484c5f
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
index d4782ee1cbec..614ca68057e1 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=7
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.0:10.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.0:10.0.0 ) ) libcxx? ( >=sys-libs/libcxx-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=10.0.0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8bb93fc4ee39545c70a3aab0443db6dc
+_md5_=076033ecd81d1cd3c0592b82c367bdfd
diff --git a/metadata/md5-cache/sys-devel/crossdev-20200801 b/metadata/md5-cache/sys-devel/crossdev-20200801
new file mode 100644
index 000000000000..a6eb7d9ae7c4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20200801
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=mirror://gentoo/crossdev-20200801.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20200801.tar.xz
+_md5_=8879ddb044df4971609b216a3a9dd2ad
diff --git a/metadata/md5-cache/sys-devel/gcc-10.1.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.1.0-r2
index 74605ed87af8..3509ef912750 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.1.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.1.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.1.0/gcc-10.1.0.tar.xz mirror://gentoo/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.1.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.1.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=35fa5bd68fc423d858ded28b21e11aa2
diff --git a/metadata/md5-cache/sys-devel/gcc-10.2.0 b/metadata/md5-cache/sys-devel/gcc-10.2.0
index 7e71da8e0137..963f4fa543a7 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.2.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz mirror://gentoo/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d20efc5394a83fb97761949220e47cc8
diff --git a/metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
index ffcec1d4c5b8..70ae10553cff 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gentoo/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=18da6475f3246ee1164de3e88a403196
diff --git a/metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
index 3744e4475a7f..54bcd626cbae 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gentoo/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-11.0.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=ab10a874a4a06ccfb84476ef6145c1b4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
index ec3769112245..ccadc5e5e409 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
@@ -1,15 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
 DESCRIPTION=The GNU Compiler Collection
-EAPI=5
+EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl nopie nossp +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go cilk ada +vtv
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
-RESTRICT=!test? ( test ) strip
+RESTRICT=!test? ( test )
 SLOT=4.9.4
-SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-2.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae4f6e22071344f54c6d915a5a55b69d
+SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e56ef13b35e6dc5646c59df8c9414676
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
index 13bd893032ec..1a9ebeba2004 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-3.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-piepatches-v1.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a243736e1b9c27706f540b92f07c334c
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
index 4dbe77199152..28ec305f50e9 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=09e172f2325a592bc7cf272e4df26c72
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r2 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
index a0c85c41d6bc..c847b46bb119 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c531f70204421914dfb37e71c0d4394d
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
index 00ccfe59fa02..938abbfb33a2 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d7976c7bed8b67925216a40a95bc8421
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0 b/metadata/md5-cache/sys-devel/gcc-7.5.0
index 2620ec13eaa3..2346f3d51902 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=7.5.0
 SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a56009c07bce193a52dd71e1b388adce
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.5.0-r1
index 9c1bc6bc901a..ec888f635097 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=7.5.0
 SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2f6b61c3fe2c460b126dc14d8ce3401
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0 b/metadata/md5-cache/sys-devel/gcc-8.4.0
index c7a6a1dfcd7c..92323ff0af36 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.4.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.4.0
 SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=02d34e9e4f0614d9ef538f68ca3415ff
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
index 3b4ca0bd3e28..6bdcda2b2fdc 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.4.0
 SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=593cd8eca2ba48783a6a584b95094fee
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0-r2 b/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
index 5d5f14d04bdd..cdebac1ac589 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b71a929798072676faae92e3cdb3ddff
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0-r4 b/metadata/md5-cache/sys-devel/gcc-9.2.0-r4
index 7394763f3520..2b7e01c05de7 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0-r4
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-6.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=938b65cb4ba46836915fb14598b2b566
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0 b/metadata/md5-cache/sys-devel/gcc-9.3.0
index 94082f12e74c..fbee96876e85 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=99128b7aff134af233511fccb4d588a0
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
index a358851191ff..b1da3dc40c4d 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8a228e5ef8c7b37acadb422983c4e6aa
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 7115bd33bc73..82f83b526ba9 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test ) strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=007b9612e26d2cb823f4495a3699960d
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3.1 b/metadata/md5-cache/sys-devel/gcc-config-2.3.1
index 7487fc073f40..67ff4d0cd474 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.3.1
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.3.1
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to manage compilers
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 IUSE=+native-symlinks
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7d9f467eeb54fe8e954c273165f4c267
+_md5_=162f0be2e551e2eb06f9c9082f2eded4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.1.0 b/metadata/md5-cache/sys-devel/kgcc64-10.1.0
index b4659e8c87f3..642ed45b6972 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.1.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.1.0/gcc-10.1.0.tar.xz mirror://gentoo/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.1.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.1.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0cc8b9a248abab45e1494c70e38eb216
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.2.0 b/metadata/md5-cache/sys-devel/kgcc64-10.2.0
index 3b6e2b7e2a38..f5fb90f03c63 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.2.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz mirror://gentoo/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0cc8b9a248abab45e1494c70e38eb216
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index 80a8c9d8b29e..c5106d7ab061 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=!test? ( test ) strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de5432adb7e30c5159284286100ba9a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
index 80b7e5fa54ef..9b2efa0f9b4b 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d5317e701e42d695083da9ef8d95e6b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index e76110d15bf4..cedbe66e4e27 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=!test? ( test ) strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de5432adb7e30c5159284286100ba9a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.5.0 b/metadata/md5-cache/sys-devel/kgcc64-5.5.0
index 7a7549905e6f..fce5b4dbf872 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.5.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c32d4de64cb867348e370a203673d56f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index 5fa45f2443a6..79035628443d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=!test? ( test ) strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de5432adb7e30c5159284286100ba9a8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.5.0 b/metadata/md5-cache/sys-devel/kgcc64-6.5.0
index 2915c2cde74d..d1dc9527ecde 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.5.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-5.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b7e1874eb682ef6e99899bafaf74b92b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index 188bee46c34f..c826f5ce63c1 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=!test? ( test ) strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=97f66fe6ad754ccd01fa4dad1f398e68
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.5.0 b/metadata/md5-cache/sys-devel/kgcc64-7.5.0
index 0ca3bbd55835..185fc28f27bf 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.5.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=7.5.0
 SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e058c16bc398cd7e8266ba599502313
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index 1cee38e73969..7eaca657beac 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=!test? ( test ) strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=97f66fe6ad754ccd01fa4dad1f398e68
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.4.0 b/metadata/md5-cache/sys-devel/kgcc64-8.4.0
index f958bcddcede..9c4756400578 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.4.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.4.0
 SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=929fcabd5a6013a7196bb55faff6e38e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
index 8e1ce1e2beba..c197554dc88a 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-2.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2355fcaa0f7b28d719d91e0745f8d6d8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
index 6eef0e992a74..8ce382b9e5ac 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	f777fc1aeb714eaa008d7179d8a23ca8	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	208dc3e4b098400a23449fe8bb78b231	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2e058c16bc398cd7e8266ba599502313
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0 b/metadata/md5-cache/sys-devel/lld-10.0.0
index b926b2bd7221..a03fcd36cfbb 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=amd64 arm arm64 ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-10.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67703ac0194cacca9a84c40f97ccb603
+_md5_=f412aabf3c5a0623700fdb3254bdcbd2
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0 b/metadata/md5-cache/sys-devel/llvm-10.0.0
index dcbbe50c22b1..0d6f74592751 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-10 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a272de7295011c2fd08d8bf936dd05
+_md5_=fe46c171e7ea11e18ce55211854e88d0
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.0 b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
index abba08107224..9f7ba772b7bc 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=02eefdf971a7298599706b017212ca3e
+_md5_=50c1f0e11c65867fa9ccc23de12003ff
diff --git a/metadata/md5-cache/sys-devel/llvmgold-10 b/metadata/md5-cache/sys-devel/llvmgold-10
index ec5ac1859417..355a697ce4fc 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-10
+++ b/metadata/md5-cache/sys-devel/llvmgold-10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:10[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=3cefa3294c983528e2f4da319baed28d
+_md5_=5003580d2b4450d5151101028dc8e2b4
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 382a51b4b5a8..180460211138 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/ddrescue-1.25 b/metadata/md5-cache/sys-fs/ddrescue-1.25
index b23352919122..8169d1714e0a 100644
--- a/metadata/md5-cache/sys-fs/ddrescue-1.25
+++ b/metadata/md5-cache/sys-fs/ddrescue-1.25
@@ -4,9 +4,9 @@ DESCRIPTION=Copy data from one file or block device to another with read-error r
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ddrescue/ddrescue.html
 IUSE=static
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ddrescue/ddrescue-1.25.tar.lz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=10cbb927b6c9ea7093973eb1a1bdc1a4
+_md5_=fa3cb31d2347d1dfabb570b87499ffcb
diff --git a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
index 3fc1fa846134..21637c80bab2 100644
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
 EAPI=7
 HOMEPAGE=http://opendarwin.org
 IUSE=libressl
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 ~x86
 LICENSE=APSL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ce29e900fbbc4ce2b3ae68b8e7603de
+_md5_=25b89680952144ba20bc3548c9eb731b
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.0 b/metadata/md5-cache/sys-fs/udisks-2.9.0
index ef05fd9434aa..3b6ec9a9caf0 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.0
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.0
@@ -1,15 +1,15 @@
 BDEPEND=app-text/docbook-xsl-stylesheets >=dev-util/gdbus-codegen-2.32 >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.8 ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=sys-auth/polkit-0.110 virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-kernel/linux-headers-3.1
+DEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-kernel/linux-headers-3.1
 DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=sys-auth/polkit-0.110 virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-block/parted-3 virtual/eject daemon? ( >=sys-apps/util-linux-2.30 ) selinux? ( sec-policy/selinux-devicekit )
+RDEPEND=>=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-block/parted-3 virtual/eject daemon? ( >=sys-apps/util-linux-2.30 ) selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.0/udisks-2.9.0.tar.bz2
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce74ec7a6e2485051c46b0e176a19729
+_md5_=7a36051b950e2305dd07352a4d70ee63
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
index d8bac9765eca..e7c4f8b23c1f 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
@@ -3,10 +3,10 @@ DESCRIPTION=ZFS Automatic Snapshot Service for Linux
 EAPI=6
 HOMEPAGE=https://github.com/zfsonlinux/zfs-auto-snapshot
 IUSE=+default-exclude
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2+
 RDEPEND=sys-fs/zfs virtual/cron
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4.tar.gz -> zfs-auto-snapshot-upstream-1.2.4.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=e73b5d364a7547dd2f10a812ce1c8f7e
+_md5_=38a807c26e717a422bbf1ef035c459c8
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4acc00c4eeb7..a8f4366b0625 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index 450da7dadbf4..edd4231fcac4 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=4.14.178-FC.01
 SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
index 3831772319a6..9fffa701b833 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -10,5 +10,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
 RESTRICT=strip test
 SLOT=5.4.51-FB.01
 SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=0fcc30a0105ba37997b3f48bcf611ac8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
index 7159342ef826..ffe36d216b67 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.40 !sys-kernel/vanilla-kernel-bin:5.4.40
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-40.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3d20e359870a68c44a4822295e795f5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
index c6f89c454964..e0805d03294f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
@@ -4,11 +4,11 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.4.52 !sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.52
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4cb5ba34df6bfa25f0057562e0432e72
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8a3ed33bf69ed149277d74712919e579
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53
index fe4c5d694ba6..250d63b4925e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel:5.4.53 !sys-kernel/vanilla-kernel-bin:5.4.53
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.53
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-53.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=4cb5ba34df6bfa25f0057562e0432e72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.55 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.55
new file mode 100644
index 000000000000..0220d08b689f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.55
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.55 !sys-kernel/vanilla-kernel-bin:5.4.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.55
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-55.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-55.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4cb5ba34df6bfa25f0057562e0432e72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10
index e0559b54201c..cb1d5f4c6065 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.10
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-11.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=23cfd7fb1dfbc6e0f7752967aa435464
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.12
new file mode 100644
index 000000000000..2e4e51a2d0d6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.7.12 !sys-kernel/vanilla-kernel-bin:5.7.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.12
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-13.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23cfd7fb1dfbc6e0f7752967aa435464
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
index 35eaf1905c9f..8d32b5e155d5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.40 !sys-kernel/vanilla-kernel:5.4.40 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40-1.xpak -> gentoo-kernel-5.4.40-1.x86.xpak )
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=9012e8c93bb1e67d607665e63c5ce47d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
index 7b20d189127a..1c1485a9319b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
@@ -4,11 +4,11 @@ DESCRIPTION=Pre-built Linux kernel with genpatches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.52 !sys-kernel/vanilla-kernel:5.4.52 !sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.52
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52-1.xpak -> gentoo-kernel-5.4.52-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52-1.xpak -> gentoo-kernel-5.4.52-1.x86.xpak )
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=bae967bac757157a016c2cac5d58467a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53
index 110d3e533c11..84bd10e52e45 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.4.53 !sys-kernel/vanilla-kernel:5.4.53 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.53
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.53-1.xpak -> gentoo-kernel-5.4.53-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.53-1.xpak -> gentoo-kernel-5.4.53-1.x86.xpak )
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.55 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.55
new file mode 100644
index 000000000000..1c4a4c3c1210
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.55
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.55 !sys-kernel/vanilla-kernel:5.4.55 !sys-kernel/vanilla-kernel-bin:5.4.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.55
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55-1.xpak -> gentoo-kernel-5.4.55-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55-1.xpak -> gentoo-kernel-5.4.55-1.x86.xpak )
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10
index 8f7458fabb5b..b77c7176156a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/gentoo-kernel:5.7.10 !sys-kernel/vanilla-kernel:5.7.10 !sys-
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.10
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.10-1.xpak -> gentoo-kernel-5.7.10-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.10-1.xpak -> gentoo-kernel-5.7.10-1.x86.xpak )
-_eclasses_=kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
 _md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.12
new file mode 100644
index 000000000000..959b8738e6ae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.12
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.7.12 !sys-kernel/vanilla-kernel:5.7.12 !sys-kernel/vanilla-kernel-bin:5.7.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.12
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12-1.xpak -> gentoo-kernel-5.7.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12-1.xpak -> gentoo-kernel-5.7.12-1.x86.xpak )
+_eclasses_=kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.191 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.191
new file mode 100644
index 000000000000..51dae5a06e73
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.191
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.191
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-201.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-201.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-201.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-201.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-201.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-201.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-201.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-201.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-201.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=38c8412b4722f781639612f7b4b95645
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.136 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.136
new file mode 100644
index 000000000000..6dafa147061c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.136
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.136
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-135.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-135.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-135.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-135.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-135.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-135.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-135.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-135.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-135.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1ce6777965d7b34dd037d90567743205
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.232 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.232
new file mode 100644
index 000000000000..6daea9d64131
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.232
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.232
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-233.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-233.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-233.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-233.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-233.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-233.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-233.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-233.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-233.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ff8df4901d0f86c3bf8dbad95b89cea7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.232 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.232
new file mode 100644
index 000000000000..a7820408865c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.232
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.232
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-236.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-236.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-236.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-236.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-236.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-236.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-236.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-236.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-236.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=486a3ab98873aacda9c2acf71487d388
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.55 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.55
new file mode 100644
index 000000000000..4ea799ddf7b4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.55
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-56.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-56.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-56.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-56.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-56.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-56.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-56.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-56.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-56.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88ca91fd09374552f2edc09291a0920e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.12
new file mode 100644
index 000000000000..f45344124342
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.7 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.7.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-13.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=26f03992bc57621b6b39a2dca9a25835
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
index 03bfed93beff..3b834a323add 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.40 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.40
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.40.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=dc8d69b59a7a529ec5aaeb6b32b16e59a3cc1569 -> linux-5.4.15-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=1ad219bd3f0ab439a81ed01fec7660eeea7daa0e -> linux-5.4.15-arch1.i686.config )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03aedbb35fc318996eda748e0c3f5df0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
index ae9495a9295a..2c5b7d81ed1a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.52
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.52.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fca6ff1d0067edd16aadae2dd9ffdf10
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53
index eb9c1c8d6e07..7d8122b82de0 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.53 || ( sys-kernel/installkernel-gent
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.4.53
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.53.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fca6ff1d0067edd16aadae2dd9ffdf10
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.55 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.55
new file mode 100644
index 000000000000..c2d8a2d1897c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.55
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.55 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.55
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.55.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fca6ff1d0067edd16aadae2dd9ffdf10
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10
index ff38502bc1f2..d9fa243d2224 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=5.7.10
 SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.10.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	f449bbcb4318bced8ce33865bbbfaa2c	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=60237c516903cc97c5fd906872e19dec
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.12
new file mode 100644
index 000000000000..62f261b80c18
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.12
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.12.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	fd031e1f2e4ab604fd05c6ed6fc90c32	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=60237c516903cc97c5fd906872e19dec
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.190 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.191
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.190
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.191
index a8257020d2cc..0ab676c2bc0f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.190
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.191
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.190
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.190.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.191
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.191.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.135 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.136
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.135
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.136
index 2102ac2ac9c8..7b2aedb155ee 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.135
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.136
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.135
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.135.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.136
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.136.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.231 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.232
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.231
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.232
index 0ea8f4cd3381..72b4da131947 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.231
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.232
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.4.231
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.231.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.232
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.232.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.231 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.232
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.231
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.232
index e8123aa3eb9d..08e625993697 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.231
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.232
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.231
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.231.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.232
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.232.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.54 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.55
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.54
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.55
index 7684be464d88..ddec852fcf5e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.54
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.55
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.54
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.54.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.55
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.55.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.12
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.7.11
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.7.12
index e4d70b5e70fb..2483745c2f0a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.12
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.7.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+SLOT=5.7.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index bf333ff89361..a0aeecf40445 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
new file mode 100644
index 000000000000..17a7d8fef141
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
+EAPI=7
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
+SLOT=0/2.34
+SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d6fd3f438166385169e218689c8e76b5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
index c5419322d7a0..dfb0ce8ac998 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=459479ef37197ec933ddf0055af601f4
+_md5_=92578df3cbeec3eb135df275a4cda0ab
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
index 953c42c4efab..4a2840084e1f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c68721d545385d78b023675fa1877621
+_md5_=9a279505900070a816a15136e30aa341
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.24 b/metadata/md5-cache/sys-libs/libblockdev-2.24
index aceeff49fc11..69e37cb4233c 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.24
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.24
@@ -5,7 +5,7 @@ DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) escrow? ( cryptsetup )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.24-1/libblockdev-2.24.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db07f93e8c75de0103b0f871b4dbcef4
+_md5_=d09d87ced74dcc2e1e5a4e4d3b55acec
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0 b/metadata/md5-cache/sys-libs/libcxx-10.0.0
index 333dd6dd0bf2..ed47750b52ed 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=7
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=libunwind? ( libcxxabi )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97f4926d5c17c08d19c85280fd25feb9
+_md5_=40a747745dd77cf91bd8507e7d9a644d
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
index 12e1aac5e1f3..637bbcfcbbad 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=7
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind +static-libs test elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20632871cebb1f54bce78d435255974e
+_md5_=2360129f90ebbf31b290a6ae48d932ca
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0 b/metadata/md5-cache/sys-libs/libomp-10.0.0
index 890e9976f0b0..c0fa6e1b4636 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=7
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96126db35469aea5eff3c671ed920d7d
+_md5_=1336fdbcc6942e3b52673cc7968012a6
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
index 168ecb9eb460..764e371fba64 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=7
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3933b6a7d95f755bcf7b8981f9ec927f
+_md5_=b39a25bac319f8476abb434ec2502e4d
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2020a b/metadata/md5-cache/sys-libs/timezone-data-2020a
index f775ed7bd7c2..0973e3492b46 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2020a
+++ b/metadata/md5-cache/sys-libs/timezone-data-2020a
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 IUSE=nls leaps-timezone elibc_FreeBSD
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2020a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2020a.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab9fa4a2f264cdadd20ccec59020a913
+_md5_=2db2a8e3780daf4088e680f0ea1e4b64
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index a529a4cf3c5b..6c26c02ac780 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/cron-0-r1 b/metadata/md5-cache/virtual/cron-0-r1
deleted file mode 100644
index 6a1124edc443..000000000000
--- a/metadata/md5-cache/virtual/cron-0-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for cron
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-RDEPEND=|| ( sys-process/cronie sys-process/vixie-cron sys-process/bcron sys-process/dcron sys-process/fcron sys-process/systemd-cron )
-SLOT=0
-_md5_=5d89f5c972ade3ccb97fde9665f39390
diff --git a/metadata/md5-cache/virtual/cron-0-r2 b/metadata/md5-cache/virtual/cron-0-r2
new file mode 100644
index 000000000000..a8c1864d8c35
--- /dev/null
+++ b/metadata/md5-cache/virtual/cron-0-r2
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for cron
+EAPI=6
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+RDEPEND=|| ( sys-process/cronie sys-process/bcron sys-process/dcron sys-process/fcron sys-process/systemd-cron )
+SLOT=0
+_md5_=0b0af7b64a29d2d2591700fb759b6f58
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.270.0 b/metadata/md5-cache/virtual/perl-CPAN-2.270.0
new file mode 100644
index 000000000000..1098cc3a0f9c
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.270.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for CPAN
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/CPAN-2.270.0 ) dev-lang/perl:= !<perl-core/CPAN-2.270.0 !>perl-core/CPAN-2.270.0-r999
+SLOT=0
+_md5_=265575bb6c4b8286f26ce1b5eeecbbf4
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r3 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r3
deleted file mode 100644
index 4e9fe270c60d..000000000000
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for CPAN-Meta
-EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-2.150.10 ) dev-lang/perl:= !<perl-core/CPAN-Meta-2.150.10 !>perl-core/CPAN-Meta-2.150.10-r999 >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Parse-CPAN-Meta-1.441.400
-SLOT=0
-_md5_=0321b11cdd68650c678b7fb648203c3e
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r4 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r4
new file mode 100644
index 000000000000..b32448395d0e
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r4
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for CPAN-Meta
+EAPI=6
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-2.150.10 ) dev-lang/perl:= !<perl-core/CPAN-Meta-2.150.10 !>perl-core/CPAN-Meta-2.150.10-r999 >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Parse-CPAN-Meta-1.441.400
+SLOT=0
+_md5_=c2f6080965283659a2e6eb9400245e15
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r5 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r6
similarity index 56%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r5
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r6
index 7752b0033934..3c73a4f5eb41 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r5
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r6
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-Requirements-2.140.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-Requirements-2.140.0 !>perl-core/CPAN-Meta-Requirements-2.140.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-Requirements-2.140.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-Requirements-2.140.0 !>perl-core/CPAN-Meta-Requirements-2.140.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r5 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r6
similarity index 58%
rename from metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r5
rename to metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r6
index 3fbf7576cd84..32d018b5edea 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r5
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r6
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-YAML
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-YAML-0.18.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-YAML-0.18.0 !>perl-core/CPAN-Meta-YAML-0.18.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/CPAN-Meta-YAML-0.18.0 ) dev-lang/perl:= !<perl-core/CPAN-Meta-YAML-0.18.0 !>perl-core/CPAN-Meta-YAML-0.18.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0
new file mode 100644
index 000000000000..adee3b3b3a26
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Compress-Raw-Zlib
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Compress-Raw-Zlib-2.93.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.93.0 !>perl-core/Compress-Raw-Zlib-2.93.0-r999
+SLOT=0
+_md5_=ed2755bd59cb46abe227fb1c85988aa0
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.853.0 b/metadata/md5-cache/virtual/perl-DB_File-1.853.0
new file mode 100644
index 000000000000..f371290d8024
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.853.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for DB_File
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
+RDEPEND=|| ( =dev-lang/perl-5.32*[berkdb] ~perl-core/DB_File-1.853.0 ) dev-lang/perl:= !<perl-core/DB_File-1.853.0 !>perl-core/DB_File-1.853.0-r999
+SLOT=0
+_md5_=033c29cd4656a50150834beecca652e0
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r1
similarity index 58%
rename from metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0
rename to metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r1
index ff7d18438a47..9cad5dc306c7 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Data-Dumper-2.174.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.174.0 !>perl-core/Data-Dumper-2.174.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Data-Dumper-2.174.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.174.0 !>perl-core/Data-Dumper-2.174.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0
new file mode 100644
index 000000000000..5232ee106443
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Devel-PPPort
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Devel-PPPort-3.570.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.570.0 !>perl-core/Devel-PPPort-3.570.0-r999
+SLOT=0
+_md5_=aa9126bdf9b2b78343e32a2b5447df77
diff --git a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r9 b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
similarity index 58%
rename from metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r9
rename to metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
index 0990aaf7dd7e..09567108e670 100644
--- a/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r9
+++ b/metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Digest-1.170.100_rc ) dev-lang/perl:= !<perl-core/Digest-1.170.100_rc !>perl-core/Digest-1.170.100_rc-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Digest-1.170.100_rc ) dev-lang/perl:= !<perl-core/Digest-1.170.100_rc !>perl-core/Digest-1.170.100_rc-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc
new file mode 100644
index 000000000000..f18fc027c8eb
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Digest-MD5
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Digest-MD5-2.550.100_rc ) dev-lang/perl:= !<perl-core/Digest-MD5-2.550.100_rc !>perl-core/Digest-MD5-2.550.100_rc-r999
+SLOT=0
+_md5_=ed2755bd59cb46abe227fb1c85988aa0
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0-r1
similarity index 59%
rename from metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0
rename to metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0-r1
index 3bb684e48f6f..aa056a0c869a 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/Digest-SHA-6.20.0 ) dev-lang/perl:= !<perl-core/Digest-SHA-6.20.0 !>perl-core/Digest-SHA-6.20.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/Digest-SHA-6.20.0 ) dev-lang/perl:= !<perl-core/Digest-SHA-6.20.0 !>perl-core/Digest-SHA-6.20.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-Dumpvalue-1.210.0 b/metadata/md5-cache/virtual/perl-Dumpvalue-1.210.0
new file mode 100644
index 000000000000..9cef97900556
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Dumpvalue-1.210.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Dumpvalue
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Dumpvalue-1.210.0 ) dev-lang/perl:= !<perl-core/Dumpvalue-1.210.0 !>perl-core/Dumpvalue-1.210.0-r999
+SLOT=0
+_md5_=265575bb6c4b8286f26ce1b5eeecbbf4
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1 b/metadata/md5-cache/virtual/perl-Encode-3.60.0
similarity index 51%
rename from metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
rename to metadata/md5-cache/virtual/perl-Encode-3.60.0
index 90752bc9ec8b..e06ac34512b3 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
+++ b/metadata/md5-cache/virtual/perl-Encode-3.60.0
@@ -1,10 +1,7 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /usr/bin/vi symlink
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Encode
 EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Encode-3.60.0 ) dev-lang/perl:= !<perl-core/Encode-3.60.0 !>perl-core/Encode-3.60.0-r999
 SLOT=0
-SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=d6a18044bee4adb3cca1dec590f688d1
+_md5_=ca1520365191ad7d27e0d4df3fe3a9c4
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.740.0 b/metadata/md5-cache/virtual/perl-Exporter-5.740.0
new file mode 100644
index 000000000000..dbb6ef4487ec
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.740.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Exporter
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Exporter-5.740.0 ) dev-lang/perl:= !<perl-core/Exporter-5.740.0 !>perl-core/Exporter-5.740.0-r999
+SLOT=0
+_md5_=ca1520365191ad7d27e0d4df3fe3a9c4
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234
new file mode 100644
index 000000000000..f72a82e65eb0
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for ExtUtils-CBuilder
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/ExtUtils-CBuilder-0.280.234 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.234 !>perl-core/ExtUtils-CBuilder-0.280.234-r999
+SLOT=0
+_md5_=ca1520365191ad7d27e0d4df3fe3a9c4
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r3
similarity index 57%
rename from metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r2
rename to metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r3
index a0ffc987f9b1..00591a60fa3b 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r3
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Constant
 EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-Constant-0.250.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Constant-0.250.0 !>perl-core/ExtUtils-Constant-0.250.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-Constant-0.250.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Constant-0.250.0 !>perl-core/ExtUtils-Constant-0.250.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=8e630d0d4350f7be213526631821c0ab
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
similarity index 56%
rename from metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r2
rename to metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
index 222ba9bd5991..f355ef291296 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-Install-2.140.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.140.0 !>perl-core/ExtUtils-Install-2.140.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-Install-2.140.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.140.0 !>perl-core/ExtUtils-Install-2.140.0-r999
 SLOT=0
-_md5_=44594095badefc286f5713526fdbaf30
+_md5_=de6c9c16ec4be4e9caea6f25bae963b1
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0
new file mode 100644
index 000000000000..bd2072eafe0f
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for ExtUtils-MakeMaker
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/ExtUtils-MakeMaker-7.440.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.440.0 !>perl-core/ExtUtils-MakeMaker-7.440.0-r999
+SLOT=0
+_md5_=ca1520365191ad7d27e0d4df3fe3a9c4
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
similarity index 55%
rename from metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0
rename to metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
index 18c2a9686cd0..aa00cd8f5aef 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Manifest
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-Manifest-1.720.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Manifest-1.720.0 !>perl-core/ExtUtils-Manifest-1.720.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-Manifest-1.720.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Manifest-1.720.0 !>perl-core/ExtUtils-Manifest-1.720.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=4419e0c992b125981e8918902b2a5942
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
similarity index 56%
rename from metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0
rename to metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
index be083241e17f..16ae28faa43f 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/ExtUtils-ParseXS-3.400.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.400.0 !>perl-core/ExtUtils-ParseXS-3.400.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/ExtUtils-ParseXS-3.400.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.400.0 !>perl-core/ExtUtils-ParseXS-3.400.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=4419e0c992b125981e8918902b2a5942
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.160.0 b/metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
similarity index 57%
rename from metadata/md5-cache/virtual/perl-File-Path-2.160.0
rename to metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
index ef360f52130c..e48b9fdaa79c 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.160.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/File-Path-2.160.0 ) dev-lang/perl:= !<perl-core/File-Path-2.160.0 !>perl-core/File-Path-2.160.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/File-Path-2.160.0 ) dev-lang/perl:= !<perl-core/File-Path-2.160.0 !>perl-core/File-Path-2.160.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=4419e0c992b125981e8918902b2a5942
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.780.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
similarity index 57%
rename from metadata/md5-cache/virtual/perl-File-Spec-3.780.0
rename to metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
index e05602165ad4..a60bcf6b28ee 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.780.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-RDEPEND=|| ( =dev-lang/perl-5.30* ~perl-core/File-Spec-3.780.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.780.0 !>perl-core/File-Spec-3.780.0-r999
+RDEPEND=|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/File-Spec-3.780.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.780.0 !>perl-core/File-Spec-3.780.0-r999
 SLOT=0
-_md5_=2d151768f37aaa411ac9c24c41b96948
+_md5_=4419e0c992b125981e8918902b2a5942
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.900 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.900
index 99b24411ee91..7818d7775c43 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.900
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.230.900
@@ -4,4 +4,4 @@ EAPI=6
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
 RDEPEND=~perl-core/File-Temp-0.230.900 dev-lang/perl:=
 SLOT=0
-_md5_=1ab37496c42fb7a178ca5bc19db0b30b
+_md5_=bdba17385c5656a51fe9eb71d2979759
diff --git a/metadata/md5-cache/virtual/perl-Filter-Simple-0.960.0 b/metadata/md5-cache/virtual/perl-Filter-Simple-0.960.0
new file mode 100644
index 000000000000..d17cb19c0816
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Filter-Simple-0.960.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for perl-core/Filter-Simple
+EAPI=7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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
+RDEPEND=|| ( =dev-lang/perl-5.32* ~perl-core/Filter-Simple-0.960.0 ) dev-lang/perl:= !<perl-core/Filter-Simple-0.960.0 !>perl-core/Filter-Simple-0.960.0-r999
+SLOT=0
+_md5_=feefb02b50bb1d26dd6830b54e15e1cc
diff --git a/metadata/md5-cache/virtual/python-backports_abc-0 b/metadata/md5-cache/virtual/python-backports_abc-0
deleted file mode 100644
index 153e3c7f56da..000000000000
--- a/metadata/md5-cache/virtual/python-backports_abc-0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for the Python 3.3+ collections.abc module
-EAPI=5
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-abc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8cf1d78c64437997089544529c25e6d7
diff --git a/metadata/md5-cache/virtual/python-enum34-2 b/metadata/md5-cache/virtual/python-enum34-2
deleted file mode 100644
index 12e2ab64a0d7..000000000000
--- a/metadata/md5-cache/virtual/python-enum34-2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for Python enum34 module
-EAPI=7
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c96f9360ff25bff1869d6b2fc7725e49
diff --git a/metadata/md5-cache/virtual/python-funcsigs-2-r1 b/metadata/md5-cache/virtual/python-funcsigs-2-r1
deleted file mode 100644
index 822649ad4bd1..000000000000
--- a/metadata/md5-cache/virtual/python-funcsigs-2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A Virtual for Python function signatures from PEP362 (py3.6 variant)
-EAPI=6
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/funcsigs-1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c063402a26d3d3bca56e45fc1d755d13
diff --git a/metadata/md5-cache/virtual/python-futures-1 b/metadata/md5-cache/virtual/python-futures-1
deleted file mode 100644
index b83c0bec8d28..000000000000
--- a/metadata/md5-cache/virtual/python-futures-1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for the Python concurrent.futures module
-EAPI=7
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=681bcee0e70faa3ecfae09e073cb3b9b
diff --git a/metadata/md5-cache/virtual/python-ipaddress-1.0-r1 b/metadata/md5-cache/virtual/python-ipaddress-1.0-r1
deleted file mode 100644
index d931a4053502..000000000000
--- a/metadata/md5-cache/virtual/python-ipaddress-1.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for Python ipaddress module
-EAPI=5
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/ipaddress[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f5e0e15e2efb2a967d316f4dc993be0
diff --git a/metadata/md5-cache/virtual/python-pathlib-1.0 b/metadata/md5-cache/virtual/python-pathlib-1.0
deleted file mode 100644
index 9e9f4431a01b..000000000000
--- a/metadata/md5-cache/virtual/python-pathlib-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for Python pathlib module
-EAPI=7
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e83bbffbccff955bcf65b0902a4a0f6
diff --git a/metadata/md5-cache/virtual/python-singledispatch-0 b/metadata/md5-cache/virtual/python-singledispatch-0
deleted file mode 100644
index eece727e684a..000000000000
--- a/metadata/md5-cache/virtual/python-singledispatch-0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for the Python functools.singledispatch function
-EAPI=5
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a4026229adb323136334438ff9430a8f
diff --git a/metadata/md5-cache/virtual/python-typing-0-r1 b/metadata/md5-cache/virtual/python-typing-0-r1
deleted file mode 100644
index 1fa3bdc2dad7..000000000000
--- a/metadata/md5-cache/virtual/python-typing-0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for the Python typing module
-EAPI=6
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7137b942b8d0e1d72e68c5c68c07f76
diff --git a/metadata/md5-cache/virtual/python-unittest-mock-1 b/metadata/md5-cache/virtual/python-unittest-mock-1
deleted file mode 100644
index 2b43a833f106..000000000000
--- a/metadata/md5-cache/virtual/python-unittest-mock-1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for unittest.mock with mock fallback
-EAPI=6
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a8ea02716786eb867a46ae8b583156a
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index a754cb6645cd..4edb568a71fe 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.5.13 b/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
index d8e8af4e8f55..9c12728bd6f9 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.5.13.tar.gz -> mod_wsgi-4.5.13.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be54543866d6257da54d90c9b23580ce
+_md5_=2355ec587dd37488a960191fae252ed4
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.6.5 b/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
index 801d2c16438a..0da6462a8e33 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.6.5.tar.gz -> mod_wsgi-4.6.5.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e5306718d62a7faa9d814af657587f
+_md5_=91b5d99c14e0029df76d06eff646ef7e
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
index ee5cc4dce5e4..f40dd4ba25d3 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) =www-servers/apache-2*
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) =www-servers/apache-2*
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.0.tar.gz -> mod_wsgi-4.7.0.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31550fb524e5e5e61177dd4e8d135f22
+_md5_=302f44e7f812fbf066932806136508ab
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index ff5822f04ad3..12789aecfa9f 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/bugzilla-5.0.6 b/metadata/md5-cache/www-apps/bugzilla-5.0.6
new file mode 100644
index 000000000000..d8775bbc9fbf
--- /dev/null
+++ b/metadata/md5-cache/www-apps/bugzilla-5.0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-lang/perl >=dev-perl/CGI-3.510.0 >=dev-perl/DBI-1.614.0 >=dev-perl/TimeDate-2.230.0 >=dev-perl/DateTime-0.750.0 >=dev-perl/DateTime-TimeZone-1.640.0 virtual/perl-Digest-SHA >=dev-perl/Email-MIME-1.904.0 >=dev-perl/Email-Sender-1.300.11 >=dev-perl/JSON-XS-2.10.0 >=dev-perl/List-MoreUtils-0.320.0 >=dev-perl/Math-Random-ISAAC-1.0.1 >=dev-perl/Template-Toolkit-2.240.0 >=dev-perl/URI-1.550.0 ) doc? ( dev-python/sphinx dev-perl/File-Copy-Recursive )
+DEFINED_PHASES=install postinst prepare prerm setup test
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Bugzilla is the Bug-Tracking System from the Mozilla project
+EAPI=7
+HOMEPAGE=https://www.bugzilla.org
+IUSE=apache2 doc mysql postgres sqlite test vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-lang/perl >=dev-perl/CGI-3.510.0 >=dev-perl/DBI-1.614.0 >=dev-perl/TimeDate-2.230.0 >=dev-perl/DateTime-0.750.0 >=dev-perl/DateTime-TimeZone-1.640.0 virtual/perl-Digest-SHA >=dev-perl/Email-MIME-1.904.0 >=dev-perl/Email-Sender-1.300.11 >=dev-perl/JSON-XS-2.10.0 >=dev-perl/List-MoreUtils-0.320.0 >=dev-perl/Math-Random-ISAAC-1.0.1 >=dev-perl/Template-Toolkit-2.240.0 >=dev-perl/URI-1.550.0 apache2? ( www-servers/apache[apache2_modules_access_compat] ) !apache2? ( virtual/httpd-cgi ) postgres? ( >=dev-perl/DBD-Pg-1.49 ) mysql? ( >=dev-perl/DBD-mysql-4.0.5 ) sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=!test? ( test )
+SLOT=5.0.6
+SRC_URI=https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-5.0.6.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=4fe55e86daf524225b0e579c6fb63e03
diff --git a/metadata/md5-cache/www-apps/netbox-2.5.11 b/metadata/md5-cache/www-apps/netbox-2.5.11
deleted file mode 100644
index 0a02f627b405..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.5.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/digitalocean/netbox/archive/v2.5.11.tar.gz -> netbox-2.5.11.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f430af8cfeec0085183ca1bc3d238dd6
diff --git a/metadata/md5-cache/www-apps/netbox-2.5.12 b/metadata/md5-cache/www-apps/netbox-2.5.12
deleted file mode 100644
index b38d7bea4f58..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.5.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/digitalocean/netbox/archive/v2.5.12.tar.gz -> netbox-2.5.12.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f430af8cfeec0085183ca1bc3d238dd6
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.1 b/metadata/md5-cache/www-apps/netbox-2.6.1
deleted file mode 100644
index 3fc6ce7d358b..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/digitalocean/netbox/archive/v2.6.1.tar.gz -> netbox-2.6.1.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=c7afb9c65cb3403901795443f338654b
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.12 b/metadata/md5-cache/www-apps/netbox-2.6.12
deleted file mode 100644
index 0abaadabb8f8..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.12.tar.gz -> netbox-2.6.12.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb43bbda47d47de727cc9c0f5a508f0a
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.4 b/metadata/md5-cache/www-apps/netbox-2.6.4
deleted file mode 100644
index b6cd9e51d64c..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.4.tar.gz -> netbox-2.6.4.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=7be2685c2e506dc413f610a35630e842
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.5 b/metadata/md5-cache/www-apps/netbox-2.6.5
deleted file mode 100644
index 36cfc8f87bf9..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.5.tar.gz -> netbox-2.6.5.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=9cf2e5725ee87cb5fac5773f4e5e599c
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.6 b/metadata/md5-cache/www-apps/netbox-2.6.6
deleted file mode 100644
index 6dba6c01c6c7..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.6.tar.gz -> netbox-2.6.6.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=9cf2e5725ee87cb5fac5773f4e5e599c
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.7 b/metadata/md5-cache/www-apps/netbox-2.6.7
deleted file mode 100644
index 5bb5b0ae0c93..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.7.tar.gz -> netbox-2.6.7.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=6f090da1c3d825a77347271c17b6a733
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.8 b/metadata/md5-cache/www-apps/netbox-2.6.8
deleted file mode 100644
index a590ad746699..000000000000
--- a/metadata/md5-cache/www-apps/netbox-2.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-DESCRIPTION=IP address and data center infrastructure management tool
-EAPI=7
-HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.8.tar.gz -> netbox-2.6.8.tar.gz
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ca05fce9a3af9c6d927abad2cfca1c07
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 7c3692d20404..365b47f87ca0 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-85.0.4183.39 b/metadata/md5-cache/www-client/chromium-85.0.4183.48
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-85.0.4183.39
rename to metadata/md5-cache/www-client/chromium-85.0.4183.48
index 83eaa02a0045..6f845a8474d8 100644
--- a/metadata/md5-cache/www-client/chromium-85.0.4183.39
+++ b/metadata/md5-cache/www-client/chromium-85.0.4183.48
@@ -11,6 +11,6 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) wayland? ( ozone )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.39.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-2/chromium-85-patchset-2.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.48.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-2/chromium-85-patchset-2.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a448ade433479f57071c44a411e31a5
diff --git a/metadata/md5-cache/www-client/dillo-3.0.5-r3 b/metadata/md5-cache/www-client/dillo-3.0.5-r3
index 7e2b68cc43e8..4df73e9a955a 100644
--- a/metadata/md5-cache/www-client/dillo-3.0.5-r3
+++ b/metadata/md5-cache/www-client/dillo-3.0.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Lean FLTK based web browser
 EAPI=7
 HOMEPAGE=https://www.dillo.org/
 IUSE=doc +gif ipv6 +jpeg libressl +png ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
 SLOT=0
 SRC_URI=https://www.dillo.org/download/dillo-3.0.5.tar.bz2 mirror://gentoo/dillo.png
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=43582cfef65fc4bfed3ec30047a51683
+_md5_=a130ab9eee7563eb01c28eaf8ec3ddf6
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 6b9b214c3e8f..d1e1a93a9828 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.2.1 b/metadata/md5-cache/www-plugins/passff-host-1.2.1
deleted file mode 100644
index eededf6a7b6d..000000000000
--- a/metadata/md5-cache/www-plugins/passff-host-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=Host app for the PassFF WebExtension
-EAPI=7
-HOMEPAGE=https://github.com/passff/passff-host
-IUSE=chrome chromium firefox vivaldi python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( chrome chromium firefox vivaldi )
-SLOT=0
-SRC_URI=https://github.com/passff/passff-host/releases/download/1.2.1/passff.py -> passff-host-1.2.1.py https://github.com/passff/passff-host/releases/download/1.2.1/passff.json -> passff-host-1.2.1.json
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e6db73475d5f34ec684538be34fc923
diff --git a/metadata/md5-cache/www-plugins/passff-host-1.2.1-r1 b/metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
index a30f76053344..5928a30b85fd 100644
--- a/metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
+++ b/metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup unpack
 DESCRIPTION=Host app for the PassFF WebExtension
 EAPI=7
 HOMEPAGE=https://github.com/passff/passff-host
-IUSE=chrome chromium firefox vivaldi python_single_target_python3_6 python_single_target_python3_7
+IUSE=chrome chromium firefox vivaldi python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( chrome chromium firefox vivaldi )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( chrome chromium firefox vivaldi )
 SLOT=0
 SRC_URI=https://github.com/passff/passff-host/releases/download/1.2.1/passff.py -> passff-host-1.2.1.py https://github.com/passff/passff-host/releases/download/1.2.1/passff.json -> passff-host-1.2.1.json
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c0482ad6d2a9ab3e3c2660d8a878d62d
+_md5_=401874a32e3241279f14da19d664e172
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 330c8af306bd..4bbe7fa7c8c1 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.18 b/metadata/md5-cache/www-servers/uwsgi-2.0.18
index 00092e28831d..e916979ceef6 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.18
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-asyncio? ( virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+DEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 DESCRIPTION=uWSGI server for Python web applications
 EAPI=6
 HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+IUSE=apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio python-gevent ruby php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python3_6 python_targets_python3_7 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
 KEYWORDS=amd64 arm x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-asyncio? ( virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) python-asyncio? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
+RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( dev-lang/lua:= ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( net-libs/libnsl php_targets_php7-2? ( dev-lang/php:7.2[embed] ) php_targets_php7-3? ( dev-lang/php:7.3[embed] ) php_targets_php7-4? ( dev-lang/php:7.4[embed] ) ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python-gevent? ( >=dev-python/gevent-1.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
+REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) python? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) python-asyncio? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.18.tar.gz -> uwsgi-2.0.18.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ca5d4c2f2b42d3890454af9d9bd2e81
+_md5_=a034a62b0d82cb7a6f029f831c6d31e0
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index e46bced19311..5ed5ac0d05bb 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
index 5fe6b2d73b8b..a12c08fad176 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.108/NVIDIA-FreeBSD-x86_64-340.108.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.108/NVIDIA-FreeBSD-x86-340.108.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	459db03f4f86c64035800e7c83ddba52	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=ab905758e5e2647cb45a1e0c88edd9c5
+_md5_=9b4db9ba324f419d43fa3e9eea6af14f
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1da5ca100fed..3a43d4748880 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/cairo-1.16.0-r4 b/metadata/md5-cache/x11-libs/cairo-1.16.0-r4
index 603220aa175e..294a2daae86c 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.16.0-r4
+++ b/metadata/md5-cache/x11-libs/cairo-1.16.0-r4
@@ -5,7 +5,7 @@ DESCRIPTION=A vector graphics library with cross-device output support
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo
 IUSE=X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/binutils-libs:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pixman-0.32.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2-only? ( >=media-libs/mesa-9.1.6[gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=gles2-only? ( !opengl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.cairographics.org/releases/cairo-1.16.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f649bbaa0254ab978236f6c94169184e
+_md5_=db7bdc506c1044850e9f2fe0210b312b
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.10 b/metadata/md5-cache/x11-libs/libX11-1.6.10
new file mode 100644
index 000000000000..fca453a8c289
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2 x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org X11 library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 static-libs doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.10.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
+_md5_=d17e35e09dd1c2324ed975caac1c7343
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.102 b/metadata/md5-cache/x11-libs/libdrm-2.4.102
index 7aba8e2bb9c9..3c3729b0537a 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.102
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.102
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.102.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=194481c19a89fb2f07cef75cbcc09ad8
+_md5_=104c7f1ab10a4d00c7ac2720743aaf7d
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1 b/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
index 44945963c3aa..336d03a493d7 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt
 DESCRIPTION=Qt Library for Building File Managers
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif x11-libs/libxcb !lxqt-base/lxqt-l10n
 SLOT=0/7
 SRC_URI=https://github.com/lxqt/libfm-qt/releases/download/0.15.1/libfm-qt-0.15.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c314ab72ee8a2410fbbb8c6a8971e12c
+_md5_=101306d6713fbddda61f48c94c864144
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1 b/metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1
index 73e02e8ae30e..5a2bd1af66ee 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=keymap handling library for toolkits and window systems
 EAPI=7
 HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
 IUSE=X doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-0.10.0.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a9aecde0e0c1cfd7e5239a0003c33eb1
+_md5_=a53b45f5a462cb2f1c472c7120ff48c3
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e42ac94c03bd..4020ebf82505 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3
index e7ac1c90ec33..3de9f2d4927b 100644
--- a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3
+++ b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
+DEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3 dev-libs/wayland
 DESCRIPTION=Application menu module for GTK
 EAPI=7
 HOMEPAGE=https://gitlab.com/vala-panel-project/vala-panel-appmenu
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
 SLOT=0
 SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fc1c8c0721a71310337b0a26141da4a
+_md5_=0d0c8638a4c73fced8280096d31599eb
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.15.0 b/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
index 996141073de5..c8231ab037a0 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Qt GUI Openbox Configuration Tool
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/sed x11-wm/openbox:3 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/obconf-qt/releases/download/0.15.0/obconf-qt-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a48b4c39c5247bb7c9816c8f9177ea1c
+_md5_=ee4278f5ef8c46657b878972b3aba017
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
index 76cf4ecf77de..93f2863214c5 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtw
 DESCRIPTION=Qt GUI Tabbed Filemanager
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.15* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.15.1/pcmanfm-qt-0.15.1.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e509f57b6bb9610a8dcb77f5944f173d
+_md5_=2c19ec6a4e791b2914edbd8963a3cb17
diff --git a/metadata/md5-cache/x11-misc/qps-2.1.0-r1 b/metadata/md5-cache/x11-misc/qps-2.1.0-r1
index 759bb9993541..95cb871f5853 100644
--- a/metadata/md5-cache/x11-misc/qps-2.1.0-r1
+++ b/metadata/md5-cache/x11-misc/qps-2.1.0-r1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Qt GUI Process Manager
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.15.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/qps/releases/download/2.1.0/qps-2.1.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15ecdfacc500eab55c0a1aef0731cab5
+_md5_=cc8bb97e5c832c84aafcf4c84c2b36ad
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
index 29288b642ece..6ad322cf75cc 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
@@ -4,11 +4,11 @@ DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop intero
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-utils/
 IUSE=doc
-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
 LICENSE=MIT
 RDEPEND=dev-util/desktop-file-utils dev-perl/File-MimeInfo dev-perl/Net-DBus dev-perl/X11-Protocol sys-apps/dbus x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1d999384b8056224ccd70a1824e3f175
+_md5_=211ed19fd9a72a38004470208fc657c4
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.30 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.30
index f92dbd505bdc..8c5292900a92 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.30
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.30
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure prepare setup test
 DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.30.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6ccca1236f063c873624fa73ece0938d
+_md5_=203ace5064934d519a0f8b581ebec96f
diff --git a/metadata/md5-cache/x11-misc/xmobar-0.35.1 b/metadata/md5-cache/x11-misc/xmobar-0.35.1
new file mode 100644
index 000000000000..e8ec1741e2a9
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xmobar-0.35.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) !iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) ) mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A Minimalistic Text Based Status Bar
+EAPI=7
+HOMEPAGE=http://xmobar.org
+IUSE=alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/parsec-numbers-0.1.0:=[profile?] dev-haskell/regex-compat:=[profile?] >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libXrandr x11-libs/libXrender alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) dbus? ( >=dev-haskell/dbus-1:=[profile?] weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xpm? ( x11-libs/libXpm ) ) !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] net-wireless/wireless-tools ) !iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] >=dev-haskell/netlink-1.1.1.0:=[profile?] ) ) mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] ) mpris? ( >=dev-haskell/dbus-1:=[profile?] !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-client-tls:=[profile?] dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) xpm? ( x11-libs/libXpm weather? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) ) ) ) timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) uvmeter? ( dev-haskell/http-conduit:=[profile?] dev-haskell/http-types:=[profile?] ) xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.35.1
+SRC_URI=https://hackage.haskell.org/package/xmobar-0.35.1/xmobar-0.35.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0463c5dbefb4e4b34b343d6121c29e7f
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index a48318cc8e50..5d4b8b3a71b8 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.5.0 b/metadata/md5-cache/x11-terms/alacritty-0.5.0
new file mode 100644
index 000000000000..a5712fb06e64
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 )
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/alacritty/alacritty
+IUSE=wayland +X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=https://github.com/alacritty/alacritty/archive/v0.5.0.tar.gz -> alacritty-0.5.0.tar.gz https://crates.io/api/v1/crates/adler/0.2.2/download -> adler-0.2.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.9+1.0.8/download -> bzip2-sys-0.1.9+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.58/download -> cc-1.0.58.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/cocoa/0.20.2/download -> cocoa-0.20.2.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.0/download -> copypasta-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossfont/0.1.0/download -> crossfont-0.1.0.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.14/download -> euclid-0.20.14.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.16/download -> flate2-1.0.16.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.1/download -> glutin-0.24.1.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.15/download -> hermit-abi-0.1.15.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.6/download -> image-0.23.6.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.6/download -> instant-0.1.6.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.72/download -> libc-0.2.72.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libloading/0.6.2/download -> libloading-0.6.2.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.0/download -> miniz_oxide-0.4.0.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.5/download -> miow-0.3.5.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-rational/0.3.0/download -> num-rational-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/ordered-float/1.1.0/download -> ordered-float-1.1.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.6/download -> png-0.16.6.crate https://crates.io/api/v1/crates/podio/0.1.7/download -> podio-0.1.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.56/download -> serde_json-1.0.56.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.16/download -> signal-hook-0.1.16.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.1/download -> smallvec-1.4.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.10.0/download -> smithay-client-toolkit-0.10.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.5.1/download -> smithay-clipboard-0.5.1.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.33/download -> syn-1.0.33.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-client/0.27.0/download -> wayland-client-0.27.0.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.27.0/download -> wayland-commons-0.27.0.crate https://crates.io/api/v1/crates/wayland-cursor/0.27.0/download -> wayland-cursor-0.27.0.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.27.0/download -> wayland-protocols-0.27.0.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.27.0/download -> wayland-scanner-0.27.0.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.27.0/download -> wayland-sys-0.27.0.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.2/download -> xcursor-0.3.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate https://crates.io/api/v1/crates/zip/0.5.6/download -> zip-0.5.6.crate
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	59ecae2c29d723be70671fd182038195	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4ee769beb395677c6a616305d7455f51
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.5.0_rc1 b/metadata/md5-cache/x11-terms/alacritty-0.5.0_rc1
deleted file mode 100644
index c84904380980..000000000000
--- a/metadata/md5-cache/x11-terms/alacritty-0.5.0_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/cmake >=virtual/rust-1.37.0
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 )
-DESCRIPTION=GPU-accelerated terminal emulator
-EAPI=7
-HOMEPAGE=https://github.com/alacritty/alacritty
-IUSE=wayland +X debug
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
-RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
-REQUIRED_USE=|| ( wayland X )
-SLOT=0
-SRC_URI=https://github.com/alacritty/alacritty/archive/v0.5.0-rc1.tar.gz -> alacritty-0.5.0_rc1.tar.gz https://crates.io/api/v1/crates/adler/0.2.2/download -> adler-0.2.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.9+1.0.8/download -> bzip2-sys-0.1.9+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.58/download -> cc-1.0.58.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/cocoa/0.20.2/download -> cocoa-0.20.2.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.0/download -> copypasta-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.14/download -> euclid-0.20.14.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.16/download -> flate2-1.0.16.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.1/download -> glutin-0.24.1.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.15/download -> hermit-abi-0.1.15.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.6/download -> image-0.23.6.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.6/download -> instant-0.1.6.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.72/download -> libc-0.2.72.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libloading/0.6.2/download -> libloading-0.6.2.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.0/download -> miniz_oxide-0.4.0.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.5/download -> miow-0.3.5.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-rational/0.3.0/download -> num-rational-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/ordered-float/1.1.0/download -> ordered-float-1.1.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.6/download -> png-0.16.6.crate https://crates.io/api/v1/crates/podio/0.1.7/download -> podio-0.1.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.56/download -> serde_json-1.0.56.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.16/download -> signal-hook-0.1.16.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.1/download -> smallvec-1.4.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.10.0/download -> smithay-client-toolkit-0.10.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.5.1/download -> smithay-clipboard-0.5.1.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.33/download -> syn-1.0.33.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-client/0.27.0/download -> wayland-client-0.27.0.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.27.0/download -> wayland-commons-0.27.0.crate https://crates.io/api/v1/crates/wayland-cursor/0.27.0/download -> wayland-cursor-0.27.0.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.27.0/download -> wayland-protocols-0.27.0.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.27.0/download -> wayland-scanner-0.27.0.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.27.0/download -> wayland-sys-0.27.0.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.2/download -> xcursor-0.3.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate https://crates.io/api/v1/crates/zip/0.5.6/download -> zip-0.5.6.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	59ecae2c29d723be70671fd182038195	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=05071e2d214026561d5b8baf8b99fca6
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
index 60684d351395..7011d3aa87e2 100644
--- a/metadata/md5-cache/x11-terms/alacritty-9999
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -11,4 +11,4 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	59ecae2c29d723be70671fd182038195	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7a1abe8949126addd63a7d4cb66d957
+_md5_=433b2e1e851fac7fb47d8760b8760413
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index c5615d55310c..64bb3539abb5 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
index 4d21ccce04a0..f800fbeb2177 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.36/adwaita-icon-theme-3.36.1.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6eae806e6e6f3a9605ae9181b271237
+_md5_=dcae2e055aef1e937a3a621d246c3f82
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
index e8b230431736..99c72e34bf3d 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=LXQt Themes
 EAPI=7
 HOMEPAGE=https://lxqt.github.io/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-themes/releases/download/0.15.0/lxqt-themes-0.15.0.tar.xz
 _eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=216df74b79645f1320bf5a0dae5eb34e
+_md5_=b0c2118c128c4f03759b5d3cfe7e5844
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index da176b095da1..94c5f51338d4 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.11 b/metadata/md5-cache/x11-wm/twm-1.0.11
index 0ce6d4dfcd0a..2737f3a98c00 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.11
+++ b/metadata/md5-cache/x11-wm/twm-1.0.11
@@ -4,10 +4,10 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
 DESCRIPTION=X.Org Tab Window Manager
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/twm
-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
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt media-fonts/font-adobe-75dpi
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.11.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xorg-3	f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=93830c6cb972b355b1a365e3b21b622a
+_md5_=bacd061ce5ba7acce07c12f4b2c512ab
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 218f6349ef7b..3f50ac1d421a 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.14.3 b/metadata/md5-cache/xfce-base/xfconf-4.14.3
index c26dd11e9c05..58a792515939 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.14.3
+++ b/metadata/md5-cache/xfce-base/xfconf-4.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=A configuration management system for Xfce
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug introspection perl vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42 sys-apps/dbus >=xfce-base/libxfce4util-4.10:= introspection? ( dev-libs/gobject-introspection:= ) perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.14/xfconf-4.14.3.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
-_md5_=ab83a4b84be5f9462aed4c82a63af2fb
+_md5_=70ccc95d523aad83ce7b446dce3941e8
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.2 b/metadata/md5-cache/xfce-base/xfwm4-4.14.2
index e526321905b6..ffdaa4ce6c61 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.14.2
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64099b79f38132249e8a8781eee20276
+_md5_=dbbdad0bb5b83b69b17f4d8327023d77
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.4 b/metadata/md5-cache/xfce-base/xfwm4-4.14.4
new file mode 100644
index 000000000000..fb7ca9e67f34
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=opengl startup-notification +xcomposite +xpresent
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.4.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0692117c2ae27e4c1ad20490b01f7be
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.15.0 b/metadata/md5-cache/xfce-base/xfwm4-4.15.0
new file mode 100644
index 000000000000..43cb3cf0a089
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=opengl startup-notification +xcomposite +xpresent
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.15/xfwm4-4.15.0.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0692117c2ae27e4c1ad20490b01f7be
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9c03768a0f95..52619e8088aa 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12044 BLAKE2B 547415c33cd1d5d0e90a80f7a59574b3586b17cced894eeab2dd80042c3bb6aca4b85cda93f72c8edb89d80a5480978ea22a242f346c7a98fad2a95a214b4874 SHA512 a55a6789e7d66503ccbe69d73f70534bb16956cbc073435959464fead34e7db53e6daf9c756eb92e635e27550f6e05cf0aab7bd9d83a005f5e26dc0513b3d06f
-TIMESTAMP 2020-07-31T09:38:27Z
+TIMESTAMP 2020-08-02T16:38:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8j5pNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8m7AVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVjhAAn+uTwVvKfn+5JjtiSJIrEgZsx+2+kebFQRjA1Y0LVZwTfogNzmL3PEuL
-UK/blyHvaJMYNWwVJd+C4aBl6AZZmVFBY27FfTnUvooM98lrSEHlJ84lvwU6xthz
-kIPJGIUPCOpsMlvjqt6OXt50e5LXa/74ZlfE0TSlnITAPOozPWXWByAk/tz60MJg
-a705aBYMNmNJqZeaKcvnO4IY8C06Z4WzXniO/8IU0KPy6Czx06Qoulmbf1SU2+7/
-8dTaRDTc9a5WvgjeLaeaJT0E3sg9fuczQ6YMn2vSwE5ZgYYH6YqW87c5Q4Jr7KS8
-8xkU7AOk/jXF+NyoBQhxPfAA9Y+uKNXrY34ZgcF7KQc1Cc8LnCeR+KEUkca7jpVU
-rPx4ZCBQgMSZlmPdTSnL6TNGmMYVuFKBw54yWHe1cZ61pNi9zKGSswtANiy+UIYB
-ZcpOncfe+vybazNShW+Wer5QUO8wqfKW1Kfb4rMLrYLF/WkgLph1DOXGTZaJF/o1
-7LpdKazHDFpONOgyDYSAHjp9sbYce/Iz5RHrmEs17zVh+thQkfpTE+TaReedkJ+w
-Op5MQpivkk9vLii1ENwWhzneQUoYFKSMEks1yXdoALDHEO9Ifbqn1QVQ3Wm79Pif
-4aNAa2Ul3Kl3sp7XxYXKPWVpun6dD/43qQrX+OGMnAnZD6YKYjk=
-=FkcK
+klAvfw/+NUOXXKL4CANTUn+coCSPSUdvq35DHsiptEO0QtFgwHdm8irmK0EroOaq
+ChjlCOhyKKO8fNN8aM15FMWca+GwyvkTB514/Yrjkm3pSZcRVUMfD1BPYwS3F2eS
+snuD1EawNGbdwJu49Rafeydnu5kxLnVgQazSiv4XZrE1sIDIc+Sm5zbmgSDZ7p4q
+5axQAmsRdvvZCvhVu/tEiYAF2/ay3T6ONiXt6OrNNuUTtug2QxF9ppunDUPykI1v
+8exI1PsgcrjlgFxJZ+QCSOb1h2+DTO5YSFKaShE/68706ao2vr87IMG9iDi0IzIP
+zJBH1FgooMKlY3UmYMvs4V9XVwMzWNtMZ4aOhq8eXyz8mahWQYugHLPIOmqHxWqU
+blxAsis7HF+1jiGyJu1PPXTIet0D/4chWhbmumnx3ctyga8cAAJZ99ErkvkJwsmh
+tM0l4UJ5+SbNmyyzHO+wt0bw8oPH8y09nShEMVLaPoiOwwkrKt9dMAgljpOPshJi
+jQF4C/i2rhao5wbbbN6Lclo26iuHC76iAimmsN//q72MBjd3ZPjIpd9dlBe4zOd3
+9XH2dsghI+LuW6s8EJReDJxd9gk6sujeo+zpV9dX/AgjepFPz9IQpkzpsrM0qdR4
+kcW3XQ2k4ApB4UN2T4Bx0dVCmJns5/g+1aSm3zATewsqd7RhO80=
+=2Oo1
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cafc35c5c511..871a8b8422a5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Jul 2020 09:38:24 +0000
+Sun, 02 Aug 2020 16:38:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 71a0745b375d..3df8b17f163b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri 31 Jul 2020 09:38:23 AM UTC
+Sun 02 Aug 2020 04:08:25 PM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 36c489905e37..6217e5ab229d 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -419,7 +419,6 @@
 2007252308 ./acct-user/postfix_exporter/postfix_exporter-0.ebuild
 2007282139 ./acct-user/gpsd/gpsd-0.ebuild
 1704191101 ./app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
-2001051415 ./app-accessibility/accerciser/accerciser-3.22.0.ebuild
 2007201009 ./app-accessibility/accerciser/accerciser-3.36.2.ebuild
 2007290809 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
 2006132027 ./app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
@@ -523,6 +522,7 @@
 2004282039 ./app-admin/consul-template/consul-template-0.25.0.ebuild
 2006190809 ./app-admin/consul/consul-1.8.0.ebuild
 2006251009 ./app-admin/consul/consul-1.7.4.ebuild
+2008020109 ./app-admin/consul/consul-1.8.1.ebuild
 1702282250 ./app-admin/cpulimit/cpulimit-1.8.ebuild
 1702282250 ./app-admin/cpulimit/cpulimit-2.2.ebuild
 1702282250 ./app-admin/cpulimit/cpulimit-2.4.ebuild
@@ -648,6 +648,7 @@
 2003261841 ./app-admin/logrotate/logrotate-3.15.1.ebuild
 2003261841 ./app-admin/logrotate/logrotate-3.16.0.ebuild
 2004032241 ./app-admin/logrotate/logrotate-3.14.0.ebuild
+2007311939 ./app-admin/logrotate/logrotate-3.17.0.ebuild
 2003261841 ./app-admin/logsentry/logsentry-1.1.1-r2.ebuild
 2005091339 ./app-admin/logstalgia/logstalgia-1.1.2.ebuild
 2004261709 ./app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
@@ -778,6 +779,7 @@
 1912241739 ./app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
 1910111840 ./app-admin/sshguard/sshguard-2.4.0.ebuild
 1908081109 ./app-admin/sshguard/sshguard-99999.ebuild
+2008011009 ./app-admin/sshguard/sshguard-2.4.1.ebuild
 1912110241 ./app-admin/stow/stow-2.2.2-r1.ebuild
 2005252009 ./app-admin/stow/stow-2.3.1.ebuild
 1801291909 ./app-admin/su-exec/su-exec-0.2.ebuild
@@ -827,6 +829,8 @@
 1810060109 ./app-admin/ulogd/ulogd-2.0.7-r1.ebuild
 2002081309 ./app-admin/usbview/usbview-2.0.ebuild
 2006260408 ./app-admin/vault/vault-1.4.2-r1.ebuild
+2008020209 ./app-admin/vault/vault-1.4.3.ebuild
+2008021039 ./app-admin/vault/vault-1.5.0.ebuild
 2002230040 ./app-admin/verynice/verynice-1.1-r3.ebuild
 1810141609 ./app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
 2002112050 ./app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -897,7 +901,7 @@
 2003212239 ./app-arch/lcab/lcab-1.0_beta12.ebuild
 2006222138 ./app-arch/lha/lha-114i_p20201004.ebuild
 2004032241 ./app-arch/libarchive/libarchive-3.4.2.ebuild
-2005201238 ./app-arch/libarchive/libarchive-3.4.3.ebuild
+2008011239 ./app-arch/libarchive/libarchive-3.4.3.ebuild
 1702282250 ./app-arch/libpar2/libpar2-0.4.ebuild
 2007132139 ./app-arch/lrzip/lrzip-0.631_p20190619.ebuild
 2006081209 ./app-arch/lz4/lz4-1.9.2.ebuild
@@ -977,7 +981,7 @@
 1911031309 ./app-arch/xar/xar-1.8-r3.ebuild
 2004032241 ./app-arch/xar/xar-1.8-r2.ebuild
 2002112050 ./app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
-2006010008 ./app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
+2008011209 ./app-arch/xarchiver/xarchiver-0.5.4.15.ebuild
 2006150539 ./app-arch/xdms/xdms-1.3.2-r1.ebuild
 2003261841 ./app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
 2004211009 ./app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -994,7 +998,7 @@
 2004211009 ./app-arch/zstd/zstd-1.3.7-r1.ebuild
 2005101239 ./app-arch/zstd/zstd-1.4.4-r4.ebuild
 2006202109 ./app-arch/zstd/zstd-1.4.5.ebuild
-2005210239 ./app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
+2007311939 ./app-arch/lxqt-archiver/lxqt-archiver-0.2.0.ebuild
 2002140109 ./app-backup/amanda/amanda-3.3.9.ebuild
 2002140109 ./app-backup/amanda/amanda-3.4.1.ebuild
 2002140109 ./app-backup/amanda/amanda-3.4.2.ebuild
@@ -1013,9 +1017,9 @@
 2003241809 ./app-backup/backupninja/backupninja-1.1.0.ebuild
 1710271648 ./app-backup/backuppc/backuppc-3.3.1-r5.ebuild
 2007201009 ./app-backup/bacula/bacula-9.6.5.ebuild
-2005140739 ./app-backup/bareos/bareos-17.2.9.ebuild
-2005140739 ./app-backup/bareos/bareos-18.2.8.ebuild
-2005140739 ./app-backup/bareos/bareos-19.2.7.ebuild
+2008011739 ./app-backup/bareos/bareos-17.2.10.ebuild
+2008011739 ./app-backup/bareos/bareos-18.2.9.ebuild
+2008011739 ./app-backup/bareos/bareos-19.2.8.ebuild
 2006141739 ./app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
 2006141739 ./app-backup/borgbackup/borgbackup-9999.ebuild
 2006152139 ./app-backup/borgbackup/borgbackup-1.1.13.ebuild
@@ -1387,7 +1391,6 @@
 1912302139 ./app-crypt/pesign/pesign-113.ebuild
 1902101039 ./app-crypt/pgpdump/pgpdump-0.33.ebuild
 2006130239 ./app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
-1809280333 ./app-crypt/pius/pius-2.2.4.ebuild
 2004161009 ./app-crypt/pius/pius-3.0.0.ebuild
 1912110241 ./app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
 1809280333 ./app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild
@@ -1825,6 +1828,174 @@
 2007302209 ./app-dicts/sword-FreStapfer1889/sword-FreStapfer1889-1.0.2.ebuild
 2007302209 ./app-dicts/sword-FreSynodale1921/sword-FreSynodale1921-1.0.3.ebuild
 2007302209 ./app-dicts/sword-Geez/sword-Geez-1.0.1.ebuild
+2007312109 ./app-dicts/sword-GerAlbrecht/sword-GerAlbrecht-1.5.ebuild
+2007312109 ./app-dicts/sword-GerAugustinus/sword-GerAugustinus-1.5.ebuild
+2007312109 ./app-dicts/sword-GerGruenewald/sword-GerGruenewald-1.5.ebuild
+2007312109 ./app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
+2007312109 ./app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
+2007312109 ./app-dicts/sword-GerLeoNA28/sword-GerLeoNA28-1.2.1.ebuild
+2007312109 ./app-dicts/sword-GerLeoRP18/sword-GerLeoRP18-1.2.ebuild
+2007312109 ./app-dicts/sword-GerLutherpredigten/sword-GerLutherpredigten-1.7.ebuild
+2007312109 ./app-dicts/sword-GerNeUe/sword-GerNeUe-2.7.ebuild
+2007312109 ./app-dicts/sword-GerReinhardt/sword-GerReinhardt-1.6.ebuild
+2007312109 ./app-dicts/sword-GerTafel/sword-GerTafel-1.1.ebuild
+2007312109 ./app-dicts/sword-GerTextbibel/sword-GerTextbibel-1.1.ebuild
+2007312109 ./app-dicts/sword-Godbey/sword-Godbey-1.0.ebuild
+2007312109 ./app-dicts/sword-GodsWord/sword-GodsWord-1.3.1.ebuild
+2007312109 ./app-dicts/sword-GreVamvas/sword-GreVamvas-1.0.2.ebuild
+2007312109 ./app-dicts/sword-Haitian/sword-Haitian-1.5.ebuild
+2007312109 ./app-dicts/sword-HebDelitzsch/sword-HebDelitzsch-1.2.ebuild
+2007312109 ./app-dicts/sword-HebModern/sword-HebModern-1.2.ebuild
+2007312109 ./app-dicts/sword-HinERV/sword-HinERV-1.1.ebuild
+2007312109 ./app-dicts/sword-HunUj/sword-HunUj-1.7.3.ebuild
+2007312109 ./app-dicts/sword-Imitation/sword-Imitation-1.7.1.ebuild
+2007312109 ./app-dicts/sword-IriODomhnuill/sword-IriODomhnuill-1.0.ebuild
+2007312109 ./app-dicts/sword-ItDizGreco/sword-ItDizGreco-1.2.ebuild
+2007312109 ./app-dicts/sword-ItNomiBibbia/sword-ItNomiBibbia-1.0.ebuild
+2007312109 ./app-dicts/sword-JCRHoliness/sword-JCRHoliness-1.0.ebuild
+2007312109 ./app-dicts/sword-JEAffections/sword-JEAffections-1.0.ebuild
+2007312109 ./app-dicts/sword-JESermons/sword-JESermons-1.0.ebuild
+2007312109 ./app-dicts/sword-JOChrist/sword-JOChrist-0.5.ebuild
+2007312109 ./app-dicts/sword-JOCommGod/sword-JOCommGod-0.1.ebuild
+2007312109 ./app-dicts/sword-JOGlory/sword-JOGlory-0.5.ebuild
+2007312109 ./app-dicts/sword-JOMortSin/sword-JOMortSin-1.0.ebuild
+2007312109 ./app-dicts/sword-JapBungo/sword-JapBungo-1.0.ebuild
+2007312109 ./app-dicts/sword-JapDenmo/sword-JapDenmo-1.1.1.ebuild
+2007312109 ./app-dicts/sword-JapKougo/sword-JapKougo-1.1.ebuild
+2007312109 ./app-dicts/sword-JapMeiji/sword-JapMeiji-1.0.ebuild
+2007312109 ./app-dicts/sword-JapRaguet/sword-JapRaguet-1.0.ebuild
+2007312109 ./app-dicts/sword-KD/sword-KD-1.0.ebuild
+2007312109 ./app-dicts/sword-KJVPCE/sword-KJVPCE-1.0.ebuild
+2007312109 ./app-dicts/sword-Kapingamarangi/sword-Kapingamarangi-1.0.1.ebuild
+2007312109 ./app-dicts/sword-Kaz/sword-Kaz-1.1.1.ebuild
+2007312109 ./app-dicts/sword-Kekchi/sword-Kekchi-1.5.ebuild
+2007312109 ./app-dicts/sword-KhmerNT/sword-KhmerNT-1.1.ebuild
+2007312109 ./app-dicts/sword-KorHKJV/sword-KorHKJV-1.0.ebuild
+2007312109 ./app-dicts/sword-KorRV/sword-KorRV-2.0.1.ebuild
+2007312109 ./app-dicts/sword-KtuVb/sword-KtuVb-3.1.ebuild
+2007312109 ./app-dicts/sword-LEB/sword-LEB-2.7.ebuild
+2007312109 ./app-dicts/sword-LO/sword-LO-1.1.ebuild
+2007312109 ./app-dicts/sword-LXX/sword-LXX-2.5.ebuild
+2007312109 ./app-dicts/sword-Latvian/sword-Latvian-1.4.ebuild
+2007312109 ./app-dicts/sword-LawGospel/sword-LawGospel-2.1.ebuild
+2007312109 ./app-dicts/sword-Leeser/sword-Leeser-1.2.ebuild
+2007312109 ./app-dicts/sword-LinVB/sword-LinVB-1.0.ebuild
+2007312109 ./app-dicts/sword-LtKBB/sword-LtKBB-1.7.2.ebuild
+2007312109 ./app-dicts/sword-LvGluck8/sword-LvGluck8-1.1.ebuild
+2007312109 ./app-dicts/sword-MLStrong/sword-MLStrong-1.0.1.ebuild
+2007312109 ./app-dicts/sword-Mal1910/sword-Mal1910-1.1.1.ebuild
+2007312109 ./app-dicts/sword-Maori/sword-Maori-1.1.ebuild
+2007312109 ./app-dicts/sword-MapM/sword-MapM-1.0.ebuild
+2007312109 ./app-dicts/sword-Mg1865/sword-Mg1865-1.1.1.ebuild
+2007312109 ./app-dicts/sword-MollColossians/sword-MollColossians-1.0.ebuild
+2007312109 ./app-dicts/sword-MonKJV/sword-MonKJV-1.4.ebuild
+2007312109 ./app-dicts/sword-MorphGNT/sword-MorphGNT-2.0.ebuild
+2007312109 ./app-dicts/sword-NETfree/sword-NETfree-1.0.1.ebuild
+2007312109 ./app-dicts/sword-NETnotesfree/sword-NETnotesfree-1.0.1.ebuild
+2007312109 ./app-dicts/sword-NETtext/sword-NETtext-1.0.0.ebuild
+2007312109 ./app-dicts/sword-NHEB/sword-NHEB-2.1.ebuild
+2007312109 ./app-dicts/sword-NHEBJE/sword-NHEBJE-2.1.ebuild
+2007312109 ./app-dicts/sword-NHEBME/sword-NHEBME-2.1.ebuild
+2007312109 ./app-dicts/sword-Ndebele/sword-Ndebele-1.2.ebuild
+2007312109 ./app-dicts/sword-Nestle1904/sword-Nestle1904-1.3.ebuild
+2007312109 ./app-dicts/sword-NlCanisius1939/sword-NlCanisius1939-1.0.ebuild
+2007312109 ./app-dicts/sword-NorBroed/sword-NorBroed-1.0.1.ebuild
+2007312109 ./app-dicts/sword-NorSMB/sword-NorSMB-1.0.ebuild
+2007312109 ./app-dicts/sword-NorthernAzeri/sword-NorthernAzeri-1.0.1.ebuild
+2007312109 ./app-dicts/sword-Noyes/sword-Noyes-1.2.ebuild
+2007312109 ./app-dicts/sword-OEB/sword-OEB-1.1.ebuild
+2007312109 ./app-dicts/sword-OEBcth/sword-OEBcth-1.1.ebuild
+2007312109 ./app-dicts/sword-OSHB/sword-OSHB-1.4.ebuild
+2007312109 ./app-dicts/sword-OSHM/sword-OSHM-1.4.ebuild
+2007312109 ./app-dicts/sword-OrthJBC/sword-OrthJBC-1.1.ebuild
+2007312109 ./app-dicts/sword-OxfordTR/sword-OxfordTR-1.0.ebuild
+2007312109 ./app-dicts/sword-Passion/sword-Passion-1.0.ebuild
+2007312109 ./app-dicts/sword-Phaistos/sword-Phaistos-1.0.ebuild
+2007312109 ./app-dicts/sword-PohnOld/sword-PohnOld-1.01.ebuild
+2007312109 ./app-dicts/sword-Pohnpeian/sword-Pohnpeian-1.1.1.ebuild
+2007312109 ./app-dicts/sword-PolGdanska/sword-PolGdanska-1.0.ebuild
+2007312109 ./app-dicts/sword-PolUGdanska/sword-PolUGdanska-2.1.1.ebuild
+2007312109 ./app-dicts/sword-PorAR/sword-PorAR-1.3.ebuild
+2007312109 ./app-dicts/sword-PorAlmeida1911/sword-PorAlmeida1911-0.2.ebuild
+2007312109 ./app-dicts/sword-PorBLivre/sword-PorBLivre-1.0.1.ebuild
+2007312109 ./app-dicts/sword-PorBLivreTR/sword-PorBLivreTR-1.0.1.ebuild
+2007312109 ./app-dicts/sword-PorCap/sword-PorCap-2.0.1.ebuild
+2007312109 ./app-dicts/sword-PorIBP/sword-PorIBP-1.0.ebuild
+2007312109 ./app-dicts/sword-PotLykins/sword-PotLykins-1.0.ebuild
+2007312109 ./app-dicts/sword-QuotingPassages/sword-QuotingPassages-1.2.ebuild
+2007312109 ./app-dicts/sword-RecVer/sword-RecVer-1.0.ebuild
+2007312109 ./app-dicts/sword-Rieger/sword-Rieger-1.0.ebuild
+2007312109 ./app-dicts/sword-RomCor/sword-RomCor-2.1.ebuild
+2007312109 ./app-dicts/sword-RusCARS/sword-RusCARS-4.1.1.ebuild
+2007312109 ./app-dicts/sword-RusCARSA/sword-RusCARSA-4.1.ebuild
+2007312109 ./app-dicts/sword-RusCARSADICT/sword-RusCARSADICT-4.1.ebuild
+2007312109 ./app-dicts/sword-RusCARSDict/sword-RusCARSDict-4.0.ebuild
+2007312109 ./app-dicts/sword-RusCARST/sword-RusCARST-4.1.ebuild
+2007312109 ./app-dicts/sword-RusCARSTDICT/sword-RusCARSTDICT-4.1.ebuild
+2007312109 ./app-dicts/sword-RusSynodalLIO/sword-RusSynodalLIO-1.0.2.ebuild
+2007312109 ./app-dicts/sword-RusVZh/sword-RusVZh-1.0.ebuild
+2007312109 ./app-dicts/sword-SBLGNT/sword-SBLGNT-1.3.1.ebuild
+2007312109 ./app-dicts/sword-SBLGNTApp/sword-SBLGNTApp-1.3.ebuild
+2007312109 ./app-dicts/sword-SP/sword-SP-1.0.ebuild
+2007312109 ./app-dicts/sword-SPDSS/sword-SPDSS-1.0.ebuild
+2007312109 ./app-dicts/sword-SPE/sword-SPE-1.0.ebuild
+2007312109 ./app-dicts/sword-SPMT/sword-SPMT-1.0.ebuild
+2007312109 ./app-dicts/sword-SPVar/sword-SPVar-1.0.ebuild
+2007312109 ./app-dicts/sword-SahidicBible/sword-SahidicBible-1.1.1.ebuild
+2007312109 ./app-dicts/sword-Sentiment/sword-Sentiment-1.0.ebuild
+2007312109 ./app-dicts/sword-Shona/sword-Shona-2.1.ebuild
+2007312109 ./app-dicts/sword-SloKJV/sword-SloKJV-11.0.ebuild
+2007312109 ./app-dicts/sword-SloKJVA/sword-SloKJVA-0.3.41.ebuild
+2007312109 ./app-dicts/sword-SloOjacano/sword-SloOjacano-1.0.ebuild
+2007312109 ./app-dicts/sword-SloStritar/sword-SloStritar-1.1.ebuild
+2007312109 ./app-dicts/sword-SomKQA/sword-SomKQA-2.0.ebuild
+2007312109 ./app-dicts/sword-Sorani/sword-Sorani-2.0.1.ebuild
+2007312109 ./app-dicts/sword-SpaRV1865/sword-SpaRV1865-1.1.ebuild
+2007312109 ./app-dicts/sword-SpaRV1909/sword-SpaRV1909-1.0.1.ebuild
+2007312109 ./app-dicts/sword-SpaTDP/sword-SpaTDP-1.0.ebuild
+2007312109 ./app-dicts/sword-SrKDEkavski/sword-SrKDEkavski-1.0.ebuild
+2007312109 ./app-dicts/sword-SrKDIjekav/sword-SrKDIjekav-1.0.ebuild
+2007312109 ./app-dicts/sword-Swe1917/sword-Swe1917-2.0.ebuild
+2007312109 ./app-dicts/sword-Swe1917Of/sword-Swe1917Of-1.1.ebuild
+2007312109 ./app-dicts/sword-SweFolk1998/sword-SweFolk1998-1.2.ebuild
+2007312109 ./app-dicts/sword-SweKarlXII/sword-SweKarlXII-1.0.ebuild
+2007312109 ./app-dicts/sword-SweKarlXII1873/sword-SweKarlXII1873-1.0.ebuild
+2007312109 ./app-dicts/sword-TNT/sword-TNT-2.0.ebuild
+2007312109 ./app-dicts/sword-TagAngBiblia/sword-TagAngBiblia-1.2.ebuild
+2007312109 ./app-dicts/sword-Tausug/sword-Tausug-1.1.ebuild
+2007312109 ./app-dicts/sword-ThaiKJV/sword-ThaiKJV-2.0.ebuild
+2007312109 ./app-dicts/sword-TurHADI/sword-TurHADI-1.1.1.ebuild
+2007312109 ./app-dicts/sword-TurNTB/sword-TurNTB-2.1.1.ebuild
+2007312109 ./app-dicts/sword-UkrKulish/sword-UkrKulish-1.1.ebuild
+2007312109 ./app-dicts/sword-UrduGeo/sword-UrduGeo-1.6.ebuild
+2007312109 ./app-dicts/sword-UrduGeoDeva/sword-UrduGeoDeva-1.7.ebuild
+2007312109 ./app-dicts/sword-UrduGeoRoman/sword-UrduGeoRoman-1.1.ebuild
+2007312109 ./app-dicts/sword-UyCyr/sword-UyCyr-1.1.ebuild
+2007312109 ./app-dicts/sword-VarApp/sword-VarApp-1.0.ebuild
+2007312109 ./app-dicts/sword-Viet/sword-Viet-1.4.1.ebuild
+2007312109 ./app-dicts/sword-VietLCCMN/sword-VietLCCMN-1.0.ebuild
+2007312109 ./app-dicts/sword-VietLCCMNCT/sword-VietLCCMNCT-1.0.ebuild
+2007312109 ./app-dicts/sword-VietNVB/sword-VietNVB-1.4.ebuild
+2007312109 ./app-dicts/sword-VulgClementine/sword-VulgClementine-2.0.1.ebuild
+2007312109 ./app-dicts/sword-VulgConte/sword-VulgConte-1.0.2.ebuild
+2007312109 ./app-dicts/sword-VulgGlossa/sword-VulgGlossa-1.0.1.ebuild
+2007312109 ./app-dicts/sword-VulgHetzenauer/sword-VulgHetzenauer-1.0.2.ebuild
+2007312109 ./app-dicts/sword-VulgSistine/sword-VulgSistine-1.0.2.ebuild
+2007312109 ./app-dicts/sword-Webster1806/sword-Webster1806-1.0.ebuild
+2007312109 ./app-dicts/sword-WelBeiblNet/sword-WelBeiblNet-2.5.1.ebuild
+2007312109 ./app-dicts/sword-Westminster/sword-Westminster-1.0.1.ebuild
+2007312109 ./app-dicts/sword-Westminster21/sword-Westminster21-1.0.ebuild
+2007312109 ./app-dicts/sword-Worsley/sword-Worsley-1.6.ebuild
+2007312109 ./app-dicts/sword-ZhEnglish/sword-ZhEnglish-1.0.1.ebuild
+2007312109 ./app-dicts/sword-ZhHanzi/sword-ZhHanzi-1.0.ebuild
+2007312109 ./app-dicts/sword-ZhPinyin/sword-ZhPinyin-1.0.ebuild
+2007312109 ./app-dicts/sword-alzat/sword-alzat-1.0.ebuild
+2007312109 ./app-dicts/sword-br_en/sword-br_en-1.1.ebuild
+2007312109 ./app-dicts/sword-en_eu/sword-en_eu-1.1.ebuild
+2007312109 ./app-dicts/sword-f35/sword-f35-1.0.1.ebuild
+2007312109 ./app-dicts/sword-la_en/sword-la_en-1.1.ebuild
+2007312109 ./app-dicts/sword-sml_BL_2008/sword-sml_BL_2008-1.0.1.ebuild
+2007312109 ./app-dicts/sword-vlsJoNT/sword-vlsJoNT-1.0.1.ebuild
 2004032241 ./app-doc/NaturalDocs/NaturalDocs-1.52-r1.ebuild
 2002112051 ./app-doc/abs-guide/abs-guide-10.ebuild
 2004211009 ./app-doc/autobook/autobook-1.5.ebuild
@@ -1989,11 +2160,9 @@
 2005021239 ./app-editors/emacs/emacs-24.5-r7.ebuild
 2005021239 ./app-editors/emacs/emacs-25.3-r6.ebuild
 2005021239 ./app-editors/emacs/emacs-26.3-r1.ebuild
-2005021239 ./app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
-2005021239 ./app-editors/emacs/emacs-27.0.90.ebuild
 2005021239 ./app-editors/emacs/emacs-27.0.9999-r1.ebuild
 2005021239 ./app-editors/emacs/emacs-28.0.9999.ebuild
-2005121209 ./app-editors/emacs/emacs-27.0.91.ebuild
+2008012139 ./app-editors/emacs/emacs-27.1_rc1.ebuild
 1807202209 ./app-editors/emact/emact-2.58.0.ebuild
 1910022239 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
 2005101338 ./app-editors/fe/fe-2.0.ebuild
@@ -2047,9 +2216,9 @@
 1808152309 ./app-editors/moe/moe-1.9.ebuild
 2007161739 ./app-editors/mousepad/mousepad-0.4.2.ebuild
 2004032241 ./app-editors/nano/nano-4.6-r1.ebuild
-2007311209 ./app-editors/nano/nano-4.9.3.ebuild
 2007311209 ./app-editors/nano/nano-5.0.ebuild
 2007311209 ./app-editors/nano/nano-9999.ebuild
+2008021509 ./app-editors/nano/nano-4.9.3.ebuild
 1908281339 ./app-editors/ne/ne-3.1.1.ebuild
 2007231839 ./app-editors/ne/ne-3.3.0.ebuild
 1910111840 ./app-editors/nedit/nedit-5.6-r2.ebuild
@@ -2061,6 +2230,7 @@
 2007090308 ./app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
 2007090308 ./app-editors/notepadqq/notepadqq-9999.ebuild
 2002262139 ./app-editors/okteta/okteta-0.26.3.ebuild
+2008020209 ./app-editors/okteta/okteta-0.26.4.ebuild
 1709280402 ./app-editors/padre/padre-1.0.0-r1.ebuild
 2005081846 ./app-editors/pluma/pluma-1.22.2.ebuild
 2005071639 ./app-editors/pluma/pluma-1.24.0.ebuild
@@ -2159,6 +2329,7 @@
 1912080739 ./app-emacs/dash/dash-2.16.0.ebuild
 2004130909 ./app-emacs/dash/dash-2.17.0.ebuild
 2005020839 ./app-emacs/ddskk/ddskk-16.2.ebuild
+2008011609 ./app-emacs/ddskk/ddskk-16.3.ebuild
 1910182339 ./app-emacs/desktop+/desktop+-0.2-r2.ebuild
 1911181739 ./app-emacs/develock/develock-0.47.ebuild
 1908261839 ./app-emacs/df-mode/df-mode-20050509-r1.ebuild
@@ -2375,9 +2546,9 @@
 1804270438 ./app-emulation/bochs/bochs-2.6.9.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
 2002241439 ./app-emulation/bochs/bochs-9999.ebuild
-2004020339 ./app-emulation/buildah/buildah-1.14.5.ebuild
-2004031939 ./app-emulation/buildah/buildah-1.14.6.ebuild
 2004162339 ./app-emulation/buildah/buildah-1.14.8.ebuild
+2008012339 ./app-emulation/buildah/buildah-1.14.10.ebuild
+2008020039 ./app-emulation/buildah/buildah-1.15.1.ebuild
 2003301839 ./app-emulation/cadvisor/cadvisor-0.36.0.ebuild
 2002251809 ./app-emulation/cloud-init/cloud-init-19.4.ebuild
 2004192109 ./app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -2456,6 +2627,7 @@
 1909190539 ./app-emulation/docker-registry/docker-registry-2.7.1.ebuild
 2005110338 ./app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild
 2007252138 ./app-emulation/docker/docker-19.03.8.ebuild
+2008012239 ./app-emulation/docker/docker-19.03.12.ebuild
 2006241009 ./app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
 1810031339 ./app-emulation/dynamips/dynamips-0.2.18.ebuild
 1912111439 ./app-emulation/dynamips/dynamips-0.2.21.ebuild
@@ -2513,6 +2685,7 @@
 2006290009 ./app-emulation/libpod/libpod-2.0.1.ebuild
 2007160409 ./app-emulation/libpod/libpod-2.0.2.ebuild
 2007232139 ./app-emulation/libpod/libpod-2.0.3.ebuild
+2008010039 ./app-emulation/libpod/libpod-2.0.4.ebuild
 2006071539 ./app-emulation/libspectrum/libspectrum-1.4.4.ebuild
 1902160209 ./app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
 1912290139 ./app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
@@ -2745,9 +2918,7 @@
 1910071309 ./app-eselect/eselect-unison/eselect-unison-0.4.ebuild
 1912200109 ./app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
 1912200109 ./app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild
-2003261841 ./app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
-2004032241 ./app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
-2007300309 ./app-eselect/eselect-vi/eselect-vi-1.2.ebuild
+2007312109 ./app-eselect/eselect-vi/eselect-vi-1.2.ebuild
 2002112051 ./app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
 2004032241 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
 2004032241 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -2834,7 +3005,7 @@
 2004032241 ./app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
 2005141809 ./app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild
 2005141809 ./app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild
-2001051415 ./app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
+2008011609 ./app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
 1708161838 ./app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
 1708161838 ./app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
 1708161732 ./app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -2859,8 +3030,8 @@
 1712121639 ./app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild
 2002091942 ./app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
 2002091942 ./app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
-2005161709 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.3.ebuild
 2005271609 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
+2008011609 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.4.ebuild
 1708121738 ./app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
 2004032241 ./app-i18n/ibus/ibus-1.5.21-r1.ebuild
 2006090739 ./app-i18n/ibus/ibus-1.5.22.ebuild
@@ -2881,7 +3052,7 @@
 2007041709 ./app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
 1712251809 ./app-i18n/kde-l10n-scripts/kde-l10n-scripts-9999.ebuild
 1711100142 ./app-i18n/kinput2/kinput2-3.1-r2.ebuild
-1809041539 ./app-i18n/libcangjie/libcangjie-1.3.ebuild
+2008011539 ./app-i18n/libcangjie/libcangjie-1.3.ebuild
 2001172239 ./app-i18n/libchewing/libchewing-0.5.1.ebuild
 2001172239 ./app-i18n/libchewing/libchewing-9999.ebuild
 1912110241 ./app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -2965,8 +3136,7 @@
 1912111539 ./app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
 1808091709 ./app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
 1910191409 ./app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
-1904272339 ./app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
-1910031609 ./app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
+2008011639 ./app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
 2007041709 ./app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
 2007041709 ./app-i18n/zinnia/zinnia-0.06-r3.ebuild
 2004211009 ./app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
@@ -3241,7 +3411,6 @@
 1704261742 ./app-misc/empty/empty-0.6.20b.ebuild
 2002222009 ./app-misc/enum/enum-1.1-r1.ebuild
 1702282250 ./app-misc/esekeyd/esekeyd-1.2.7.ebuild
-1709010954 ./app-misc/evemu/evemu-2.6.0.ebuild
 2005071639 ./app-misc/evemu/evemu-2.7.0.ebuild
 2003261841 ./app-misc/evtest/evtest-1.33.ebuild
 2007241009 ./app-misc/evtest/evtest-1.34.ebuild
@@ -3291,7 +3460,7 @@
 2007201609 ./app-misc/gnutu/gnutu-2.9.ebuild
 2005120239 ./app-misc/go-jira/go-jira-1.0.23.ebuild
 2006271209 ./app-misc/golly/golly-3.3-r1.ebuild
-2007040139 ./app-misc/golly/golly-3.3-r3.ebuild
+2008021509 ./app-misc/golly/golly-3.3-r3.ebuild
 2003090909 ./app-misc/goobook/goobook-3.4-r1.ebuild
 1807081439 ./app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
 1807081439 ./app-misc/grabcartoons/grabcartoons-9999.ebuild
@@ -3412,7 +3581,7 @@
 1912111539 ./app-misc/oneko/oneko-1.2-r2.ebuild
 2006271008 ./app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
 1711031506 ./app-misc/pal/pal-0.4.3-r2.ebuild
-2005302309 ./app-misc/pax-utils/pax-utils-1.2.6.ebuild
+2008011709 ./app-misc/pax-utils/pax-utils-1.2.6.ebuild
 2002230040 ./app-misc/pdfpc/pdfpc-4.3.0.ebuild
 2004261709 ./app-misc/pdfpc/pdfpc-4.4.0.ebuild
 1702282250 ./app-misc/perltrash/perltrash-0.3-r1.ebuild
@@ -3517,7 +3686,7 @@
 2004241409 ./app-misc/tmux/tmux-3.0a.ebuild
 2004241409 ./app-misc/tmux/tmux-9999.ebuild
 2005121639 ./app-misc/tmux/tmux-2.9a.ebuild
-2007310439 ./app-misc/tmux/tmux-3.1b.ebuild
+2008011239 ./app-misc/tmux/tmux-3.1b.ebuild
 2004242009 ./app-misc/tmux2html/tmux2html-0.1.11.ebuild
 2004281909 ./app-misc/tmuxp/tmuxp-1.5.4.ebuild
 2007310709 ./app-misc/tmuxp/tmuxp-1.5.5.ebuild
@@ -3644,7 +3813,7 @@
 2006171909 ./app-office/libreoffice/libreoffice-9999.ebuild
 2007021509 ./app-office/libreoffice/libreoffice-6.4.5.2.ebuild
 2003210109 ./app-office/lyx/lyx-2.3.3.ebuild
-2007291138 ./app-office/lyx/lyx-2.3.5.2.ebuild
+2008021509 ./app-office/lyx/lyx-2.3.5.2.ebuild
 1912210209 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
 2004032241 ./app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
 1905201509 ./app-office/moneydance/moneydance-2017.10.ebuild
@@ -3714,8 +3883,6 @@
 1904080809 ./app-portage/cfg-update/cfg-update-1.8.9.ebuild
 1702282250 ./app-portage/conf-update/conf-update-1.0.3-r1.ebuild
 1907192139 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
-2001051415 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
-2004230939 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
 2006082139 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
 2007132039 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
 2002230040 ./app-portage/deltup/deltup-0.4.6-r1.ebuild
@@ -3727,14 +3894,13 @@
 2005090009 ./app-portage/eix/eix-0.33.11.ebuild
 2005211038 ./app-portage/eix/eix-0.34.1.ebuild
 2005211439 ./app-portage/eix/eix-0.34.2.ebuild
-2007302309 ./app-portage/eix/eix-0.34.4.ebuild
+2008021509 ./app-portage/eix/eix-0.34.4.ebuild
 2002111509 ./app-portage/elicense/elicense-9999.ebuild
 2004032241 ./app-portage/elicense/elicense-1.0.2.ebuild
 2007060339 ./app-portage/elogv/elogv-0.7.8-r1.ebuild
 2007060339 ./app-portage/elogv/elogv-0.7.8-r2.ebuild
 2007060339 ./app-portage/elogv/elogv-0.7.8-r3.ebuild
-2002101509 ./app-portage/elogviewer/elogviewer-2.9-r1.ebuild
-2005121009 ./app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+2008020239 ./app-portage/elogviewer/elogviewer-3.0-r2.ebuild
 2003261841 ./app-portage/elt-patches/elt-patches-20170826.1.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170317.ebuild
 2004211009 ./app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -3788,6 +3954,7 @@
 2002101509 ./app-portage/gverify/gverify-2.ebuild
 1905181309 ./app-portage/hackport/hackport-9999.ebuild
 2001260341 ./app-portage/hackport/hackport-0.6.3.ebuild
+2008011139 ./app-portage/hackport/hackport-0.6.6.ebuild
 1910302309 ./app-portage/java-ebuilder/java-ebuilder-9999.ebuild
 1911271309 ./app-portage/java-ebuilder/java-ebuilder-0.4.1.ebuild
 1912081509 ./app-portage/kuroo/kuroo-9999.ebuild
@@ -3876,7 +4043,7 @@
 2004140209 ./app-shells/fish/fish-3.1.0.ebuild
 2006131009 ./app-shells/fish/fish-3.1.2.ebuild
 2006190139 ./app-shells/fish/fish-9999.ebuild
-2007120609 ./app-shells/fish/fish-3.0.2.ebuild
+2008012239 ./app-shells/fish/fish-3.0.2.ebuild
 2004250539 ./app-shells/fzy/fzy-9999.ebuild
 2007110839 ./app-shells/fzy/fzy-1.0-r1.ebuild
 2004032241 ./app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -3906,7 +4073,7 @@
 2005120109 ./app-shells/peco/peco-0.5.7.ebuild
 1903190509 ./app-shells/posh/posh-0.13.2.ebuild
 2005181039 ./app-shells/posh/posh-0.14.ebuild
-2005191038 ./app-shells/posh/posh-0.14.1.ebuild
+2008011209 ./app-shells/posh/posh-0.14.1.ebuild
 2002142009 ./app-shells/powerline/powerline-9999.ebuild
 2006012308 ./app-shells/powerline/powerline-2.7-r1.ebuild
 1702282250 ./app-shells/psh/psh-1.8.1-r3.ebuild
@@ -4133,7 +4300,7 @@
 2007191339 ./app-text/jo/jo-1.4.ebuild
 2007191339 ./app-text/jo/jo-99999.ebuild
 2006040938 ./app-text/kbibtex/kbibtex-0.9.2.ebuild
-1904290309 ./app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+2008020209 ./app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
 2004240139 ./app-text/kjots/kjots-5.0.2-r1.ebuild
 2004251639 ./app-text/krop/krop-0.5.1-r1.ebuild
 2004251639 ./app-text/krop/krop-9999.ebuild
@@ -4215,6 +4382,7 @@
 2005172009 ./app-text/pandoc/pandoc-1.18.ebuild
 2005172009 ./app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
 2005172009 ./app-text/pandoc/pandoc-1.19.2.1.ebuild
+2008011139 ./app-text/pandoc/pandoc-2.9.2.1.ebuild
 2004191539 ./app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
 2004191539 ./app-text/paperwork/paperwork-1.3.1.ebuild
 1702282250 ./app-text/paps/paps-0.6.8-r2.ebuild
@@ -4253,10 +4421,10 @@
 2001271439 ./app-text/pinfo/pinfo-0.6.13.ebuild
 2001271439 ./app-text/pinfo/pinfo-99999.ebuild
 2004032241 ./app-text/pinfo/pinfo-0.6.10-r5.ebuild
-2007231609 ./app-text/po4a/po4a-0.47-r1.ebuild
 2007231609 ./app-text/po4a/po4a-0.57.ebuild
 2007231609 ./app-text/po4a/po4a-0.59.1.ebuild
-2007180339 ./app-text/podofo/podofo-0.9.6_p20190928.ebuild
+2008011609 ./app-text/po4a/po4a-0.60.ebuild
+2008011109 ./app-text/podofo/podofo-0.9.6_p20190928.ebuild
 2004032241 ./app-text/poppler-data/poppler-data-0.4.9.ebuild
 2005281209 ./app-text/poppler/poppler-0.89.0.ebuild
 2005311939 ./app-text/poppler/poppler-0.88.0-r1.ebuild
@@ -4272,7 +4440,7 @@
 2004032241 ./app-text/psutils/psutils-1.17-r3.ebuild
 2003071409 ./app-text/pytextile/pytextile-3.0.3.ebuild
 2007151139 ./app-text/pytextile/pytextile-4.0.1.ebuild
-2006250038 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
+2008021509 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
 2002070039 ./app-text/qpdf/qpdf-9.1.1-r1.ebuild
 2004032241 ./app-text/qpdf/qpdf-9.0.2.ebuild
 2006152309 ./app-text/qpdf/qpdf-10.0.1-r1.ebuild
@@ -4309,7 +4477,7 @@
 2002112051 ./app-text/spellutils/spellutils-0.7.ebuild
 2002022239 ./app-text/stardict/stardict-3.0.6-r3.ebuild
 2002022239 ./app-text/stardict/stardict-4.0.0_pre20170304.ebuild
-2007291739 ./app-text/sword-modules/sword-modules-1-r3.ebuild
+2007312239 ./app-text/sword-modules/sword-modules-2.ebuild
 2007251709 ./app-text/sword/sword-1.8.1-r1.ebuild
 2004032241 ./app-text/t1utils/t1utils-1.41-r2.ebuild
 2005171539 ./app-text/tabler/tabler-2-r1.ebuild
@@ -4325,6 +4493,7 @@
 2005011709 ./app-text/tesseract/tesseract-4.1.1.ebuild
 2004032241 ./app-text/texi2html/texi2html-5.0-r1.ebuild
 2007231609 ./app-text/texlive-core/texlive-core-2020-r5.ebuild
+2008021709 ./app-text/texlive-core/texlive-core-2020-r6.ebuild
 2007242309 ./app-text/texlive/texlive-2020-r6.ebuild
 2004032241 ./app-text/tidy-html5/tidy-html5-5.6.0.ebuild
 2004032241 ./app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -4387,8 +4556,7 @@
 2002111509 ./app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
 2001220109 ./app-text/xml2/xml2-0.5.ebuild
 2004032241 ./app-text/xml2doc/xml2doc-20030510-r1.ebuild
-2004032241 ./app-text/xmldiff/xmldiff-1.1.1.ebuild
-2007300309 ./app-text/xmldiff/xmldiff-2.3.ebuild
+2008011239 ./app-text/xmldiff/xmldiff-2.3.ebuild
 2004280809 ./app-text/xmlformat/xmlformat-1.04.ebuild
 2003261841 ./app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
 2007242309 ./app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -4997,10 +5165,10 @@
 1911032339 ./dev-ada/asis/asis-2016-r1.ebuild
 1911032339 ./dev-ada/asis/asis-2019-r1.ebuild
 1910182009 ./dev-ada/aunit/aunit-2019-r1.ebuild
-2005212139 ./dev-ada/aunit/aunit-2020.ebuild
+2008020009 ./dev-ada/aunit/aunit-2020.ebuild
 1910211009 ./dev-ada/aws/aws-2018-r2.ebuild
 1910211009 ./dev-ada/aws/aws-2019-r1.ebuild
-2005222209 ./dev-ada/aws/aws-2020.ebuild
+2008020009 ./dev-ada/aws/aws-2020.ebuild
 2002230040 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild
 2002230040 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild
 2002230040 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild
@@ -5010,15 +5178,15 @@
 1910182009 ./dev-ada/gnat_util/gnat_util-2018-r2.ebuild
 1910182009 ./dev-ada/gnat_util/gnat_util-2019-r1.ebuild
 1910211009 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019-r1.ebuild
-2006251009 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
+2008020009 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
 2006121109 ./dev-ada/gnatcoll-core/gnatcoll-core-2019-r1.ebuild
-2006151309 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+2008020009 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
 2002230040 ./dev-ada/gnatcoll-db/gnatcoll-db-2019.ebuild
 1910182039 ./dev-ada/gnatmem/gnatmem-2019-r1.ebuild
 1910182039 ./dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
 1910180939 ./dev-ada/gprbuild/gprbuild-2017-r2.ebuild
 1910180939 ./dev-ada/gprbuild/gprbuild-2019-r1.ebuild
-2006120009 ./dev-ada/gprbuild/gprbuild-2020.ebuild
+2008012339 ./dev-ada/gprbuild/gprbuild-2020.ebuild
 2003190109 ./dev-ada/gps/gps-2019-r1.ebuild
 1910200009 ./dev-ada/gtkada/gtkada-2017-r1.ebuild
 1910200009 ./dev-ada/gtkada/gtkada-2018-r2.ebuild
@@ -5030,9 +5198,9 @@
 2003262309 ./dev-ada/libadalang/libadalang-2018-r2.ebuild
 2003262309 ./dev-ada/libadalang/libadalang-2019-r1.ebuild
 1912052139 ./dev-ada/libgpr/libgpr-2019-r1.ebuild
-2006172239 ./dev-ada/libgpr/libgpr-2020.ebuild
+2008020009 ./dev-ada/libgpr/libgpr-2020.ebuild
 2002230040 ./dev-ada/xmlada/xmlada-2019-r1.ebuild
-2006172039 ./dev-ada/xmlada/xmlada-2020.ebuild
+2008012339 ./dev-ada/xmlada/xmlada-2020.ebuild
 1902092309 ./dev-cpp/ETL/ETL-0.04.15-r1.ebuild
 1810072009 ./dev-cpp/aixlog/aixlog-1.2.1.ebuild
 1810072009 ./dev-cpp/aixlog/aixlog-9999.ebuild
@@ -5362,7 +5530,7 @@
 2005311309 ./dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.11.ebuild
 2006232038 ./dev-db/redis/redis-5.0.8.ebuild
 2007261939 ./dev-db/redis/redis-6.0.6.ebuild
-2007290738 ./dev-db/redis/redis-5.0.9-r1.ebuild
+2008011209 ./dev-db/redis/redis-5.0.9-r1.ebuild
 1702282250 ./dev-db/repmgr/repmgr-3.0.1.ebuild
 1707041643 ./dev-db/repmgr/repmgr-3.3.2.ebuild
 2007181009 ./dev-db/repmgr/repmgr-5.1.0.ebuild
@@ -5707,7 +5875,9 @@
 2006062109 ./dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
 2004132310 ./dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
 2004132310 ./dev-haskell/adjunctions/adjunctions-4.3.ebuild
+2008011139 ./dev-haskell/adjunctions/adjunctions-4.4.ebuild
 1911101840 ./dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
+2008011139 ./dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
 1911101840 ./dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
 1912151439 ./dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
 2004132310 ./dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
@@ -5720,10 +5890,12 @@
 2004132310 ./dev-haskell/aeson/aeson-0.7.0.6.ebuild
 2004132310 ./dev-haskell/aeson/aeson-0.9.0.1.ebuild
 2004132310 ./dev-haskell/aeson/aeson-1.0.2.1.ebuild
+2008011139 ./dev-haskell/aeson/aeson-1.4.7.1.ebuild
 2005172009 ./dev-haskell/alex/alex-3.1.3.ebuild
 2005172009 ./dev-haskell/alex/alex-3.1.7.ebuild
 2005172009 ./dev-haskell/alex/alex-3.2.1.ebuild
 2005172009 ./dev-haskell/alex/alex-3.2.4.ebuild
+2008011139 ./dev-haskell/alex/alex-3.2.5.ebuild
 2005172009 ./dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
 1911101840 ./dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
 2004132310 ./dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
@@ -5734,6 +5906,7 @@
 1911101840 ./dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
 2004132310 ./dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
 2004132209 ./dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
+2008011139 ./dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
 1912151439 ./dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
 2004132310 ./dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
 2004132310 ./dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
@@ -5764,6 +5937,7 @@
 2004080039 ./dev-haskell/async/async-2.0.2.ebuild
 2004080039 ./dev-haskell/async/async-2.1.1.ebuild
 2004132310 ./dev-haskell/async/async-2.0.1.4.ebuild
+2008011139 ./dev-haskell/async/async-2.2.2.ebuild
 1911101840 ./dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild
 1911101840 ./dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild
 1911101840 ./dev-haskell/atomic-primops/atomic-primops-0.7.ebuild
@@ -5782,6 +5956,7 @@
 1911101840 ./dev-haskell/authenticate/authenticate-1.3.2.11.ebuild
 1911101840 ./dev-haskell/authenticate/authenticate-1.3.3.1.ebuild
 1911101840 ./dev-haskell/authenticate/authenticate-1.3.3.2.ebuild
+2008011139 ./dev-haskell/authenticate/authenticate-1.3.5.ebuild
 1911101840 ./dev-haskell/auto-update/auto-update-0.1.3.ebuild
 1911101840 ./dev-haskell/auto-update/auto-update-0.1.4.ebuild
 1912151439 ./dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -5789,28 +5964,35 @@
 1911101840 ./dev-haskell/aws/aws-0.11.3-r1.ebuild
 1911101840 ./dev-haskell/aws/aws-0.12.1.ebuild
 1911101840 ./dev-haskell/aws/aws-0.14.1.ebuild
+2008011139 ./dev-haskell/aws/aws-0.22-r1.ebuild
 2006072109 ./dev-haskell/base-compat/base-compat-0.2.1.ebuild
 2006072109 ./dev-haskell/base-compat/base-compat-0.4.2.ebuild
 2006072109 ./dev-haskell/base-compat/base-compat-0.5.0.ebuild
 2006072109 ./dev-haskell/base-compat/base-compat-0.8.2.ebuild
 2006072109 ./dev-haskell/base-compat/base-compat-0.9.1.ebuild
+2008011139 ./dev-haskell/base-compat/base-compat-0.11.1.ebuild
 2004132310 ./dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
 2004132310 ./dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
+2008011139 ./dev-haskell/base-orphans/base-orphans-0.8.2.ebuild
 1911101840 ./dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
+2008011139 ./dev-haskell/base-prelude/base-prelude-1.3.ebuild
 2006072109 ./dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
 2006072109 ./dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
 2004132310 ./dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
 1912151439 ./dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
 2004132310 ./dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
+2008011139 ./dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
 1911101840 ./dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild
 1911101840 ./dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild
 2006072109 ./dev-haskell/bencode/bencode-0.5-r1.ebuild
 2006072109 ./dev-haskell/bencode/bencode-0.6.0.0.ebuild
+2008011139 ./dev-haskell/bencode/bencode-0.6.1.1.ebuild
 1911101840 ./dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
 1911101840 ./dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
 2004132310 ./dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
 2004132310 ./dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
 2004132310 ./dev-haskell/bifunctors/bifunctors-5.ebuild
+2008011139 ./dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
 1911101840 ./dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
 1911101840 ./dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
 1911101840 ./dev-haskell/binary/binary-0.7.5.0.ebuild
@@ -5819,6 +6001,7 @@
 2004132310 ./dev-haskell/binary/binary-0.7.1.0.ebuild
 2004132209 ./dev-haskell/binary/binary-0.7.2.3.ebuild
 2004132310 ./dev-haskell/binary/binary-0.7.6.1.ebuild
+2008011139 ./dev-haskell/binary/binary-0.8.7.0.ebuild
 1912110241 ./dev-haskell/bio/bio-0.5.3-r2.ebuild
 2006072109 ./dev-haskell/biocore/biocore-0.3.1.ebuild
 1911101840 ./dev-haskell/biofasta/biofasta-0.0.3.ebuild
@@ -5834,15 +6017,18 @@
 1911101840 ./dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild
 2004132310 ./dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
 2004132310 ./dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+2008011139 ./dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
 1911101840 ./dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild
 1911101840 ./dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild
 2004132310 ./dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
 2004132310 ./dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
 2004132310 ./dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
+2008011139 ./dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
 1911101840 ./dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild
 2004132310 ./dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
 2004132310 ./dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
 2004132310 ./dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
+2008011139 ./dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
 1911101840 ./dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
 1911101840 ./dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
 2006072109 ./dev-haskell/boolean/boolean-0.2.3.ebuild
@@ -5870,6 +6056,7 @@
 2004132310 ./dev-haskell/c2hs/c2hs-0.16.4.ebuild
 2004132310 ./dev-haskell/c2hs/c2hs-0.16.5.ebuild
 2004132310 ./dev-haskell/c2hs/c2hs-0.27.1.ebuild
+2008011139 ./dev-haskell/c2hs/c2hs-0.28.6.ebuild
 1912151339 ./dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
 2004132310 ./dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
 2006072109 ./dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
@@ -5879,6 +6066,7 @@
 2005172009 ./dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
 2005172009 ./dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
 2005172009 ./dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
+2008011139 ./dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
 2005172009 ./dev-haskell/cabal/cabal-1.18.1.2.ebuild
 2005172009 ./dev-haskell/cabal/cabal-1.18.1.3.ebuild
 2005172009 ./dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -5887,6 +6075,7 @@
 2005172009 ./dev-haskell/cabal/cabal-1.24.2.0.ebuild
 2005172009 ./dev-haskell/cabal/cabal-2.0.0.2.ebuild
 2005271009 ./dev-haskell/cabal/cabal-2.4.0.1.ebuild
+2008011139 ./dev-haskell/cabal/cabal-3.0.1.0.ebuild
 2004132310 ./dev-haskell/cairo/cairo-0.12.5.3.ebuild
 2004132310 ./dev-haskell/cairo/cairo-0.13.1.1.ebuild
 2004132310 ./dev-haskell/cairo/cairo-0.13.3.1.ebuild
@@ -5902,6 +6091,7 @@
 2006072109 ./dev-haskell/cereal/cereal-0.3.5.2.ebuild
 2006072109 ./dev-haskell/cereal/cereal-0.4.0.1.ebuild
 2006072109 ./dev-haskell/cereal/cereal-0.4.1.1.ebuild
+2008011139 ./dev-haskell/cereal/cereal-0.5.8.1.ebuild
 2004132310 ./dev-haskell/certificate/certificate-1.3.9.ebuild
 2004080039 ./dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
 2004132310 ./dev-haskell/cgi/cgi-3001.1.8.3.ebuild
@@ -5962,6 +6152,7 @@
 1912151439 ./dev-haskell/comonad/comonad-5.0.5.ebuild
 2004132310 ./dev-haskell/comonad/comonad-4.2.7.2.ebuild
 2004132310 ./dev-haskell/comonad/comonad-5.ebuild
+2008011139 ./dev-haskell/comonad/comonad-5.0.6.ebuild
 1911101840 ./dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild
 1911101840 ./dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
 1912150309 ./dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
@@ -5970,27 +6161,33 @@
 2006072109 ./dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild
 2006072109 ./dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild
 2006072109 ./dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild
+2008011139 ./dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
 1911101840 ./dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild
 1911101840 ./dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild
 1911101840 ./dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
 2004132310 ./dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
+2008011139 ./dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
 1911101840 ./dev-haskell/conduit/conduit-1.2.12.1.ebuild
 1911101840 ./dev-haskell/conduit/conduit-1.2.6.1.ebuild
 2004132310 ./dev-haskell/conduit/conduit-1.0.15.1.ebuild
 2004132310 ./dev-haskell/conduit/conduit-1.1.6.ebuild
 2004132310 ./dev-haskell/conduit/conduit-1.2.6.6.ebuild
 2004132310 ./dev-haskell/conduit/conduit-1.2.8.ebuild
+2008011139 ./dev-haskell/conduit/conduit-1.3.2.ebuild
 1911101840 ./dev-haskell/configfile/configfile-1.1.4.ebuild
 1911101840 ./dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
 1911101840 ./dev-haskell/connection/connection-0.2.5.ebuild
 2004132310 ./dev-haskell/connection/connection-0.2.4.ebuild
+2008011139 ./dev-haskell/connection/connection-0.3.1.ebuild
 1911101840 ./dev-haskell/constraints/constraints-0.8.ebuild
 2004132310 ./dev-haskell/constraints/constraints-0.4.1.3.ebuild
+2008011139 ./dev-haskell/constraints/constraints-0.11.2.ebuild
 1911101840 ./dev-haskell/contravariant/contravariant-0.4.4.ebuild
 1911101840 ./dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
 2004132310 ./dev-haskell/contravariant/contravariant-0.6.ebuild
 2004132310 ./dev-haskell/contravariant/contravariant-1.3.3.ebuild
 2004132310 ./dev-haskell/contravariant/contravariant-1.4.ebuild
+2008011139 ./dev-haskell/contravariant/contravariant-1.5.2.ebuild
 1911101840 ./dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
 2006072109 ./dev-haskell/convertible/convertible-1.0.11.1.ebuild
 2006072109 ./dev-haskell/convertible/convertible-1.1.1.0.ebuild
@@ -6033,6 +6230,7 @@
 1911101840 ./dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild
 1911101840 ./dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
 2004132310 ./dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
+2008011139 ./dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.101.0.ebuild
 1911101840 ./dev-haskell/cryptohash/cryptohash-0.11.6.ebuild
 1911101840 ./dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
 1911101840 ./dev-haskell/cryptohash/cryptohash-0.9.1.ebuild
@@ -6066,11 +6264,13 @@
 1911101840 ./dev-haskell/dav/dav-1.0.7.ebuild
 1911101840 ./dev-haskell/dav/dav-1.3.1.ebuild
 1912150309 ./dev-haskell/dav/dav-1.3.3.ebuild
+2008011139 ./dev-haskell/dav/dav-1.3.4.ebuild
 1911101840 ./dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
 2004132310 ./dev-haskell/dbus/dbus-0.10.10.ebuild
 2004132209 ./dev-haskell/dbus/dbus-0.10.11-r1.ebuild
 2004132209 ./dev-haskell/dbus/dbus-0.10.12.ebuild
 2004132310 ./dev-haskell/dbus/dbus-0.10.13.ebuild
+2008011139 ./dev-haskell/dbus/dbus-1.2.16.ebuild
 2004132310 ./dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
 2004132310 ./dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
 1911101840 ./dev-haskell/derive/derive-2.5.26.ebuild
@@ -6078,11 +6278,13 @@
 2006072109 ./dev-haskell/diff/diff-0.3.0.ebuild
 2006072109 ./dev-haskell/diff/diff-0.3.2.ebuild
 2006072109 ./dev-haskell/diff/diff-0.3.4.ebuild
+2008011139 ./dev-haskell/diff/diff-0.4.0.ebuild
 2006072109 ./dev-haskell/digest/digest-0.0.1.2.ebuild
 1911101840 ./dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
 1911101840 ./dev-haskell/distributive/distributive-0.3.2.ebuild
 2004132310 ./dev-haskell/distributive/distributive-0.4.4.ebuild
 2004132310 ./dev-haskell/distributive/distributive-0.5.2.ebuild
+2008011139 ./dev-haskell/distributive/distributive-0.6.1.ebuild
 2006072109 ./dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
 1911101840 ./dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
 1912150309 ./dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
@@ -6093,6 +6295,7 @@
 2004132310 ./dev-haskell/dlist/dlist-0.7.1.2.ebuild
 2004132310 ./dev-haskell/dlist/dlist-0.7.1.ebuild
 2004132310 ./dev-haskell/dlist/dlist-0.8.0.2.ebuild
+2008011139 ./dev-haskell/dlist/dlist-0.8.0.7.ebuild
 2006072109 ./dev-haskell/dns/dns-0.3.8.ebuild
 2006072109 ./dev-haskell/dns/dns-1.4.5.ebuild
 2006072109 ./dev-haskell/dns/dns-2.0.0.ebuild
@@ -6100,12 +6303,14 @@
 2006072109 ./dev-haskell/dns/dns-2.0.6.ebuild
 1912150309 ./dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild
 2004132310 ./dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
+2008011139 ./dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
 2004132310 ./dev-haskell/doctest/doctest-0.10.1.ebuild
 2004132310 ./dev-haskell/doctest/doctest-0.11.1.ebuild
 2004132310 ./dev-haskell/doctest/doctest-0.9.12.ebuild
+2008011139 ./dev-haskell/doctest/doctest-0.16.3.ebuild
 2004132310 ./dev-haskell/drift/drift-2.4.2.ebuild
 2004132310 ./dev-haskell/easy-file/easy-file-0.2.1.ebuild
-2004132310 ./dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+2008011139 ./dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
 1911101840 ./dev-haskell/edisonapi/edisonapi-1.3.1.ebuild
 1912150309 ./dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
 1911101840 ./dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
@@ -6117,6 +6322,7 @@
 1911101840 ./dev-haskell/either/either-4.3.3.2.ebuild
 1911101840 ./dev-haskell/either/either-4.4.1.1.ebuild
 1911101840 ./dev-haskell/either/either-4.4.1.ebuild
+2008011139 ./dev-haskell/either/either-5.0.1.1.ebuild
 1911101840 ./dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild
 1911101840 ./dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild
 1912150309 ./dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
@@ -6140,13 +6346,16 @@
 2004132310 ./dev-haskell/encoding/encoding-0.8.ebuild
 1911101840 ./dev-haskell/entropy/entropy-0.2.2.4.ebuild
 2004132310 ./dev-haskell/entropy/entropy-0.3.7.ebuild
+2008011139 ./dev-haskell/entropy/entropy-0.4.1.6.ebuild
 2004132310 ./dev-haskell/enumerator/enumerator-0.4.20.ebuild
 1911101840 ./dev-haskell/equivalence/equivalence-0.2.5.ebuild
 1911101840 ./dev-haskell/equivalence/equivalence-0.3.1.ebuild
 2006062109 ./dev-haskell/erf/erf-2.0.0.0-r1.ebuild
 2006062109 ./dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
+2008021409 ./dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
 2006072109 ./dev-haskell/errors/errors-1.4.7.ebuild
 2006072109 ./dev-haskell/errors/errors-2.1.3.ebuild
+2008011139 ./dev-haskell/errors/errors-2.3.0.ebuild
 1911101840 ./dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
 1911101840 ./dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
 1911101840 ./dev-haskell/exceptions/exceptions-0.3.3.ebuild
@@ -6154,6 +6363,7 @@
 2004132310 ./dev-haskell/exceptions/exceptions-0.6.1.ebuild
 2004132310 ./dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
 2004132310 ./dev-haskell/exceptions/exceptions-0.8.3.ebuild
+2008011139 ./dev-haskell/exceptions/exceptions-0.10.4.ebuild
 1912150309 ./dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
 2004132310 ./dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
 2006062109 ./dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -6161,16 +6371,19 @@
 1911101840 ./dev-haskell/extra/extra-1.4.10.ebuild
 2004132310 ./dev-haskell/extra/extra-1.4.2.ebuild
 2004132310 ./dev-haskell/extra/extra-1.5.1.ebuild
-2004132310 ./dev-haskell/fail/fail-4.9.0.0.ebuild
+2008011139 ./dev-haskell/extra/extra-1.7.4.ebuild
+2008011139 ./dev-haskell/fail/fail-4.9.0.0.ebuild
 2005172009 ./dev-haskell/failure/failure-0.2.0.3.ebuild
 1911101840 ./dev-haskell/fast-logger/fast-logger-2.4.7.ebuild
 2006072109 ./dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
+2008011139 ./dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
 1911101840 ./dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
 1911101840 ./dev-haskell/fclabels/fclabels-2.0.3.1.ebuild
 1911101840 ./dev-haskell/fclabels/fclabels-2.0.3.ebuild
 1912150209 ./dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
 1911101840 ./dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
 1911101840 ./dev-haskell/feed/feed-0.3.11.1.ebuild
+2008011139 ./dev-haskell/feed/feed-1.3.0.1.ebuild
 2006072109 ./dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
 2006072109 ./dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
 2006072109 ./dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
@@ -6178,15 +6391,18 @@
 2004132310 ./dev-haskell/fgl/fgl-5.5.0.1.ebuild
 2004132310 ./dev-haskell/fgl/fgl-5.5.2.3.ebuild
 2004132310 ./dev-haskell/fgl/fgl-5.5.3.0.ebuild
+2008011139 ./dev-haskell/fgl/fgl-5.7.0.2.ebuild
 1911101840 ./dev-haskell/file-embed/file-embed-0.0.10.ebuild
 1911101840 ./dev-haskell/file-embed/file-embed-0.0.9.ebuild
 1912150209 ./dev-haskell/file-embed/file-embed-0.0.11.ebuild
 2004132310 ./dev-haskell/file-embed/file-embed-0.0.7.ebuild
+2008011139 ./dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
 1911101840 ./dev-haskell/file-location/file-location-0.4.9-r1.ebuild
 1911101840 ./dev-haskell/file-location/file-location-0.4.9.ebuild
 1912150209 ./dev-haskell/file-location/file-location-0.4.9.1.ebuild
 1911101840 ./dev-haskell/filelock/filelock-0.1.0.1.ebuild
 1912150209 ./dev-haskell/filelock/filelock-0.1.1.3.ebuild
+2008011139 ./dev-haskell/filelock/filelock-0.1.1.4.ebuild
 2004132310 ./dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
 2006072109 ./dev-haskell/filestore/filestore-0.6.1.ebuild
 2006072109 ./dev-haskell/filestore/filestore-0.6.2.ebuild
@@ -6200,26 +6416,32 @@
 2006072109 ./dev-haskell/foldl/foldl-1.0.7.ebuild
 2006072109 ./dev-haskell/foldl/foldl-1.1.3.ebuild
 2006072109 ./dev-haskell/foldl/foldl-1.2.3.ebuild
+2008011139 ./dev-haskell/foldl/foldl-1.4.7.ebuild
 1911101840 ./dev-haskell/free/free-4.10.0.1.ebuild
 1911101840 ./dev-haskell/free/free-4.11.ebuild
 1911101840 ./dev-haskell/free/free-4.2.ebuild
 1911101840 ./dev-haskell/free/free-4.5.ebuild
 1911101840 ./dev-haskell/free/free-4.9.ebuild
 2004132310 ./dev-haskell/free/free-4.12.4.ebuild
+2008011139 ./dev-haskell/free/free-5.1.3.ebuild
 2006072109 ./dev-haskell/frown/frown-0.6.2.3.ebuild
 1911101840 ./dev-haskell/fsnotify/fsnotify-0.2.1.ebuild
 2006072109 ./dev-haskell/fsnotify/fsnotify-0.0.11.ebuild
 2006072109 ./dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild
+2008011139 ./dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
 2006062109 ./dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
 2006062109 ./dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild
 2006062109 ./dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
+2008011139 ./dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
 2006072109 ./dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild
+2008011139 ./dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
 1911101840 ./dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild
 1911101840 ./dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild
 2006062109 ./dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
 1911101840 ./dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
 1912150209 ./dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
 2006062109 ./dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
+2008011139 ./dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
 1911101840 ./dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
 2004132310 ./dev-haskell/gio/gio-0.12.5.3.ebuild
 2004132310 ./dev-haskell/gio/gio-0.13.1.1.ebuild
@@ -6234,6 +6456,7 @@
 2004132209 ./dev-haskell/glib/glib-0.13.7.0.ebuild
 1911101840 ./dev-haskell/glob/glob-0.7.14.ebuild
 1911101840 ./dev-haskell/glob/glob-0.7.5.ebuild
+2008011139 ./dev-haskell/glob/glob-0.9.3.ebuild
 2005172009 ./dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
 2005172009 ./dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
 2005172009 ./dev-haskell/gluraw/gluraw-1.5.0.1.ebuild
@@ -6248,6 +6471,7 @@
 1911101840 ./dev-haskell/gnutls/gnutls-0.2.ebuild
 2004132310 ./dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
 2004132310 ./dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
+2008011139 ./dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
 1911101840 ./dev-haskell/groupoids/groupoids-3.0.1.1.ebuild
 1911101840 ./dev-haskell/groupoids/groupoids-4.0.ebuild
 1911101840 ./dev-haskell/gsasl/gsasl-0.3.6.ebuild
@@ -6258,14 +6482,18 @@
 2004132310 ./dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
 2006061509 ./dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
 2004132310 ./dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
+2008011139 ./dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
 2005172009 ./dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
 2005172009 ./dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+2008011139 ./dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
 2005172009 ./dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
 2005172009 ./dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
 2005172009 ./dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
+2008011139 ./dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
 2005172009 ./dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
 2005172009 ./dev-haskell/haddock/haddock-2.16.1.ebuild
 2005172009 ./dev-haskell/haddock/haddock-2.17.2.ebuild
+2008011139 ./dev-haskell/haddock/haddock-2.23.1.ebuild
 2004080039 ./dev-haskell/half/half-0.2.2.3.ebuild
 1911101840 ./dev-haskell/hamlet/hamlet-1.1.9.2.ebuild
 1911101840 ./dev-haskell/hamlet/hamlet-1.2.0.ebuild
@@ -6283,6 +6511,7 @@
 2004080039 ./dev-haskell/harp/harp-0.4.3.2.ebuild
 2006072109 ./dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild
 2006072109 ./dev-haskell/hashable-time/hashable-time-0.2.ebuild
+2008011139 ./dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
 2004132310 ./dev-haskell/hashable/hashable-1.2.1.0.ebuild
 2004132310 ./dev-haskell/hashable/hashable-1.2.4.0.ebuild
 2004132209 ./dev-haskell/hashable/hashable-1.2.7.0.ebuild
@@ -6293,6 +6522,7 @@
 2004132310 ./dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
 2004132310 ./dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
 2004132310 ./dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+2008011139 ./dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
 1912150039 ./dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
 2006062109 ./dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
 2006062109 ./dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild
@@ -6304,9 +6534,11 @@
 2004080039 ./dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
 2004132310 ./dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
 2004132310 ./dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+2008011139 ./dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
 2006072109 ./dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
 2006072109 ./dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
 2006072109 ./dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+2008011139 ./dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
 2006062109 ./dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
 2006062109 ./dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
 2006062109 ./dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
@@ -6329,7 +6561,7 @@
 1911101840 ./dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
 1912110241 ./dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
 1912150039 ./dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
-2006062109 ./dev-haskell/hex/hex-0.1.2.ebuild
+2008021539 ./dev-haskell/hex/hex-0.1.2.ebuild
 1911101840 ./dev-haskell/hexpat/hexpat-0.20.10.ebuild
 1911101840 ./dev-haskell/hexpat/hexpat-0.20.11.ebuild
 1911101840 ./dev-haskell/hexpat/hexpat-0.20.13.ebuild
@@ -6343,6 +6575,7 @@
 2004132310 ./dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
 2004132310 ./dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
 2004132310 ./dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
+2008011139 ./dev-haskell/hinotify/hinotify-0.3.10.ebuild
 1911101840 ./dev-haskell/hit/hit-0.6.3.ebuild
 1911101840 ./dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
 1911101840 ./dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild
@@ -6350,14 +6583,17 @@
 1912210209 ./dev-haskell/hlint/hlint-1.8.57.ebuild
 1912210209 ./dev-haskell/hlint/hlint-1.9.35.ebuild
 2004132310 ./dev-haskell/hlint/hlint-1.9.21.ebuild
+2008011139 ./dev-haskell/hlint/hlint-2.1.17-r1.ebuild
 1911101840 ./dev-haskell/hoauth2/hoauth2-0.4.8.ebuild
 1911101840 ./dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
 2006062109 ./dev-haskell/hostname/hostname-1.0.ebuild
 1912150039 ./dev-haskell/hourglass/hourglass-0.2.12.ebuild
 2004132310 ./dev-haskell/hourglass/hourglass-0.2.9.ebuild
 1911101840 ./dev-haskell/hpack/hpack-0.14.1.ebuild
+2008011139 ./dev-haskell/hpack/hpack-0.33.0.ebuild
 2006072109 ./dev-haskell/hps/hps-0.15.ebuild
 2004132310 ./dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
+2008011139 ./dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
 1911101840 ./dev-haskell/hs3/hs3-0.5.9.ebuild
 2006072109 ./dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
 2006072109 ./dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
@@ -6368,8 +6604,10 @@
 2004132209 ./dev-haskell/hscolour/hscolour-1.24.ebuild
 2004080039 ./dev-haskell/hslogger/hslogger-1.2.10.ebuild
 2004132310 ./dev-haskell/hslogger/hslogger-1.2.9.ebuild
+2008011139 ./dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
 2006072109 ./dev-haskell/hslua/hslua-0.3.13.ebuild
 2006072109 ./dev-haskell/hslua/hslua-0.3.6.1.ebuild
+2008011139 ./dev-haskell/hslua/hslua-1.0.3.1.ebuild
 1911101840 ./dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
 1912150039 ./dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild
 2004132310 ./dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -6378,16 +6616,19 @@
 1911101840 ./dev-haskell/hspec-core/hspec-core-2.2.1.ebuild
 2004132310 ./dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
 2004132310 ./dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
+2008011139 ./dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
 1911101840 ./dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild
 1911101840 ./dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild
 2004132310 ./dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
 2004132310 ./dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
+2008011139 ./dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
 1911101840 ./dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
 1911101840 ./dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild
 2004132310 ./dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
 2004132310 ./dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
 2004132310 ./dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
 2004132310 ./dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
+2008011139 ./dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
 1911101840 ./dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild
 1911101840 ./dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild
 1911101840 ./dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild
@@ -6395,6 +6636,7 @@
 2004132310 ./dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
 2004132310 ./dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
 2004132310 ./dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
+2008011139 ./dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
 1911101840 ./dev-haskell/hspec-smallcheck/hspec-smallcheck-0.4.1.ebuild
 1911101840 ./dev-haskell/hspec/hspec-1.10.0.ebuild
 1911101840 ./dev-haskell/hspec/hspec-1.5.4.ebuild
@@ -6405,6 +6647,7 @@
 2004132310 ./dev-haskell/hspec/hspec-1.8.1.1.ebuild
 2004132310 ./dev-haskell/hspec/hspec-2.1.4.ebuild
 2004132310 ./dev-haskell/hspec/hspec-2.2.4.ebuild
+2008011139 ./dev-haskell/hspec/hspec-2.7.1.ebuild
 2006072109 ./dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
 2006072109 ./dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
 2006072109 ./dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
@@ -6419,8 +6662,10 @@
 1911101840 ./dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild
 1911101840 ./dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild
 1911101840 ./dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
+2008011139 ./dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
 2006072109 ./dev-haskell/html/html-1.0.1.2-r1.ebuild
 1911101840 ./dev-haskell/http-api-data/http-api-data-0.3.3.ebuild
+2008011139 ./dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
 1911101840 ./dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
 2004132310 ./dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
 1911101840 ./dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild
@@ -6430,15 +6675,18 @@
 1911101840 ./dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild
 2004132310 ./dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
 2004132310 ./dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
+2008011139 ./dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
 1911101840 ./dev-haskell/http-client/http-client-0.5.5.ebuild
 2004132310 ./dev-haskell/http-client/http-client-0.4.18.1.ebuild
 2004132310 ./dev-haskell/http-client/http-client-0.4.30.ebuild
 2004132310 ./dev-haskell/http-client/http-client-0.5.7.0.ebuild
+2008011139 ./dev-haskell/http-client/http-client-0.6.4.1.ebuild
 2004132310 ./dev-haskell/http-common/http-common-0.8.2.0.ebuild
 1911101840 ./dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild
 1911101840 ./dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
 2004132310 ./dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
 2004132310 ./dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
+2008011139 ./dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
 1912150039 ./dev-haskell/http-date/http-date-0.0.8.ebuild
 2004132310 ./dev-haskell/http-date/http-date-0.0.6.1.ebuild
 1911101840 ./dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild
@@ -6448,18 +6696,22 @@
 2004132310 ./dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
 1911101840 ./dev-haskell/http-types/http-types-0.9.1.ebuild
 2004132310 ./dev-haskell/http-types/http-types-0.8.6.ebuild
+2008011139 ./dev-haskell/http-types/http-types-0.12.3.ebuild
 1911101840 ./dev-haskell/http/http-4000.2.22.ebuild
-1912150039 ./dev-haskell/http/http-4000.3.14.ebuild
 2004132209 ./dev-haskell/http/http-4000.2.17.ebuild
 2004132310 ./dev-haskell/http/http-4000.2.20.ebuild
 2004132310 ./dev-haskell/http/http-4000.2.8.ebuild
 2004132310 ./dev-haskell/http/http-4000.3.5.ebuild
+2008011139 ./dev-haskell/http/http-4000.3.14.ebuild
 2006072109 ./dev-haskell/http2/http2-1.3.1.ebuild
 2006072109 ./dev-haskell/http2/http2-1.6.2.ebuild
+2008011139 ./dev-haskell/http2/http2-2.0.3.ebuild
 2006062109 ./dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
 2006062109 ./dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
+2008011139 ./dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
 2004132209 ./dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
 2004132310 ./dev-haskell/hunit/hunit-1.2.5.2.ebuild
+2008011139 ./dev-haskell/hunit/hunit-1.6.0.0.ebuild
 1911101840 ./dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
 2004132310 ./dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
 2005172009 ./dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
@@ -6468,8 +6720,8 @@
 1911101840 ./dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
 2004132310 ./dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
 1911101840 ./dev-haskell/hxt/hxt-9.3.1.16.ebuild
-1912150039 ./dev-haskell/hxt/hxt-9.3.1.18.ebuild
 2004132310 ./dev-haskell/hxt/hxt-9.3.1.15.ebuild
+2008021439 ./dev-haskell/hxt/hxt-9.3.1.18.ebuild
 1911101840 ./dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
 1912150039 ./dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
 2006062109 ./dev-haskell/iconv/iconv-0.4.1.3.ebuild
@@ -6480,6 +6732,7 @@
 2006072109 ./dev-haskell/ifelse/ifelse-0.85-r1.ebuild
 2006072109 ./dev-haskell/ifelse/ifelse-0.85.ebuild
 2006072109 ./dev-haskell/interpolate/interpolate-0.1.0.ebuild
+2008011139 ./dev-haskell/interpolate/interpolate-0.2.0.ebuild
 2004132310 ./dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
 2006062109 ./dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
 2006072109 ./dev-haskell/iproute/iproute-1.2.12.ebuild
@@ -6495,14 +6748,18 @@
 1911101840 ./dev-haskell/juicypixels/juicypixels-3.2.7.ebuild
 1911101840 ./dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
 2004132310 ./dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
+2008011139 ./dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
 2004132310 ./dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
 2004132310 ./dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
+2008011139 ./dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
 1911101840 ./dev-haskell/keys/keys-3.10.2.ebuild
 1911101840 ./dev-haskell/keys/keys-3.11.ebuild
+2008011139 ./dev-haskell/keys/keys-3.12.3.ebuild
 1911101840 ./dev-haskell/language-bash/language-bash-0.6.1.ebuild
 2004132310 ./dev-haskell/language-c/language-c-0.4.2.ebuild
 2004132310 ./dev-haskell/language-c/language-c-0.4.7.ebuild
 2004132209 ./dev-haskell/language-c/language-c-0.7.1.ebuild
+2008011139 ./dev-haskell/language-c/language-c-0.8.3.ebuild
 2006062109 ./dev-haskell/language-css/language-css-0.0.3.ebuild
 2006062109 ./dev-haskell/language-dot/language-dot-0.1.0.ebuild
 1911101840 ./dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
@@ -6527,12 +6784,14 @@
 2004132310 ./dev-haskell/lens/lens-4.11.ebuild
 2004132310 ./dev-haskell/lens/lens-4.14.ebuild
 2004132310 ./dev-haskell/lens/lens-4.6.0.1.ebuild
+2008011139 ./dev-haskell/lens/lens-4.19.1.ebuild
 2006242309 ./dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
 2006242309 ./dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
 1911101840 ./dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild
 1911101840 ./dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
 2004132310 ./dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
 2004132310 ./dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
+2008011139 ./dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
 2004132310 ./dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
 2006062109 ./dev-haskell/libxml/libxml-0.1.1.ebuild
 1911101840 ./dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
@@ -6540,14 +6799,17 @@
 1911101840 ./dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
 1911101840 ./dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
 2004132310 ./dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
+2008011139 ./dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
 1911101840 ./dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
 1912150039 ./dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
 2004132310 ./dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
 1911101840 ./dev-haskell/linear/linear-1.20.5.ebuild
 1911101840 ./dev-haskell/linear/linear-1.20.6.ebuild
+2008011139 ./dev-haskell/linear/linear-1.20.9.ebuild
 2004132310 ./dev-haskell/list/list-0.5.2.ebuild
 1911101840 ./dev-haskell/listlike/listlike-4.2.1.ebuild
 1911101840 ./dev-haskell/listlike/listlike-4.5.1.ebuild
+2008021339 ./dev-haskell/listlike/listlike-4.6.3.ebuild
 2006062109 ./dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
 1911101840 ./dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
 1912150039 ./dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
@@ -6560,11 +6822,13 @@
 1911101840 ./dev-haskell/math-functions/math-functions-0.1.5.2.ebuild
 1911101840 ./dev-haskell/math-functions/math-functions-0.1.6.0.ebuild
 1911101840 ./dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
+2008011139 ./dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
 1911101840 ./dev-haskell/memory/memory-0.10.ebuild
 1911101840 ./dev-haskell/memory/memory-0.7.ebuild
 2001211209 ./dev-haskell/memory/memory-0.15.0.ebuild
 2004132310 ./dev-haskell/memory/memory-0.14.1.ebuild
 1911101840 ./dev-haskell/memotrie/memotrie-0.6.4.ebuild
+2008011139 ./dev-haskell/memotrie/memotrie-0.6.10.ebuild
 1911101840 ./dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild
 1911101840 ./dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
 1911101840 ./dev-haskell/microlens/microlens-0.4.8.0.ebuild
@@ -6579,12 +6843,14 @@
 1911101840 ./dev-haskell/missingh/missingh-1.2.1.0.ebuild
 2004132310 ./dev-haskell/missingh/missingh-1.2.0.2.ebuild
 2004132310 ./dev-haskell/missingh/missingh-1.3.0.1.ebuild
+2008021409 ./dev-haskell/missingh/missingh-1.4.3.0.ebuild
 2006062109 ./dev-haskell/mmap/mmap-0.5.8.ebuild
 2006062109 ./dev-haskell/mmap/mmap-0.5.9.ebuild
 2006072109 ./dev-haskell/mmorph/mmorph-1.0.0.ebuild
 2006072109 ./dev-haskell/mmorph/mmorph-1.0.5.ebuild
 2006072109 ./dev-haskell/mmorph/mmorph-1.0.6.ebuild
 2006072109 ./dev-haskell/mmorph/mmorph-1.0.9.ebuild
+2008011139 ./dev-haskell/mmorph/mmorph-1.1.3.ebuild
 2006072109 ./dev-haskell/mockery/mockery-0.3.2.ebuild
 2006072109 ./dev-haskell/mockery/mockery-0.3.3.ebuild
 2006072109 ./dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -6598,6 +6864,7 @@
 1911101840 ./dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
 1911101840 ./dev-haskell/monad-logger/monad-logger-0.3.18.ebuild
 1911101840 ./dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild
+2008011139 ./dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
 1911101840 ./dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
 1911101840 ./dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
 1911101840 ./dev-haskell/monad-par/monad-par-0.3.4.7.ebuild
@@ -6625,12 +6892,14 @@
 1911101840 ./dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild
 1911101840 ./dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild
 1911101840 ./dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild
+2008011139 ./dev-haskell/mono-traversable/mono-traversable-1.0.15.1.ebuild
 2006072109 ./dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
 2004080039 ./dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
 2004132310 ./dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
 2004132310 ./dev-haskell/mtl/mtl-2.1.3.1.ebuild
 2004132310 ./dev-haskell/mtl/mtl-2.2.1-r1.ebuild
 2004132209 ./dev-haskell/mtl/mtl-2.2.1.ebuild
+2008011139 ./dev-haskell/mtl/mtl-2.2.2.ebuild
 2004132310 ./dev-haskell/multipart/multipart-0.1.2.ebuild
 1911101840 ./dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
 1911101840 ./dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild
@@ -6647,7 +6916,9 @@
 2004132310 ./dev-haskell/nats/nats-0.1.2.ebuild
 2004132310 ./dev-haskell/nats/nats-0.2.ebuild
 2004132310 ./dev-haskell/nats/nats-1.ebuild
+2008011139 ./dev-haskell/nats/nats-1.1.2.ebuild
 1911101840 ./dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
+2008011139 ./dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild
 1911101840 ./dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
 1911101840 ./dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
 2004132310 ./dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
@@ -6657,15 +6928,18 @@
 1911101840 ./dev-haskell/network-info/network-info-0.2.0.8.ebuild
 2006072109 ./dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
 2006072109 ./dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
+2008011139 ./dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
 1911101840 ./dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
 2004132310 ./dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
 2004132310 ./dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
 2004132209 ./dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
+2008011139 ./dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
 1911101840 ./dev-haskell/network/network-2.6.3.1-r1.ebuild
 2004132310 ./dev-haskell/network/network-2.4.1.2.ebuild
 2004132209 ./dev-haskell/network/network-2.4.2.2.ebuild
 2004132209 ./dev-haskell/network/network-2.5.0.0.ebuild
 2004132310 ./dev-haskell/network/network-2.6.2.1.ebuild
+2008011139 ./dev-haskell/network/network-3.0.1.1.ebuild
 2006072109 ./dev-haskell/newtype/newtype-0.2.2.0.ebuild
 2006072109 ./dev-haskell/newtype/newtype-0.2.ebuild
 1911101840 ./dev-haskell/nonce/nonce-1.0.2.ebuild
@@ -6685,10 +6959,12 @@
 2006072109 ./dev-haskell/opengl/opengl-2.12.0.1.ebuild
 2006072109 ./dev-haskell/opengl/opengl-2.9.2.0.ebuild
 2006072109 ./dev-haskell/opengl/opengl-3.0.1.0.ebuild
+2008011139 ./dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
 2005172009 ./dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
 2005172009 ./dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
 2005172009 ./dev-haskell/openglraw/openglraw-2.5.1.0.ebuild
 2005172009 ./dev-haskell/openglraw/openglraw-3.2.4.0.ebuild
+2008011139 ./dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
 2006072109 ./dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
 2006072109 ./dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
 2004132310 ./dev-haskell/options/options-1.2.1.1.ebuild
@@ -6699,7 +6975,9 @@
 2004132310 ./dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
 2004132310 ./dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
 2004132310 ./dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
+2008011139 ./dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
 2006062109 ./dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
+2008011139 ./dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild
 1911101840 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
 2004132310 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
 2006062109 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
@@ -6708,10 +6986,12 @@
 2006062109 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
 2006062109 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
 2006062109 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
+2008011139 ./dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
 2005172009 ./dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
 2005172009 ./dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
 2005172009 ./dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
 2005172009 ./dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+2008011139 ./dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
 2006072109 ./dev-haskell/pango/pango-0.12.5.3.ebuild
 2006072109 ./dev-haskell/pango/pango-0.13.1.1.ebuild
 2006072109 ./dev-haskell/pango/pango-0.13.3.1.ebuild
@@ -6719,16 +6999,21 @@
 1911101840 ./dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
 2006062109 ./dev-haskell/parallel/parallel-3.2.0.3.ebuild
 2006062109 ./dev-haskell/parallel/parallel-3.2.1.0.ebuild
+2008011139 ./dev-haskell/parallel/parallel-3.2.2.0.ebuild
 2004132209 ./dev-haskell/parsec/parsec-3.1.11.ebuild
 2004132310 ./dev-haskell/parsec/parsec-3.1.5.ebuild
 2004132310 ./dev-haskell/parsec/parsec-3.1.9-r1.ebuild
 2005271009 ./dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+2008011139 ./dev-haskell/parsec/parsec-3.1.14.0.ebuild
 1911101840 ./dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
 1911101840 ./dev-haskell/path-io/path-io-1.2.2.ebuild
+2008011139 ./dev-haskell/path-io/path-io-1.6.0-r1.ebuild
 2006062109 ./dev-haskell/path-pieces/path-pieces-0.1.5.ebuild
 2006062109 ./dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
 2006062109 ./dev-haskell/path/path-0.5.13.ebuild
+2008011139 ./dev-haskell/path/path-0.7.0.ebuild
 2006062109 ./dev-haskell/patience/patience-0.1.1.ebuild
+2008011139 ./dev-haskell/patience/patience-0.1.1-r1.ebuild
 2004132310 ./dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
 1911101840 ./dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
 1912141809 ./dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
@@ -6737,10 +7022,13 @@
 2004132310 ./dev-haskell/pem/pem-0.2.2.ebuild
 1911101840 ./dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
 1911101840 ./dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
+2008011139 ./dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
 1911101840 ./dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
 1911101840 ./dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
+2008011139 ./dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
 1911101840 ./dev-haskell/persistent/persistent-2.1.6.ebuild
 1911101840 ./dev-haskell/persistent/persistent-2.6-r1.ebuild
+2008011139 ./dev-haskell/persistent/persistent-2.10.5.2.ebuild
 1911101840 ./dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
 1912141809 ./dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
 1911101840 ./dev-haskell/pid1/pid1-0.1.0.1.ebuild
@@ -6754,6 +7042,7 @@
 1912141809 ./dev-haskell/pointed/pointed-5.0.1-r1.ebuild
 2004132310 ./dev-haskell/polyparse/polyparse-1.11.ebuild
 2004132310 ./dev-haskell/polyparse/polyparse-1.9.ebuild
+2008011139 ./dev-haskell/polyparse/polyparse-1.13.ebuild
 2006072109 ./dev-haskell/pqueue/pqueue-1.3.2.ebuild
 2004132310 ./dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
 2004132310 ./dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
@@ -6761,12 +7050,15 @@
 1911101840 ./dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
 1911101840 ./dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
 2004132310 ./dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
+2008011139 ./dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
 2006062109 ./dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
 1911101840 ./dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
+2008011139 ./dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
 2004132310 ./dev-haskell/primitive/primitive-0.5.0.1.ebuild
 2004132310 ./dev-haskell/primitive/primitive-0.5.1.0.ebuild
 2004132209 ./dev-haskell/primitive/primitive-0.5.4.0.ebuild
 2004132209 ./dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
+2008011139 ./dev-haskell/primitive/primitive-0.7.1.0.ebuild
 1911101840 ./dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
 1911101840 ./dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
 1911101840 ./dev-haskell/process-extras/process-extras-0.3.3.6.ebuild
@@ -6778,12 +7070,15 @@
 2004132310 ./dev-haskell/profunctors/profunctors-4.4.1.ebuild
 2004132310 ./dev-haskell/profunctors/profunctors-5.1.2.ebuild
 2004132310 ./dev-haskell/profunctors/profunctors-5.2.ebuild
+2008011139 ./dev-haskell/profunctors/profunctors-5.5.1.ebuild
 1911101840 ./dev-haskell/project-template/project-template-0.2.0.ebuild
+2008011139 ./dev-haskell/project-template/project-template-0.2.0.1.ebuild
 2006072109 ./dev-haskell/psqueue/psqueue-1.1-r1.ebuild
 2006072109 ./dev-haskell/psqueues/psqueues-0.2.0.3.ebuild
 2006072109 ./dev-haskell/psqueues/psqueues-0.2.2.1.ebuild
 2006072109 ./dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
 2006072109 ./dev-haskell/psqueues/psqueues-0.2.2.3.ebuild
+2008011139 ./dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
 2004132310 ./dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
 2004132310 ./dev-haskell/punycode/punycode-2.0.ebuild
 2006072109 ./dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
@@ -6792,9 +7087,11 @@
 1911101840 ./dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
 2004132310 ./dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
 2004132310 ./dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
+2008011139 ./dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
 1911101840 ./dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
 2004132310 ./dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
 2006072109 ./dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
+2008011139 ./dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
 1912141809 ./dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.1.0.ebuild
 2004132310 ./dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
 2004132310 ./dev-haskell/quickcheck/quickcheck-2.6.ebuild
@@ -6802,6 +7099,7 @@
 2004132310 ./dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
 2004132310 ./dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
 2004132310 ./dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
+2008011139 ./dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
 2006072109 ./dev-haskell/random/random-1.0.1.1-r1.ebuild
 2006072109 ./dev-haskell/random/random-1.1.ebuild
 2006072109 ./dev-haskell/ranges/ranges-0.2.4-r1.ebuild
@@ -6822,18 +7120,23 @@
 1912141809 ./dev-haskell/reflection/reflection-2.1.4.ebuild
 2004132310 ./dev-haskell/reflection/reflection-1.5.2.1.ebuild
 2004132310 ./dev-haskell/reflection/reflection-2.1.2.ebuild
-1911101840 ./dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
+2008011139 ./dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
 2004132310 ./dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
 2004132310 ./dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
+2008011139 ./dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
 2004132310 ./dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
 2004132310 ./dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
+2008011139 ./dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
 2006072109 ./dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
 2006072109 ./dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
+2008011139 ./dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
 2004132310 ./dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
+2008011139 ./dev-haskell/regex-posix/regex-posix-0.96.0.0.ebuild
 2006062109 ./dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
 1911101840 ./dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
 2006072109 ./dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
 2006072109 ./dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
+2008011139 ./dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
 1911101840 ./dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
 1911101840 ./dev-haskell/resourcet/resourcet-0.4.10.ebuild
 1911101840 ./dev-haskell/resourcet/resourcet-1.1.7.ebuild
@@ -6841,7 +7144,9 @@
 2004132310 ./dev-haskell/resourcet/resourcet-0.4.9.ebuild
 2004132310 ./dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
 2004132310 ./dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
+2008011139 ./dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
 1911101840 ./dev-haskell/retry/retry-0.7.4.2.ebuild
+2008011139 ./dev-haskell/retry/retry-0.8.1.1.ebuild
 2006062109 ./dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
 2006062109 ./dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
 1911101840 ./dev-haskell/riff/riff-0.3.0.1.ebuild
@@ -6852,11 +7157,13 @@
 2004132310 ./dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
 2006072109 ./dev-haskell/sandi/sandi-0.3.6.ebuild
 2006072109 ./dev-haskell/sandi/sandi-0.4.0.ebuild
+2008011139 ./dev-haskell/sandi/sandi-0.5.ebuild
 1911101840 ./dev-haskell/say/say-0.1.0.0.ebuild
 1912110241 ./dev-haskell/scientific/scientific-0.3.4.4.ebuild
 1912110241 ./dev-haskell/scientific/scientific-0.3.4.6.ebuild
 2004132310 ./dev-haskell/scientific/scientific-0.3.3.8.ebuild
 2004132310 ./dev-haskell/scientific/scientific-0.3.4.9.ebuild
+2008011139 ./dev-haskell/scientific/scientific-0.3.6.2.ebuild
 1911101840 ./dev-haskell/securemem/securemem-0.1.9.ebuild
 1912141709 ./dev-haskell/securemem/securemem-0.1.10.ebuild
 2004132310 ./dev-haskell/securemem/securemem-0.1.3.ebuild
@@ -6869,6 +7176,7 @@
 2004132310 ./dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
 2004132310 ./dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
 2004132310 ./dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
+2008011139 ./dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
 1911101840 ./dev-haskell/semigroups/semigroups-0.15.1.ebuild
 1911101840 ./dev-haskell/semigroups/semigroups-0.9.2.ebuild
 2004132310 ./dev-haskell/semigroups/semigroups-0.11-r1.ebuild
@@ -6876,6 +7184,7 @@
 2004132310 ./dev-haskell/semigroups/semigroups-0.12.2.ebuild
 2004132310 ./dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
 2004132310 ./dev-haskell/semigroups/semigroups-0.18.2.ebuild
+2008011139 ./dev-haskell/semigroups/semigroups-0.18.5.ebuild
 1911101840 ./dev-haskell/sendfile/sendfile-0.7.9.ebuild
 2005172009 ./dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
 2006072109 ./dev-haskell/setenv/setenv-0.1.1.1.ebuild
@@ -6905,6 +7214,7 @@
 1911101840 ./dev-haskell/shelly/shelly-1.6.5.ebuild
 2004132310 ./dev-haskell/shelly/shelly-1.6.6.ebuild
 2004132310 ./dev-haskell/shelly/shelly-1.6.8.1.ebuild
+2008011139 ./dev-haskell/shelly/shelly-1.9.0.ebuild
 1911101840 ./dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
 1911101840 ./dev-haskell/silently/silently-1.2.5.ebuild
 1912141709 ./dev-haskell/silently/silently-1.2.5.1.ebuild
@@ -6918,6 +7228,7 @@
 1911101840 ./dev-haskell/skein/skein-1.0.9.4.ebuild
 1911101840 ./dev-haskell/skylighting/skylighting-0.1.1.5.ebuild
 2004132310 ./dev-haskell/skylighting/skylighting-0.3.ebuild
+2008011139 ./dev-haskell/skylighting/skylighting-0.8.5.ebuild
 2004080039 ./dev-haskell/smallcheck/smallcheck-1.1.5.ebuild
 2004132310 ./dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
 2004132310 ./dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
@@ -6926,15 +7237,19 @@
 2004132310 ./dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
 1911101840 ./dev-haskell/socks/socks-0.5.5.ebuild
 2004132310 ./dev-haskell/socks/socks-0.5.4.ebuild
+2008011139 ./dev-haskell/socks/socks-0.6.1.ebuild
 2006062109 ./dev-haskell/split/split-0.2.2.ebuild
 2006062109 ./dev-haskell/split/split-0.2.3.1.ebuild
 2006062109 ./dev-haskell/split/split-0.2.3.3.ebuild
 2006062109 ./dev-haskell/split/split-0.2.3.ebuild
+2008011139 ./dev-haskell/split/split-0.2.3.4.ebuild
 1907151840 ./dev-haskell/stack-bin/stack-bin-1.5.1.ebuild
 1907151840 ./dev-haskell/stack-bin/stack-bin-1.6.1.ebuild
 1907151840 ./dev-haskell/stack-bin/stack-bin-1.7.1.ebuild
 2002120239 ./dev-haskell/stack-bin/stack-bin-2.1.3.ebuild
+2008011139 ./dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
 1911101840 ./dev-haskell/stack/stack-1.3.2.ebuild
+2008011139 ./dev-haskell/stack/stack-2.3.1.ebuild
 2004080039 ./dev-haskell/statevar/statevar-1.0.1.0.ebuild
 2004080039 ./dev-haskell/statevar/statevar-1.1.0.3.ebuild
 2004080039 ./dev-haskell/statevar/statevar-1.1.1.1.ebuild
@@ -6945,9 +7260,9 @@
 1911101840 ./dev-haskell/statistics/statistics-0.13.2.3.ebuild
 1911101840 ./dev-haskell/statistics/statistics-0.13.3.0.ebuild
 1911101840 ./dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
-2005291009 ./dev-haskell/stm/stm-2.5.0.0.ebuild
 2006072109 ./dev-haskell/stm/stm-2.4.2.ebuild
 2006072109 ./dev-haskell/stm/stm-2.4.4.1.ebuild
+2008011139 ./dev-haskell/stm/stm-2.5.0.0.ebuild
 2006072109 ./dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild
 2006072109 ./dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
 1911101840 ./dev-haskell/store-core/store-core-0.3.ebuild
@@ -6957,8 +7272,10 @@
 1911101840 ./dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
 1911101840 ./dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
 2004132310 ./dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
+2008011139 ./dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
 2004132310 ./dev-haskell/strict/strict-0.3.2.ebuild
 2006072109 ./dev-haskell/string-qq/string-qq-0.0.2.ebuild
+2008011139 ./dev-haskell/string-qq/string-qq-0.0.4.ebuild
 2006072109 ./dev-haskell/stringable/stringable-0.1.3.ebuild
 2006072109 ./dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
 2006072109 ./dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
@@ -6989,6 +7306,7 @@
 1911101840 ./dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
 2004132310 ./dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
 2004132310 ./dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
+2008011139 ./dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
 1911101840 ./dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
 2006072109 ./dev-haskell/tar/tar-0.4.0.1.ebuild
 2006072109 ./dev-haskell/tar/tar-0.4.2.1.ebuild
@@ -7004,10 +7322,12 @@
 2006072109 ./dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild
 2006072109 ./dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild
 2006072109 ./dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
+2008011139 ./dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
 2004132310 ./dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
 1911101840 ./dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
 2004132310 ./dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
 2006072109 ./dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild
+2008011139 ./dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.1.1.ebuild
 1911101840 ./dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild
 1911101840 ./dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
 1912141709 ./dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
@@ -7021,16 +7341,19 @@
 2004132310 ./dev-haskell/tasty/tasty-0.8.1.2.ebuild
 2006072109 ./dev-haskell/tasty/tasty-0.3.1.ebuild
 2006072109 ./dev-haskell/tasty/tasty-0.5.2.ebuild
+2008011139 ./dev-haskell/tasty/tasty-1.2.3.ebuild
 2004132310 ./dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
 1911101840 ./dev-haskell/temporary/temporary-1.2.0.3.ebuild
 2004132310 ./dev-haskell/temporary/temporary-1.1.2.4.ebuild
 2004132310 ./dev-haskell/temporary/temporary-1.2.0.4.ebuild
+2008011139 ./dev-haskell/temporary/temporary-1.3.ebuild
 2004080039 ./dev-haskell/tensor/tensor-1.1.0.1.ebuild
 2004132310 ./dev-haskell/tensor/tensor-1.0.0.1.ebuild
 2006062109 ./dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
 2004132310 ./dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
 2004132310 ./dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
 2004132310 ./dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+2008011139 ./dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
 2004132209 ./dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
 2004132209 ./dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
 2004132310 ./dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
@@ -7052,9 +7375,11 @@
 2004132310 ./dev-haskell/texmath/texmath-0.6.4.ebuild
 2004132310 ./dev-haskell/texmath/texmath-0.8.2.2.ebuild
 2004132310 ./dev-haskell/texmath/texmath-0.9.1.ebuild
+2008021609 ./dev-haskell/texmath/texmath-0.12.0.2.ebuild
 1911101840 ./dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
 2004132310 ./dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
 1911101840 ./dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
+2008011139 ./dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
 1911101840 ./dev-haskell/text-show/text-show-3.4.ebuild
 2004132310 ./dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
 2004132310 ./dev-haskell/text/text-0.11.3.1.ebuild
@@ -7062,15 +7387,18 @@
 2004132209 ./dev-haskell/text/text-1.2.2.0.ebuild
 2004132310 ./dev-haskell/text/text-1.2.2.1.ebuild
 2005271009 ./dev-haskell/text/text-1.2.3.1.ebuild
+2008011739 ./dev-haskell/text/text-1.2.4.0.ebuild
 2006072109 ./dev-haskell/tf-random/tf-random-0.5.ebuild
 1912141609 ./dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
 2004132310 ./dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
 2006072109 ./dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
 1911101840 ./dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
+2008011139 ./dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
 1911101840 ./dev-haskell/th-lift/th-lift-0.7.5.ebuild
 1911101840 ./dev-haskell/th-lift/th-lift-0.7.6.ebuild
 2004132310 ./dev-haskell/th-lift/th-lift-0.7.2.ebuild
 2004132310 ./dev-haskell/th-lift/th-lift-0.7.7.ebuild
+2008011139 ./dev-haskell/th-lift/th-lift-0.8.1.ebuild
 2006062109 ./dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
 2006062109 ./dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
 2006062109 ./dev-haskell/th-orphans/th-orphans-0.8.2.ebuild
@@ -7083,6 +7411,7 @@
 2004132310 ./dev-haskell/threads/threads-0.5.1.4.ebuild
 1911101840 ./dev-haskell/thyme/thyme-0.3.5.5.ebuild
 1911101840 ./dev-haskell/time-compat/time-compat-0.1.0.3.ebuild
+2008011139 ./dev-haskell/time-compat/time-compat-1.9.3.ebuild
 1911101840 ./dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
 1912141609 ./dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
 2004132310 ./dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
@@ -7095,35 +7424,42 @@
 1911101840 ./dev-haskell/tls/tls-1.3.4.ebuild
 1911101840 ./dev-haskell/tls/tls-1.3.9.ebuild
 2004132310 ./dev-haskell/tls/tls-1.2.18.ebuild
+2008011139 ./dev-haskell/tls/tls-1.5.4.ebuild
 1911101840 ./dev-haskell/top/top-1.7.ebuild
 2006062109 ./dev-haskell/torrent/torrent-10000.0.0.ebuild
 2006062109 ./dev-haskell/torrent/torrent-10000.0.1.ebuild
 2006062109 ./dev-haskell/torrent/torrent-10000.1.1.ebuild
 2004132310 ./dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
+2008011139 ./dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
 1911101840 ./dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
 2004080039 ./dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
 2004132310 ./dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
 2004132310 ./dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+2008011139 ./dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
 2006072109 ./dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
 2006072109 ./dev-haskell/transformers/transformers-0.4.1.0.ebuild
 2006072109 ./dev-haskell/transformers/transformers-0.4.2.0.ebuild
 2006072109 ./dev-haskell/transformers/transformers-0.4.3.0.ebuild
 2006072109 ./dev-haskell/transformers/transformers-0.5.2.0.ebuild
+2008011139 ./dev-haskell/transformers/transformers-0.5.6.2.ebuild
 1911101840 ./dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild
 1911101840 ./dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild
 1912141539 ./dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
 2004132310 ./dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
 1911101840 ./dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild
 1911101840 ./dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
+2008011139 ./dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild
 2004132310 ./dev-haskell/uniplate/uniplate-1.6.12.ebuild
 1911101840 ./dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
 2004132310 ./dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
 2004132209 ./dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild
 2004132209 ./dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild
 2004132310 ./dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+2008011139 ./dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
 2006072109 ./dev-haskell/unix-time/unix-time-0.3.5.ebuild
 2006072109 ./dev-haskell/unix-time/unix-time-0.3.6.ebuild
 2006072109 ./dev-haskell/unix-time/unix-time-0.3.7.ebuild
+2008011139 ./dev-haskell/unix-time/unix-time-0.4.7.ebuild
 1911101840 ./dev-haskell/unixutils/unixutils-1.54.1.ebuild
 1911101840 ./dev-haskell/unordered-containers/unordered-containers-0.2.6.0.ebuild
 1911101840 ./dev-haskell/unordered-containers/unordered-containers-0.2.7.1.ebuild
@@ -7140,8 +7476,10 @@
 1911101840 ./dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
 1911101840 ./dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
 1911101840 ./dev-haskell/uuid-types/uuid-types-1.0.3.ebuild
+2008011139 ./dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
 1911101840 ./dev-haskell/uuid/uuid-1.3.11-r2.ebuild
 1911101840 ./dev-haskell/uuid/uuid-1.3.12.ebuild
+2008011139 ./dev-haskell/uuid/uuid-1.3.13-r1.ebuild
 2004080039 ./dev-haskell/uulib/uulib-0.9.24.ebuild
 2004132310 ./dev-haskell/uulib/uulib-0.9.16.ebuild
 2004132310 ./dev-haskell/uulib/uulib-0.9.22.ebuild
@@ -7151,6 +7489,7 @@
 2004132310 ./dev-haskell/vault/vault-0.3.0.3.ebuild
 1911101840 ./dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
 1911101840 ./dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
+2008011139 ./dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
 1911101840 ./dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild
 1911101840 ./dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild
 1911101840 ./dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
@@ -7160,6 +7499,7 @@
 2006072109 ./dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.7.ebuild
 2004132310 ./dev-haskell/vector/vector-0.10.12.3.ebuild
 2004132310 ./dev-haskell/vector/vector-0.11.0.0.ebuild
+2008011139 ./dev-haskell/vector/vector-0.12.1.2.ebuild
 1912141539 ./dev-haskell/void/void-0.7.3.ebuild
 2004132310 ./dev-haskell/void/void-0.6.1.ebuild
 2004132310 ./dev-haskell/void/void-0.7.1.ebuild
@@ -7168,14 +7508,17 @@
 1911101840 ./dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild
 1911101840 ./dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
 1911101840 ./dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild
+2008011139 ./dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild
 1911101840 ./dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
 2004132310 ./dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
 1911101840 ./dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
 1911101840 ./dev-haskell/wai-extra/wai-extra-3.0.18.ebuild
 2004132310 ./dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
 2004132310 ./dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
+2008011139 ./dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild
 2006072109 ./dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
 2006072109 ./dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
+2008011139 ./dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
 1911101840 ./dev-haskell/wai-test/wai-test-1.3.1.1.ebuild
 1911101840 ./dev-haskell/wai-test/wai-test-2.0.0.2.ebuild
 1911101840 ./dev-haskell/wai-test/wai-test-3.0.0.ebuild
@@ -7185,18 +7528,23 @@
 2004132310 ./dev-haskell/wai/wai-1.4.0.2.ebuild
 2004132310 ./dev-haskell/wai/wai-2.0.0.ebuild
 2004132310 ./dev-haskell/wai/wai-3.0.3.0.ebuild
+2008011139 ./dev-haskell/wai/wai-3.2.2.1.ebuild
 1911101840 ./dev-haskell/warp-tls/warp-tls-3.1.5.ebuild
 1911101840 ./dev-haskell/warp-tls/warp-tls-3.2.3.ebuild
 2004132310 ./dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
+2008011139 ./dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
 1911101840 ./dev-haskell/warp/warp-3.1.10.ebuild
 1911101840 ./dev-haskell/warp/warp-3.2.11.ebuild
 2004132310 ./dev-haskell/warp/warp-3.0.13.1.ebuild
+2008011139 ./dev-haskell/warp/warp-3.3.13.ebuild
 1911101840 ./dev-haskell/wavy/wavy-0.1.0.0.ebuild
 2004132310 ./dev-haskell/weigh/weigh-0.0.3.ebuild
+2008011139 ./dev-haskell/weigh/weigh-0.0.16.ebuild
 1911101840 ./dev-haskell/with-location/with-location-0.0.0.ebuild
 2004132310 ./dev-haskell/with-location/with-location-0.1.0.ebuild
 2006072109 ./dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
 2006072109 ./dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
+2008011139 ./dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
 2006072109 ./dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
 2006072109 ./dev-haskell/wl-pprint/wl-pprint-1.2.ebuild
 2006072109 ./dev-haskell/word8/word8-0.1.2.ebuild
@@ -7211,29 +7559,37 @@
 2004080039 ./dev-haskell/x11/x11-1.6.1.2.ebuild
 2004132310 ./dev-haskell/x11/x11-1.6.1.1.ebuild
 2004132310 ./dev-haskell/x11/x11-1.8-r1.ebuild
+2008011139 ./dev-haskell/x11/x11-1.9.1.ebuild
 1911101840 ./dev-haskell/x509-store/x509-store-1.6.1.ebuild
 1911101840 ./dev-haskell/x509-store/x509-store-1.6.2.ebuild
 1912110241 ./dev-haskell/x509-store/x509-store-1.4.4.ebuild
 2004132310 ./dev-haskell/x509-store/x509-store-1.5.0.ebuild
+2008011139 ./dev-haskell/x509-store/x509-store-1.6.7.ebuild
 1911101840 ./dev-haskell/x509-system/x509-system-1.4.5.ebuild
 1911101840 ./dev-haskell/x509-system/x509-system-1.6.3.ebuild
 1911101840 ./dev-haskell/x509-system/x509-system-1.6.4.ebuild
 2004132310 ./dev-haskell/x509-system/x509-system-1.5.0.ebuild
+2008011139 ./dev-haskell/x509-system/x509-system-1.6.6.ebuild
 1911101840 ./dev-haskell/x509-validation/x509-validation-1.6.3.ebuild
 1911101840 ./dev-haskell/x509-validation/x509-validation-1.6.5.ebuild
 2004132310 ./dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
+2008011139 ./dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
 1911101840 ./dev-haskell/x509/x509-1.4.11.ebuild
 1911101840 ./dev-haskell/x509/x509-1.6.3.ebuild
 1911101840 ./dev-haskell/x509/x509-1.6.5.ebuild
 2004132310 ./dev-haskell/x509/x509-1.5.1.ebuild
+2008011139 ./dev-haskell/x509/x509-1.7.5.ebuild
 2004132310 ./dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+2008012239 ./dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
 1911101840 ./dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild
 1911101840 ./dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild
 1911101840 ./dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
 2004132310 ./dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
 2004132310 ./dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
+2008011139 ./dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
 1911101840 ./dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild
 1911101840 ./dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild
+2008011139 ./dev-haskell/xml-hamlet/xml-hamlet-0.5.0.1.ebuild
 2004132310 ./dev-haskell/xml-types/xml-types-0.3.4.ebuild
 2004132209 ./dev-haskell/xml-types/xml-types-0.3.6.ebuild
 2004132310 ./dev-haskell/xml/xml-1.3.13.ebuild
@@ -7248,25 +7604,31 @@
 1911101840 ./dev-haskell/yaml/yaml-0.8.20.ebuild
 1911101840 ./dev-haskell/yaml/yaml-0.8.21.2.ebuild
 2004132310 ./dev-haskell/yaml/yaml-0.8.10.1.ebuild
+2008011139 ./dev-haskell/yaml/yaml-0.11.2.0.ebuild
 1911101840 ./dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild
 1911101840 ./dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild
+2008011139 ./dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
 1911101840 ./dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild
 1911101840 ./dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild
 1911101840 ./dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild
+2008011139 ./dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
 1911101840 ./dev-haskell/yesod-core/yesod-core-1.2.7.ebuild
 1911101840 ./dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
 1911101840 ./dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild
 1911101840 ./dev-haskell/yesod-core/yesod-core-1.4.25.ebuild
 1911101840 ./dev-haskell/yesod-core/yesod-core-1.4.31.ebuild
+2008011139 ./dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
 1911101840 ./dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
 1911101840 ./dev-haskell/yesod-form/yesod-form-1.4.10.ebuild
 1911101840 ./dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild
 1911101840 ./dev-haskell/yesod-form/yesod-form-1.4.8.ebuild
+2008011139 ./dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
 1911101840 ./dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild
 1911101840 ./dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
 1911101840 ./dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild
 1911101840 ./dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild
 1911101840 ./dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild
+2008011139 ./dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
 1911101840 ./dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild
 1911101840 ./dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild
 1911101840 ./dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
@@ -7275,17 +7637,21 @@
 1911101840 ./dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
 1911101840 ./dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild
 1911101840 ./dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild
+2008011139 ./dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.5.3.ebuild
 1911101840 ./dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild
+2008011139 ./dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
 1911101840 ./dev-haskell/yesod/yesod-1.4.3.ebuild
 1911101840 ./dev-haskell/yesod/yesod-1.4.4.ebuild
+2008011139 ./dev-haskell/yesod/yesod-1.6.0.2.ebuild
 1912141439 ./dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
 2004132310 ./dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
 2004132310 ./dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+2008011139 ./dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
 2004132310 ./dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
 2004132310 ./dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
 2004132310 ./dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
@@ -7300,6 +7666,104 @@
 2001211209 ./dev-haskell/foundation/foundation-0.0.25.ebuild
 2006072109 ./dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
 2005300009 ./dev-haskell/parsec1/parsec1-1.0.0.6.ebuild
+2008011139 ./dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
+2008011139 ./dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
+2008011139 ./dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
+2008011139 ./dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+2008011139 ./dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
+2008011139 ./dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
+2008011139 ./dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4.ebuild
+2008011139 ./dev-haskell/call-stack/call-stack-0.1.0.ebuild
+2008011139 ./dev-haskell/call-stack/call-stack-0.2.0.ebuild
+2008011139 ./dev-haskell/casa-client/casa-client-0.0.1.ebuild
+2008011139 ./dev-haskell/casa-types/casa-types-0.0.1.ebuild
+2008011139 ./dev-haskell/charset/charset-0.3.7.1-r1.ebuild
+2008011139 ./dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
+2008011139 ./dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
+2008011139 ./dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
+2008011139 ./dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
+2008011139 ./dev-haskell/cryptohash-md5/cryptohash-md5-0.11.100.1.ebuild
+2008011139 ./dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.100.1.ebuild
+2008011139 ./dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
+2008011139 ./dev-haskell/dec/dec-0.0.3.ebuild
+2008011139 ./dev-haskell/doclayout/doclayout-0.3.ebuild
+2008011139 ./dev-haskell/drbg/drbg-0.5.5.ebuild
+2008011139 ./dev-haskell/echo/echo-0.1.3.ebuild
+2008011139 ./dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
+2008011139 ./dev-haskell/emojis/emojis-0.1.ebuild
+2008011139 ./dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
+2008011139 ./dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
+2008011139 ./dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
+2008011139 ./dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
+2008011139 ./dev-haskell/githash/githash-0.1.3.3.ebuild
+2008011139 ./dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
+2008011139 ./dev-haskell/hans/hans-3.0.1.ebuild
+2008011139 ./dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
+2008011139 ./dev-haskell/heaps/heaps-0.3.6.1.ebuild
+2008011139 ./dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild
+2008011139 ./dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
+2008011139 ./dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
+2008011139 ./dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
+2008011139 ./dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
+2008011139 ./dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
+2008011139 ./dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
+2008011139 ./dev-haskell/http-download/http-download-0.2.0.0.ebuild
+2008011139 ./dev-haskell/infer-license/infer-license-0.2.0.ebuild
+2008011139 ./dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
+2008011139 ./dev-haskell/invariant/invariant-0.5.3.ebuild
+2008011139 ./dev-haskell/ipynb/ipynb-0.1.ebuild
+2008011139 ./dev-haskell/iwlib/iwlib-0.1.0.ebuild
+2008011139 ./dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
+2008011139 ./dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
+2008011139 ./dev-haskell/libyaml/libyaml-0.1.2.ebuild
+2008011139 ./dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
+2008011139 ./dev-haskell/lukko/lukko-0.1.1.2.ebuild
+2008011139 ./dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
+2008011139 ./dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
+2008011139 ./dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
+2008011139 ./dev-haskell/mintty/mintty-0.1.2.ebuild
+2008011139 ./dev-haskell/monadlib/monadlib-3.10.ebuild
+2008011139 ./dev-haskell/mustache/mustache-2.3.1.ebuild
+2008011139 ./dev-haskell/netlink/netlink-1.1.1.0.ebuild
+2008011139 ./dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
+2008011139 ./dev-haskell/network-byte-order/network-byte-order-0.1.4.0.ebuild
+2008011139 ./dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
+2008011139 ./dev-haskell/pantry/pantry-0.4.0.1.ebuild
+2008011139 ./dev-haskell/parsers/parsers-0.12.10.ebuild
+2008011139 ./dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
+2008011139 ./dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
+2008011139 ./dev-haskell/rebase/rebase-1.4.1.ebuild
+2008011139 ./dev-haskell/rerebase/rerebase-1.4.1.ebuild
+2008011139 ./dev-haskell/resolv/resolv-0.1.2.0.ebuild
+2008011139 ./dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
+2008011139 ./dev-haskell/rio-prettyprint/rio-prettyprint-0.1.0.0.ebuild
+2008011139 ./dev-haskell/rio/rio-0.1.17.0.ebuild
+2008011139 ./dev-haskell/rsa/rsa-2.3.1.ebuild
+2008011139 ./dev-haskell/selective/selective-0.3.ebuild
+2008011139 ./dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
+2008011139 ./dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild
+2008011139 ./dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
+2008011139 ./dev-haskell/splitmix/splitmix-0.0.4.ebuild
+2008012309 ./dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
+2008011139 ./dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
+2008011139 ./dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild
+2008011139 ./dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
+2008011139 ./dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
+2008011139 ./dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
+2008011139 ./dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
+2008011139 ./dev-haskell/time-manager/time-manager-0.0.0.ebuild
+2008011139 ./dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
+2008011139 ./dev-haskell/tree-diff/tree-diff-0.1.ebuild
+2008011139 ./dev-haskell/trifecta/trifecta-2.1.ebuild
+2008011139 ./dev-haskell/type-equality/type-equality-1.ebuild
+2008011139 ./dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
+2008011139 ./dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
+2008011139 ./dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
+2008011139 ./dev-haskell/validity/validity-0.9.0.3.ebuild
+2008011139 ./dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
+2008011139 ./dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+2008011139 ./dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
+2008011139 ./dev-haskell/wreq/wreq-0.5.3.2.ebuild
 1702282250 ./dev-java/absolutelayout/absolutelayout-6.7_beta-r1.ebuild
 1702282250 ./dev-java/airline/airline-0.7-r1.ebuild
 1804082208 ./dev-java/android-util/android-util-4.1.1.4.ebuild
@@ -7851,6 +8315,7 @@
 2006020138 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
 2007152109 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
 2007162209 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
+2008010139 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
 2005110809 ./dev-java/openjdk/openjdk-11.0.7_p10.ebuild
 2005240709 ./dev-java/openjdk/openjdk-8.252_p09.ebuild
 2007150109 ./dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -8098,7 +8563,7 @@
 2005230938 ./dev-lang/ghc/ghc-8.8.1.ebuild
 2005230938 ./dev-lang/ghc/ghc-8.8.2.ebuild
 2005230938 ./dev-lang/ghc/ghc-8.8.3.ebuild
-2007241039 ./dev-lang/ghc/ghc-8.8.4.ebuild
+2008011139 ./dev-lang/ghc/ghc-8.8.4.ebuild
 2004131439 ./dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
 2006121109 ./dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
 2006220009 ./dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -8198,7 +8663,7 @@
 2006270009 ./dev-lang/mujs/mujs-1.0.7.ebuild
 2007220239 ./dev-lang/nasm/nasm-2.14.02.ebuild
 2007220239 ./dev-lang/nasm/nasm-2.15.03.ebuild
-2006272209 ./dev-lang/nim/nim-1.2.4.ebuild
+2008010209 ./dev-lang/nim/nim-1.2.6.ebuild
 2002112051 ./dev-lang/nqp/nqp-2019.03-r1.ebuild
 2002112051 ./dev-lang/nqp/nqp-2019.07.1.ebuild
 2002112051 ./dev-lang/nqp/nqp-2019.11.ebuild
@@ -8241,23 +8706,15 @@
 1912111539 ./dev-lang/polyml/polyml-5.8.ebuild
 2001040009 ./dev-lang/python-exec/python-exec-9999.ebuild
 2004211009 ./dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
-2005072039 ./dev-lang/python/python-3.7.7-r2.ebuild
-2006082009 ./dev-lang/python/python-2.7.18.ebuild
-2006092039 ./dev-lang/python/python-3.8.2-r2.ebuild
 2006101009 ./dev-lang/python/python-3.9.0_beta3.ebuild
-2006202209 ./dev-lang/python/python-3.6.10-r2.ebuild
-2007142139 ./dev-lang/python/python-3.8.4.ebuild
 2007142139 ./dev-lang/python/python-3.9.0_beta4.ebuild
 2007190739 ./dev-lang/python/python-3.9.0_beta4-r1.ebuild
-2007201009 ./dev-lang/python/python-3.7.8-r1.ebuild
 2007212039 ./dev-lang/python/python-2.7.18-r1.ebuild
 2007211609 ./dev-lang/python/python-3.8.5.ebuild
 2007211609 ./dev-lang/python/python-3.9.0_beta5.ebuild
 2007222309 ./dev-lang/python/python-3.6.11-r2.ebuild
 2007222309 ./dev-lang/python/python-3.7.8-r2.ebuild
 2007222309 ./dev-lang/python/python-3.8.4-r1.ebuild
-2007310009 ./dev-lang/python/python-3.6.11-r1.ebuild
-2007310009 ./dev-lang/python/python-3.8.3-r1.ebuild
 2006251009 ./dev-lang/qu-prolog/qu-prolog-10.5.ebuild
 2007191109 ./dev-lang/qu-prolog/qu-prolog-10.4.ebuild
 1912110241 ./dev-lang/rakudo/rakudo-2019.03.ebuild
@@ -8345,6 +8802,8 @@
 2006291909 ./dev-lang/vala/vala-0.48.6.ebuild
 2007041909 ./dev-lang/vala/vala-0.46.11.ebuild
 2007041909 ./dev-lang/vala/vala-0.48.7.ebuild
+2007312139 ./dev-lang/vala/vala-0.46.12.ebuild
+2007312139 ./dev-lang/vala/vala-0.48.8.ebuild
 1911101840 ./dev-lang/whitespace/whitespace-0.4.ebuild
 1902082309 ./dev-lang/xsb/xsb-3.6.0-r1.ebuild
 1902082309 ./dev-lang/xsb/xsb-3.7.0-r1.ebuild
@@ -8404,7 +8863,7 @@
 2004032241 ./dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
 1912110241 ./dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
 2004090009 ./dev-libs/boost/boost-1.72.0-r1.ebuild
-2006232238 ./dev-libs/boost/boost-1.73.0.ebuild
+2008021339 ./dev-libs/boost/boost-1.73.0.ebuild
 2002110009 ./dev-libs/botan/botan-2.9.0.ebuild
 2005302239 ./dev-libs/botan/botan-2.14.0-r1.ebuild
 2007152109 ./dev-libs/botan/botan-2.15.0.ebuild
@@ -8583,8 +9042,8 @@
 2007241509 ./dev-libs/json-c/json-c-9999.ebuild
 2006132027 ./dev-libs/json-glib/json-glib-1.4.4.ebuild
 2005031339 ./dev-libs/jsoncpp/jsoncpp-1.9.3_pre20200412.ebuild
-2005301039 ./dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
 2006081209 ./dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+2008011239 ./dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
 1912081509 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
 2007192139 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
 2006041239 ./dev-libs/jthread/jthread-1.3.3.ebuild
@@ -8653,7 +9112,8 @@
 2007050339 ./dev-libs/libbulletml/libbulletml-0.0.6.ebuild
 2006081939 ./dev-libs/libburn/libburn-1.5.2_p1.ebuild
 2004222009 ./dev-libs/libbytesize/libbytesize-2.2.ebuild
-2005211409 ./dev-libs/libbytesize/libbytesize-2.3.ebuild
+2008021609 ./dev-libs/libbytesize/libbytesize-2.3.ebuild
+2007311439 ./dev-libs/libbytesize/libbytesize-2.4.ebuild
 2003261841 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
 2003261841 ./dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
 2004032241 ./dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -8691,6 +9151,8 @@
 2006081209 ./dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
 2002112051 ./dev-libs/libdnet/libdnet-1.12-r1.ebuild
 2004032241 ./dev-libs/libdnet/libdnet-1.12.ebuild
+2008021839 ./dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild
+2008021839 ./dev-libs/libdnet/libdnet-9999.ebuild
 1805061738 ./dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
 2001051839 ./dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
 2002182239 ./dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -8747,10 +9209,8 @@
 2001051415 ./dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
 2001262109 ./dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
 2006040939 ./dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
-2004131809 ./dev-libs/libgit2/libgit2-0.28.4.ebuild
-2006062238 ./dev-libs/libgit2/libgit2-1.0.0-r1.ebuild
-2007260739 ./dev-libs/libgit2/libgit2-0.28.5.ebuild
-2007260739 ./dev-libs/libgit2/libgit2-1.0.1.ebuild
+2008011209 ./dev-libs/libgit2/libgit2-0.28.5.ebuild
+2008011209 ./dev-libs/libgit2/libgit2-1.0.1.ebuild
 2003151539 ./dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
 2003261841 ./dev-libs/libgpg-error/libgpg-error-1.37.ebuild
 2004032241 ./dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -8879,7 +9339,7 @@
 2004301039 ./dev-libs/libpwquality/libpwquality-1.4.2.ebuild
 2005210239 ./dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
 2005210239 ./dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
-2005210239 ./dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
+2007311939 ./dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
 1912110241 ./dev-libs/libratbag/libratbag-0.9.ebuild
 2007262138 ./dev-libs/librdkafka/librdkafka-1.4.4.ebuild
 2007262138 ./dev-libs/librdkafka/librdkafka-1.5.0.ebuild
@@ -9271,6 +9731,7 @@
 2006080009 ./dev-libs/vala-common/vala-common-0.46.7.ebuild
 2006291909 ./dev-libs/vala-common/vala-common-0.48.6.ebuild
 2007041909 ./dev-libs/vala-common/vala-common-0.48.7.ebuild
+2007312139 ./dev-libs/vala-common/vala-common-0.48.8.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.0.ebuild
 2006021208 ./dev-libs/vc/vc-1.3.3.ebuild
 2006021208 ./dev-libs/vc/vc-1.4.1.ebuild
@@ -9339,7 +9800,7 @@
 2006301709 ./dev-libs/libudfread/libudfread-1.1.0.ebuild
 2004240039 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
 2006041708 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
-2007241139 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.0.ebuild
+2007311809 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
 2007171839 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
 2005290339 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
 2006150539 ./dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -9408,7 +9869,7 @@
 1907291809 ./dev-lua/ldoc/ldoc-1.4.6.ebuild
 1912110241 ./dev-lua/lgi/lgi-0.9.0-r1.ebuild
 1912110241 ./dev-lua/lgi/lgi-0.9.0.ebuild
-1912110241 ./dev-lua/lgi/lgi-0.9.2.ebuild
+2008021509 ./dev-lua/lgi/lgi-0.9.2.ebuild
 2004171939 ./dev-lua/lpeg/lpeg-1.0.2.ebuild
 2004231939 ./dev-lua/lpeg/lpeg-1.0.1.ebuild
 1912110241 ./dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild
@@ -9943,7 +10404,6 @@
 2005071609 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.4.280.ebuild
 2006261538 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.6.200.ebuild
 2007240409 ./dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.7.170.ebuild
-1912110241 ./dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.13.ebuild
 2006261538 ./dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild
 2005071709 ./dev-perl/CQL-Parser/CQL-Parser-1.130.0-r1.ebuild
 1703141724 ./dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r1.ebuild
@@ -10072,14 +10532,12 @@
 2004032241 ./dev-perl/Compress-Bzip2/Compress-Bzip2-2.260.0.ebuild
 2006270139 ./dev-perl/Compress-Bzip2/Compress-Bzip2-2.270.0.ebuild
 2007240339 ./dev-perl/Compress-Bzip2/Compress-Bzip2-2.280.0.ebuild
-1811032309 ./dev-perl/Compress-LZF/Compress-LZF-3.800.0.ebuild
 2006270139 ./dev-perl/Compress-LZF/Compress-LZF-3.800.0-r1.ebuild
 2007052209 ./dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r1.ebuild
 2007132009 ./dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0.ebuild
 1912110241 ./dev-perl/Config-Any/Config-Any-0.320.0.ebuild
 2004032241 ./dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r1.ebuild
 2006270509 ./dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r2.ebuild
-1912110241 ./dev-perl/Config-Auto/Config-Auto-0.440.0.ebuild
 2006270909 ./dev-perl/Config-Auto/Config-Auto-0.440.0-r1.ebuild
 1912110241 ./dev-perl/Config-AutoConf/Config-AutoConf-0.315.0.ebuild
 2006271009 ./dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild
@@ -10090,10 +10548,8 @@
 1912110241 ./dev-perl/Config-INI/Config-INI-0.25.0.ebuild
 1912110241 ./dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
 2006271209 ./dev-perl/Config-IniFiles/Config-IniFiles-3.0.3.ebuild
-1912110241 ./dev-perl/Config-JSON/Config-JSON-1.520.200.ebuild
 2006271239 ./dev-perl/Config-JSON/Config-JSON-1.520.200-r1.ebuild
 1912110241 ./dev-perl/Config-MVP-Reader-INI/Config-MVP-Reader-INI-2.101.463.ebuild
-1912110241 ./dev-perl/Config-MVP/Config-MVP-2.200.10.ebuild
 2006271309 ./dev-perl/Config-MVP/Config-MVP-2.200.11.ebuild
 1912110241 ./dev-perl/Config-Properties/Config-Properties-1.800.0.ebuild
 2006302009 ./dev-perl/Config-Properties/Config-Properties-1.800.0-r1.ebuild
@@ -10104,7 +10560,6 @@
 2004032241 ./dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
 1912110241 ./dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
 2006281809 ./dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
-1912110241 ./dev-perl/Context-Preserve/Context-Preserve-0.20.0.ebuild
 2006281809 ./dev-perl/Context-Preserve/Context-Preserve-0.30.0.ebuild
 1912110241 ./dev-perl/Contextual-Return/Contextual-Return-0.4.14.ebuild
 2004032241 ./dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r1.ebuild
@@ -10468,12 +10923,17 @@
 2007181409 ./dev-perl/Dist-Metadata/Dist-Metadata-0.927.0.ebuild
 1707070124 ./dev-perl/Dist-Zilla-Plugin-AuthorsFromGit/Dist-Zilla-Plugin-AuthorsFromGit-0.6.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-Config-Git/Dist-Zilla-Plugin-Config-Git-0.920.0.ebuild
+2007311409 ./dev-perl/Dist-Zilla-Plugin-Config-Git/Dist-Zilla-Plugin-Config-Git-0.920.0-r1.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.42.0-r1.ebuild
+2008010139 ./dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.46.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.390.0.ebuild
+2008011439 ./dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-MetaProvides-Package/Dist-Zilla-Plugin-MetaProvides-Package-2.4.3.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-MetaProvides/Dist-Zilla-Plugin-MetaProvides-2.2.4.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.8.0.ebuild
+2008011839 ./dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.11.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.120.0.ebuild
+2008011939 ./dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Dist-Zilla-Plugin-OurPkgVersion-0.210.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-PodWeaver/Dist-Zilla-Plugin-PodWeaver-4.8.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-RPM/Dist-Zilla-Plugin-RPM-0.15.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver/Dist-Zilla-Plugin-SurgicalPodWeaver-0.2.300.ebuild
@@ -10481,6 +10941,7 @@
 1912110241 ./dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic/Dist-Zilla-Plugin-Test-Perl-Critic-3.1.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla-Role-ModuleMetadata/Dist-Zilla-Role-ModuleMetadata-0.4.0.ebuild
 1912110241 ./dev-perl/Dist-Zilla/Dist-Zilla-6.10.0-r2.ebuild
+2007311309 ./dev-perl/Dist-Zilla/Dist-Zilla-6.15.0.ebuild
 1912110241 ./dev-perl/Dumbbench/Dumbbench-0.111.0.ebuild
 2003261841 ./dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
 1809012209 ./dev-perl/EV/EV-4.220.0.ebuild
@@ -11800,6 +12261,7 @@
 2004162009 ./dev-perl/Dist-Zilla-Plugin-ContributorsFile/Dist-Zilla-Plugin-ContributorsFile-0.3.0.ebuild
 2004162009 ./dev-perl/Dist-Zilla-Plugin-Git-Contributors/Dist-Zilla-Plugin-Git-Contributors-0.35.0.ebuild
 2004162009 ./dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Dist-Zilla-Plugin-Meta-Contributors-0.3.0.ebuild
+2008011539 ./dev-perl/Dist-Zilla-Plugin-Meta-Contributors/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1.ebuild
 2004162009 ./dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5.ebuild
 2004162009 ./dev-perl/Dist-Zilla-Plugin-Run/Dist-Zilla-Plugin-Run-0.48.0.ebuild
 2004162009 ./dev-perl/Dist-Zilla-Plugin-Test-CPAN-Changes/Dist-Zilla-Plugin-Test-CPAN-Changes-0.12.0.ebuild
@@ -11813,8 +12275,9 @@
 2005031809 ./dev-perl/Dist-Zilla-Plugin-CheckChangesHasContent/Dist-Zilla-Plugin-CheckChangesHasContent-0.11.0.ebuild
 2005031809 ./dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild/Dist-Zilla-Plugin-CopyFilesFromBuild-0.170.880.ebuild
 2005031809 ./dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Dist-Zilla-Plugin-CopyFilesFromRelease-0.6.0.ebuild
+2007311509 ./dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0.ebuild
 2005031809 ./dev-perl/Dist-Zilla-Plugin-GithubMeta/Dist-Zilla-Plugin-GithubMeta-0.580.0.ebuild
-2005032039 ./dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild
+2008011339 ./dev-perl/Dist-Zilla-Plugin-LicenseFromModule/Dist-Zilla-Plugin-LicenseFromModule-0.70.0.ebuild
 2005032039 ./dev-perl/Dist-Zilla-Plugin-ModuleBuildTiny/Dist-Zilla-Plugin-ModuleBuildTiny-0.15.0.ebuild
 2005031809 ./dev-perl/Dist-Zilla-Plugin-NameFromDirectory/Dist-Zilla-Plugin-NameFromDirectory-0.40.0.ebuild
 2005032039 ./dev-perl/Dist-Zilla-Plugin-Prereqs-FromCPANfile/Dist-Zilla-Plugin-Prereqs-FromCPANfile-0.80.0.ebuild
@@ -11837,6 +12300,7 @@
 2007100109 ./dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
 2007120339 ./dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
 2007091409 ./dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild
+2008010139 ./dev-perl/Types-Path-Tiny/Types-Path-Tiny-0.6.0.ebuild
 1806072239 ./dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
@@ -12234,12 +12698,12 @@
 2002112051 ./dev-python/PyECLib/PyECLib-1.6.0.ebuild
 2007081609 ./dev-python/PyGithub/PyGithub-1.51.ebuild
 2004150609 ./dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
-2006092339 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.22.ebuild
-2006092239 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.23.ebuild
-2006092339 ./dev-python/PyQt5/PyQt5-5.14.2.ebuild
-2006110509 ./dev-python/PyQt5/PyQt5-5.15.0.ebuild
-2006102209 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
-2007310809 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+2008020239 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
+2008020239 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild
+2008020239 ./dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
+2008020239 ./dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild
+2008020239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+2008020239 ./dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
 2007310039 ./dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
 2007121009 ./dev-python/PySDL2/PySDL2-0.9.7.ebuild
 1912281939 ./dev-python/PySensors/PySensors-0.0.4.ebuild
@@ -12264,10 +12728,10 @@
 2007200609 ./dev-python/aiohttp/aiohttp-3.6.2.ebuild
 2003251909 ./dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
 2001122309 ./dev-python/aiosmtpd/aiosmtpd-1.2.ebuild
-2005311939 ./dev-python/alabaster/alabaster-0.7.12.ebuild
+2008020009 ./dev-python/alabaster/alabaster-0.7.12.ebuild
 2005302109 ./dev-python/alembic/alembic-1.4.2.ebuild
 2001290039 ./dev-python/algopy/algopy-0.5.3.ebuild
-2001051415 ./dev-python/amodem/amodem-1.15.0.ebuild
+2008020709 ./dev-python/amodem/amodem-1.15.1.ebuild
 2007081609 ./dev-python/aniso8601/aniso8601-8.0.0.ebuild
 2007081639 ./dev-python/ansi/ansi-0.1.5.ebuild
 2007081639 ./dev-python/ansi2html/ansi2html-1.5.2-r1.ebuild
@@ -12281,8 +12745,8 @@
 2007081609 ./dev-python/appdirs/appdirs-1.4.4.ebuild
 2003192109 ./dev-python/apsw/apsw-3.25.2_p1.ebuild
 2007200839 ./dev-python/apsw/apsw-3.32.2_p1.ebuild
-2007120609 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
 2007122339 ./dev-python/argcomplete/argcomplete-1.12.0.ebuild
+2008012239 ./dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
 2006031008 ./dev-python/argh/argh-0.26.2-r2.ebuild
 2007201209 ./dev-python/args/args-0.1.0-r1.ebuild
 2007171109 ./dev-python/arpeggio/arpeggio-1.9.2.ebuild
@@ -12303,8 +12767,8 @@
 2007202039 ./dev-python/autobahn/autobahn-20.7.1.ebuild
 2007081639 ./dev-python/automat/automat-20.2.0.ebuild
 2002041639 ./dev-python/automaton/automaton-1.12.1.ebuild
-2001051415 ./dev-python/autopep8/autopep8-9999.ebuild
-2006010338 ./dev-python/autopep8/autopep8-1.4.4.ebuild
+2008020039 ./dev-python/autopep8/autopep8-1.4.4.ebuild
+2008020039 ./dev-python/autopep8/autopep8-9999.ebuild
 2007302309 ./dev-python/aws-sam-translator/aws-sam-translator-1.25.0.ebuild
 2007302309 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.6.0.ebuild
 2006012238 ./dev-python/awscli/awscli-1.18.70.ebuild
@@ -12315,10 +12779,10 @@
 2001182209 ./dev-python/backports-csv/backports-csv-1.0.7.ebuild
 2004181309 ./dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.6.1.ebuild
 2007041839 ./dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
-2004032241 ./dev-python/backports-os/backports-os-0.1.1.ebuild
+2008020109 ./dev-python/backports-os/backports-os-0.1.1.ebuild
 2005082339 ./dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
-2004211009 ./dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
-2005082339 ./dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
+2008020109 ./dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild
+2008020109 ./dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
 2004211009 ./dev-python/backports/backports-1.0.ebuild
 2003131309 ./dev-python/bandit/bandit-1.5.1-r1.ebuild
 2003131309 ./dev-python/bandit/bandit-1.6.2.ebuild
@@ -12369,7 +12833,7 @@
 2007142009 ./dev-python/brotlipy/brotlipy-0.7.0-r2.ebuild
 2006272339 ./dev-python/brython/brython-3.7.3.ebuild
 2007010939 ./dev-python/brython/brython-3.7.4.ebuild
-2006181539 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
+2008020039 ./dev-python/bsddb3/bsddb3-6.2.7.ebuild
 2003020909 ./dev-python/cached-property/cached-property-1.5.1.ebuild
 2004201209 ./dev-python/cachelib/cachelib-0.1.ebuild
 2007151139 ./dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -12377,7 +12841,7 @@
 2006062109 ./dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
 2006051939 ./dev-python/cairocffi/cairocffi-1.1.0.ebuild
 2006290009 ./dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
-2006040939 ./dev-python/cangjie/cangjie-1.3.ebuild
+2008011539 ./dev-python/cangjie/cangjie-1.3-r1.ebuild
 2006092339 ./dev-python/capturer/capturer-2.4.ebuild
 2005091339 ./dev-python/carbon/carbon-1.1.5.ebuild
 2002041709 ./dev-python/case/case-1.5.3.ebuild
@@ -12395,17 +12859,14 @@
 2006040939 ./dev-python/chai/chai-1.1.2.ebuild
 2007070939 ./dev-python/chameleon/chameleon-3.8.1.ebuild
 2007302309 ./dev-python/chameleon/chameleon-3.7.4.ebuild
-2006161139 ./dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+2008020109 ./dev-python/characteristic/characteristic-14.3.0-r3.ebuild
 2005252239 ./dev-python/chardet/chardet-3.0.4.ebuild
-2002122139 ./dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
+2008010139 ./dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
 2004032241 ./dev-python/cheetah/cheetah-2.4.4-r1.ebuild
 2006201739 ./dev-python/cheetah3/cheetah3-3.2.4.ebuild
-2007140239 ./dev-python/cheroot/cheroot-8.3.0.ebuild
 2007211139 ./dev-python/cheroot/cheroot-8.3.1.ebuild
-2007240239 ./dev-python/cheroot/cheroot-8.4.0.ebuild
-2007270909 ./dev-python/cheroot/cheroot-8.4.1.ebuild
 2007280609 ./dev-python/cheroot/cheroot-8.4.2.ebuild
-2007300739 ./dev-python/cheroot/cheroot-8.3.0-r1.ebuild
+2008011209 ./dev-python/cheroot/cheroot-8.3.0-r1.ebuild
 2007310009 ./dev-python/cherrypy/cherrypy-18.6.0.ebuild
 2004232139 ./dev-python/chump/chump-1.6.0.ebuild
 2004061139 ./dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -12476,9 +12937,10 @@
 2005032209 ./dev-python/cssselect2/cssselect2-0.3.0.ebuild
 2003071909 ./dev-python/cssutils/cssutils-1.0.2-r2.ebuild
 2004032241 ./dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+2008020009 ./dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
 2001131309 ./dev-python/cursive/cursive-0.2.2.ebuild
 2006021508 ./dev-python/curtsies/curtsies-0.3.0-r2.ebuild
-2005140009 ./dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+2008010139 ./dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
 2005111309 ./dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
 2001051415 ./dev-python/cycler/cycler-0.10.0.ebuild
 2006051909 ./dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -12488,6 +12950,7 @@
 2003251909 ./dev-python/cytoolz/cytoolz-0.10.0.ebuild
 2007081709 ./dev-python/daemonize/daemonize-2.5.0.ebuild
 2001171109 ./dev-python/dask/dask-1.2.0.ebuild
+2008011339 ./dev-python/dask/dask-2.22.0.ebuild
 2006060209 ./dev-python/dbus-python/dbus-python-1.2.16.ebuild
 2007151839 ./dev-python/dbusmock/dbusmock-0.18.3.ebuild
 2007152209 ./dev-python/dbusmock/dbusmock-0.19.ebuild
@@ -12495,8 +12958,8 @@
 2003162209 ./dev-python/debtcollector/debtcollector-1.21.0.ebuild
 2005261339 ./dev-python/decorator/decorator-4.4.2.ebuild
 2006042039 ./dev-python/defcon/defcon-0.6.0-r1.ebuild
-2004032241 ./dev-python/defusedxml/defusedxml-0.6.0.ebuild
-2006091839 ./dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+2008020209 ./dev-python/defusedxml/defusedxml-0.6.0.ebuild
+2008020209 ./dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
 2007091339 ./dev-python/denonavr/denonavr-0.9.4.ebuild
 2007081609 ./dev-python/deprecated/deprecated-1.2.10.ebuild
 2003251909 ./dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -12519,7 +12982,7 @@
 2003120109 ./dev-python/django-mptt/django-mptt-0.11.0.ebuild
 2007151309 ./dev-python/django-otp/django-otp-0.9.3.ebuild
 2003140139 ./dev-python/django-prometheus/django-prometheus-2.0.0.ebuild
-1912281939 ./dev-python/django-redis/django-redis-4.10.0.ebuild
+2008020739 ./dev-python/django-redis/django-redis-4.10.0.ebuild
 2003120139 ./dev-python/django-rq/django-rq-2.3.0.ebuild
 2005181440 ./dev-python/django-sortedm2m/django-sortedm2m-2.0.0.ebuild
 2007231309 ./dev-python/django-sortedm2m/django-sortedm2m-3.0.1.ebuild
@@ -12545,7 +13008,7 @@
 2007010139 ./dev-python/docker-py/docker-py-4.2.2.ebuild
 2003271051 ./dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
 2005131639 ./dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
-2003071409 ./dev-python/docopt/docopt-0.6.2-r3.ebuild
+2008020209 ./dev-python/docopt/docopt-0.6.2-r3.ebuild
 2007110609 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
 2001051415 ./dev-python/docutils-glep/docutils-glep-9999.ebuild
 2004032241 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -12564,6 +13027,7 @@
 2003251909 ./dev-python/dugong/dugong-3.7.3.ebuild
 2001051415 ./dev-python/dulwich/dulwich-0.19.6.ebuild
 2007310539 ./dev-python/dulwich/dulwich-0.19.15.ebuild
+2008021739 ./dev-python/dulwich/dulwich-0.20.5.ebuild
 2005181440 ./dev-python/easy-thumbnails/easy-thumbnails-2.7.ebuild
 2003271539 ./dev-python/ebuildtester/ebuildtester-0.1.16.ebuild
 2007082339 ./dev-python/ecdsa/ecdsa-0.15.ebuild
@@ -12573,7 +13037,7 @@
 2006290009 ./dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
 2004032241 ./dev-python/elementtree/elementtree-1.2.6-r3.ebuild
 2001160839 ./dev-python/emcee/emcee-2.2.1.ebuild
-2004220909 ./dev-python/empy/empy-3.3.3.ebuild
+2008020209 ./dev-python/empy/empy-3.3.3.ebuild
 2007132009 ./dev-python/entrypoints/entrypoints-0.3-r1.ebuild
 2004032241 ./dev-python/enum34/enum34-1.1.6-r1.ebuild
 2002051609 ./dev-python/enzyme/enzyme-9999.ebuild
@@ -12596,7 +13060,7 @@
 2006121909 ./dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
 2003190539 ./dev-python/fido2/fido2-0.7.3.ebuild
 2007082339 ./dev-python/fido2/fido2-0.8.1.ebuild
-2006161139 ./dev-python/fields/fields-5.0.0-r2.ebuild
+2008020109 ./dev-python/fields/fields-5.0.0-r2.ebuild
 2007142009 ./dev-python/filelock/filelock-3.0.12.ebuild
 2004221139 ./dev-python/fitsio/fitsio-0.9.11.ebuild
 2005311909 ./dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -12628,7 +13092,7 @@
 2006241039 ./dev-python/flask-security/flask-security-3.0.0.ebuild
 2007151139 ./dev-python/flask-security/flask-security-3.4.3.ebuild
 2007281609 ./dev-python/flask-security/flask-security-3.4.4.ebuild
-2003251609 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+2008020139 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
 2007150809 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
 2007302309 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.3.ebuild
 2003251909 ./dev-python/flask-themes/flask-themes-0.1.3_p20180112.ebuild
@@ -12649,8 +13113,8 @@
 2003251609 ./dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
 2004032241 ./dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
 2004211009 ./dev-python/functools32/functools32-3.2.3.ebuild
-2001262309 ./dev-python/funcy/funcy-1.10.1.ebuild
-2007091209 ./dev-python/funcy/funcy-1.14.ebuild
+2008021139 ./dev-python/funcy/funcy-1.10.1.ebuild
+2008021139 ./dev-python/funcy/funcy-1.14.ebuild
 1912300109 ./dev-python/fuse-python/fuse-python-1.0.0.ebuild
 2001051415 ./dev-python/fusepy/fusepy-3.0.1.ebuild
 2005261609 ./dev-python/future/future-0.18.2.ebuild
@@ -12663,8 +13127,8 @@
 2005181339 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5-r1.ebuild
 2007091309 ./dev-python/genshi/genshi-0.7.3-r1.ebuild
 2005252309 ./dev-python/genty/genty-1.3.2.ebuild
-2004152239 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
-2001051415 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+2008021139 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+2008021139 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
 2007020109 ./dev-python/gevent/gevent-1.4.0.ebuild
 2007091309 ./dev-python/gevent/gevent-20.6.2.ebuild
 2007132139 ./dev-python/gevent/gevent-20.6.0.ebuild
@@ -12700,8 +13164,8 @@
 2006081039 ./dev-python/grpcio-tools/grpcio-tools-1.28.1.ebuild
 2006081009 ./dev-python/grpcio/grpcio-1.28.1.ebuild
 2001160839 ./dev-python/gsd/gsd-1.5.3-r1.ebuild
-2004032241 ./dev-python/gst-python/gst-python-1.14.1-r1.ebuild
-2006291909 ./dev-python/gst-python/gst-python-1.16.2.ebuild
+2008020039 ./dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+2008020039 ./dev-python/gst-python/gst-python-1.16.2.ebuild
 2005211139 ./dev-python/guessit/guessit-3.1.1.ebuild
 2002051709 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
 2004271039 ./dev-python/h11/h11-0.9.0.ebuild
@@ -12709,13 +13173,13 @@
 2004040109 ./dev-python/hacking/hacking-2.0.0.ebuild
 2007201839 ./dev-python/hcloud-python/hcloud-python-1.8.1.ebuild
 2007221639 ./dev-python/hcloud-python/hcloud-python-1.8.2.ebuild
-2005062339 ./dev-python/hgdistver/hgdistver-0.25.ebuild
+2008021139 ./dev-python/hgdistver/hgdistver-0.25.ebuild
 2005022339 ./dev-python/hiredis/hiredis-1.0.1.ebuild
 2005271109 ./dev-python/hpack/hpack-3.0.0.ebuild
 2005032209 ./dev-python/html2text/html2text-2020.1.16-r1.ebuild
 2003192109 ./dev-python/html5-parser/html5-parser-0.4.9.ebuild
 2007271308 ./dev-python/html5lib/html5lib-1.0.1-r2.ebuild
-2007271308 ./dev-python/html5lib/html5lib-1.1.ebuild
+2008021509 ./dev-python/html5lib/html5lib-1.1.ebuild
 2004231209 ./dev-python/httmock/httmock-1.2.5.ebuild
 2005181409 ./dev-python/http-parser/http-parser-0.8.3.ebuild
 2007132139 ./dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -12742,7 +13206,8 @@
 2007281609 ./dev-python/hypothesis/hypothesis-5.23.3.ebuild
 2007300939 ./dev-python/hypothesis/hypothesis-5.23.7.ebuild
 2007310209 ./dev-python/hypothesis/hypothesis-5.16.0.ebuild
-2007310309 ./dev-python/hypothesis/hypothesis-5.16.3.ebuild
+2008011209 ./dev-python/hypothesis/hypothesis-5.16.3.ebuild
+2008011339 ./dev-python/hypothesis/hypothesis-5.23.8.ebuild
 2007302309 ./dev-python/icalendar/icalendar-4.0.6.ebuild
 2004032241 ./dev-python/id3-py/id3-py-1.2-r1.ebuild
 2006121909 ./dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -12751,7 +13216,7 @@
 2003251909 ./dev-python/ijson/ijson-2.5.1.ebuild
 2007310239 ./dev-python/ijson/ijson-3.1_p0.ebuild
 2001051415 ./dev-python/imageio/imageio-2.6.1.ebuild
-2005311939 ./dev-python/imagesize/imagesize-1.1.0.ebuild
+2008021139 ./dev-python/imagesize/imagesize-1.1.0.ebuild
 2003251909 ./dev-python/imapclient/imapclient-2.1.0.ebuild
 2003171839 ./dev-python/iminuit/iminuit-1.3.8.ebuild
 2007120609 ./dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
@@ -12782,6 +13247,7 @@
 2007310409 ./dev-python/ipyparallel/ipyparallel-6.3.0.ebuild
 2006082009 ./dev-python/ipython/ipython-7.5.0.ebuild
 2007310409 ./dev-python/ipython/ipython-7.16.1.ebuild
+2008011339 ./dev-python/ipython/ipython-7.17.0.ebuild
 2002051809 ./dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
 2007310409 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r1.ebuild
 2007310409 ./dev-python/ipywidgets/ipywidgets-7.5.1.ebuild
@@ -12802,14 +13268,13 @@
 2004032241 ./dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild
 2005131439 ./dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
 2007062239 ./dev-python/jaraco-stream/jaraco-stream-3.0.0.ebuild
-2007140239 ./dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+2008021409 ./dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
 2007302309 ./dev-python/jdcal/jdcal-1.4.1.ebuild
-2003271939 ./dev-python/jedi/jedi-0.14.1.ebuild
 2003271939 ./dev-python/jedi/jedi-0.15.2.ebuild
 2007091409 ./dev-python/jedi/jedi-0.17.0.ebuild
 2007170739 ./dev-python/jedi/jedi-0.17.1-r1.ebuild
 2007192139 ./dev-python/jedi/jedi-0.17.2.ebuild
-2007282039 ./dev-python/jeepney/jeepney-0.4.3.ebuild
+2008011209 ./dev-python/jeepney/jeepney-0.4.3.ebuild
 2005220809 ./dev-python/jellyfish/jellyfish-0.8.2.ebuild
 2001051415 ./dev-python/jikanpy/jikanpy-3.4.2.ebuild
 2007250041 ./dev-python/jikanpy/jikanpy-4.2.1.ebuild
@@ -12821,7 +13286,7 @@
 2006011008 ./dev-python/joblib/joblib-0.14.1.ebuild
 2006141709 ./dev-python/joblib/joblib-0.15.1.ebuild
 2007021140 ./dev-python/joblib/joblib-0.16.0.ebuild
-2003041939 ./dev-python/josepy/josepy-1.3.0.ebuild
+2008021139 ./dev-python/josepy/josepy-1.3.0.ebuild
 2001160839 ./dev-python/jplephem/jplephem-2.6.ebuild
 2003201209 ./dev-python/jsmin/jsmin-2.2.2.ebuild
 2005190038 ./dev-python/json-rpc/json-rpc-1.13.0.ebuild
@@ -12830,11 +13295,11 @@
 2007201609 ./dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
 2007302309 ./dev-python/jsonpatch/jsonpatch-1.26.ebuild
 2006121909 ./dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
-2006092309 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+2008021139 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
 2004261339 ./dev-python/jsonref/jsonref-0.1.ebuild
 2002051839 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
 2007091409 ./dev-python/jsonrpclib/jsonrpclib-0.4.1.ebuild
-2007120139 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
+2008020009 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
 2004191509 ./dev-python/jsonxs/jsonxs-0.6.ebuild
 2007280009 ./dev-python/jupyter/jupyter-1.0.0-r2.ebuild
 2007062209 ./dev-python/jupyter_client/jupyter_client-5.3.4.ebuild
@@ -12852,7 +13317,7 @@
 2007251109 ./dev-python/kazoo/kazoo-2.7.0-r1.ebuild
 2007251109 ./dev-python/kazoo/kazoo-2.8.0.ebuild
 2001311209 ./dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
-2007282039 ./dev-python/keyring/keyring-21.2.1.ebuild
+2008011209 ./dev-python/keyring/keyring-21.2.1.ebuild
 2007190139 ./dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
 2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
 2001051415 ./dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
@@ -12876,12 +13341,12 @@
 2007212309 ./dev-python/libvirt-python/libvirt-python-6.5.0.ebuild
 2002120509 ./dev-python/line_profiler/line_profiler-3.0.2.ebuild
 2005311909 ./dev-python/linecache2/linecache2-1.0.0.ebuild
-2003092139 ./dev-python/lit/lit-9.0.1.ebuild
-2006232139 ./dev-python/lit/lit-11.0.0.9999.ebuild
-2007152209 ./dev-python/lit/lit-12.0.0.9999.ebuild
-2007181809 ./dev-python/lit/lit-10.0.0.ebuild
-2007212239 ./dev-python/lit/lit-10.0.1.ebuild
-2007291339 ./dev-python/lit/lit-11.0.0_rc1.ebuild
+2008021139 ./dev-python/lit/lit-10.0.0.ebuild
+2008021139 ./dev-python/lit/lit-10.0.1.ebuild
+2008021139 ./dev-python/lit/lit-11.0.0.9999.ebuild
+2008021139 ./dev-python/lit/lit-11.0.0_rc1.ebuild
+2008021139 ./dev-python/lit/lit-12.0.0.9999.ebuild
+2008021139 ./dev-python/lit/lit-9.0.1.ebuild
 2003201309 ./dev-python/livereload/livereload-2.4.1.ebuild
 2003201309 ./dev-python/livereload/livereload-2.5.2.ebuild
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
@@ -12893,7 +13358,7 @@
 2002051939 ./dev-python/lmdb/lmdb-0.92.ebuild
 2002051939 ./dev-python/locket/locket-0.2.0.ebuild
 2006121439 ./dev-python/locket/locket-0.2.0-r1.ebuild
-2004210209 ./dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+2008021139 ./dev-python/lockfile/lockfile-0.12.2-r2.ebuild
 2005190038 ./dev-python/logbook/logbook-1.5.3.ebuild
 2004281909 ./dev-python/logfury/logfury-0.1.2-r1.ebuild
 2006130939 ./dev-python/loguru/loguru-0.5.1.ebuild
@@ -12906,7 +13371,7 @@
 2007201509 ./dev-python/lz4/lz4-3.0.2.ebuild
 2004032241 ./dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
 2007162209 ./dev-python/m2crypto/m2crypto-0.36.0.ebuild
-2007302309 ./dev-python/m2crypto/m2crypto-0.35.2.ebuild
+2008011239 ./dev-python/m2crypto/m2crypto-0.35.2.ebuild
 2005271209 ./dev-python/m2r/m2r-0.2.1.ebuild
 2002051939 ./dev-python/maintboot/maintboot-0.1.0.ebuild
 2007091539 ./dev-python/mako/mako-1.1.3.ebuild
@@ -12921,10 +13386,10 @@
 2007151139 ./dev-python/markups/markups-3.0.0-r1.ebuild
 2005252309 ./dev-python/markupsafe/markupsafe-1.1.1.ebuild
 2003310039 ./dev-python/marshmallow/marshmallow-3.5.1.ebuild
-2006051438 ./dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
-2006051438 ./dev-python/matplotlib/matplotlib-2.2.4.ebuild
 2007251109 ./dev-python/matplotlib/matplotlib-3.3.0.ebuild
 2007310609 ./dev-python/matplotlib/matplotlib-3.2.2.ebuild
+2008020239 ./dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+2008020239 ./dev-python/matplotlib/matplotlib-2.2.4.ebuild
 2006071209 ./dev-python/matterhook/matterhook-0.1-r1.ebuild
 2004032241 ./dev-python/mccabe/mccabe-0.6.1-r1.ebuild
 2001051415 ./dev-python/mecab-python/mecab-python-0.996.ebuild
@@ -12951,7 +13416,7 @@
 2005251939 ./dev-python/mock/mock-3.0.5-r1.ebuild
 2002060039 ./dev-python/mongoengine/mongoengine-0.10.6.ebuild
 2007021609 ./dev-python/mongoengine/mongoengine-0.20.0.ebuild
-2007120139 ./dev-python/monotonic/monotonic-1.5-r1.ebuild
+2008021139 ./dev-python/monotonic/monotonic-1.5-r1.ebuild
 2005251939 ./dev-python/more-itertools/more-itertools-5.0.0.ebuild
 2007310239 ./dev-python/more-itertools/more-itertools-8.4.0.ebuild
 2007250041 ./dev-python/moto/moto-1.3.14-r3.ebuild
@@ -12960,11 +13425,11 @@
 2001131309 ./dev-python/mox3/mox3-0.24.0.ebuild
 2003201939 ./dev-python/mpi4py/mpi4py-3.0.2.ebuild
 2007171039 ./dev-python/mpi4py/mpi4py-3.0.3.ebuild
-2005131339 ./dev-python/mpmath/mpmath-1.1.0.ebuild
+2008021009 ./dev-python/mpmath/mpmath-1.1.0.ebuild
 2007201509 ./dev-python/msgpack/msgpack-0.6.2.ebuild
 2004081709 ./dev-python/multidict/multidict-4.5.2.ebuild
 2007161609 ./dev-python/multidict/multidict-4.7.6.ebuild
-2007282039 ./dev-python/munch/munch-2.5.0-r1.ebuild
+2008011209 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2001051415 ./dev-python/munkres/munkres-1.1.2.ebuild
 2002052009 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
 2003252109 ./dev-python/mypy/mypy-0.760.ebuild
@@ -12979,7 +13444,7 @@
 2005271039 ./dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
 2007251138 ./dev-python/namespace-paste/namespace-paste-1-r1.ebuild
 2007140239 ./dev-python/namespace-repoze/namespace-repoze-1.ebuild
-2005312038 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+2008020139 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
 2005251939 ./dev-python/namespace-zope/namespace-zope-1.ebuild
 2001051415 ./dev-python/natgrid/natgrid-0.2.1-r3.ebuild
 2005032209 ./dev-python/natsort/natsort-7.0.1.ebuild
@@ -13010,16 +13475,17 @@
 2002052009 ./dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
 2005111839 ./dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
 2002052009 ./dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
-2004041809 ./dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
-2007091609 ./dev-python/nose/nose-1.3.7-r5.ebuild
+2008021209 ./dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+2008020009 ./dev-python/nose/nose-1.3.7-r5.ebuild
 2001051415 ./dev-python/nose2/nose2-0.9.1-r1.ebuild
 2004242339 ./dev-python/nose_fixes/nose_fixes-1.3.ebuild
 2006082109 ./dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
 2002112309 ./dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
 2006041239 ./dev-python/notebook/notebook-5.0.0.ebuild
 2007310409 ./dev-python/notebook/notebook-6.0.3.ebuild
+2008011339 ./dev-python/notebook/notebook-6.1.0.ebuild
 2006041609 ./dev-python/notify-python/notify-python-0.1.1-r3.ebuild
-2006220108 ./dev-python/notify2/notify2-0.3.1-r1.ebuild
+2008021209 ./dev-python/notify2/notify2-0.3.1-r1.ebuild
 2006042039 ./dev-python/nototools/nototools-0_pre20200207.ebuild
 2006171439 ./dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
 2004242339 ./dev-python/ntplib/ntplib-0.3.3.ebuild
@@ -13030,7 +13496,7 @@
 2006031839 ./dev-python/numpy/numpy-1.17.4-r3.ebuild
 2007242009 ./dev-python/numpy/numpy-1.19.1.ebuild
 2007310009 ./dev-python/numpy/numpy-1.18.5.ebuild
-2007310539 ./dev-python/numpy/numpy-1.19.0.ebuild
+2008011209 ./dev-python/numpy/numpy-1.19.0.ebuild
 2003251639 ./dev-python/numpydoc/numpydoc-0.9.1.ebuild
 2007050939 ./dev-python/numpydoc/numpydoc-1.1.0.ebuild
 2001051415 ./dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -13047,7 +13513,7 @@
 2001051415 ./dev-python/openpyxl/openpyxl-3.0.0.ebuild
 2002051609 ./dev-python/openpyxl/openpyxl-9999.ebuild
 2007061739 ./dev-python/openpyxl/openpyxl-3.0.3.ebuild
-2007170509 ./dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+2008021139 ./dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
 2007190139 ./dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
 2002221109 ./dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
 2001131309 ./dev-python/os-brick/os-brick-2.8.2.ebuild
@@ -13090,7 +13556,7 @@
 2006232209 ./dev-python/ovs/ovs-2.13.0.ebuild
 2003182039 ./dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
 2005302109 ./dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
-2002112309 ./dev-python/owslib/owslib-0.17.1-r1.ebuild
+2008020039 ./dev-python/owslib/owslib-0.17.1-r1.ebuild
 2007091609 ./dev-python/packaging/packaging-20.4.ebuild
 2001311139 ./dev-python/pafy/pafy-0.5.5.ebuild
 2001311139 ./dev-python/pafy/pafy-9999.ebuild
@@ -13126,17 +13592,15 @@
 2006051709 ./dev-python/pathlib2/pathlib2-2.3.5.ebuild
 2006031008 ./dev-python/pathtools/pathtools-0.1.2-r3.ebuild
 2006121639 ./dev-python/patsy/patsy-0.5.1.ebuild
-2007272339 ./dev-python/paver/paver-1.3.4-r1.ebuild
+2008021209 ./dev-python/paver/paver-1.3.4-r1.ebuild
 2007201809 ./dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
 2007091639 ./dev-python/pbr/pbr-5.4.5.ebuild
 2001051415 ./dev-python/pcapy/pcapy-0.11.2.ebuild
 2004210009 ./dev-python/pdfrw/pdfrw-0.4.ebuild
 2004030109 ./dev-python/pecan/pecan-1.3.3-r2.ebuild
-2001051415 ./dev-python/peewee/peewee-3.1.0.ebuild
 2007150909 ./dev-python/peewee/peewee-3.13.2.ebuild
 2001290609 ./dev-python/pelican-minify/pelican-minify-0.9.ebuild
-2004032241 ./dev-python/pep8/pep8-1.7.1.ebuild
-2007170739 ./dev-python/pep8/pep8-1.7.1-r1.ebuild
+2008021239 ./dev-python/pep8/pep8-1.7.1.ebuild
 2002052109 ./dev-python/pew/pew-1.1.1.ebuild
 2004032241 ./dev-python/pexpect/pexpect-4.6.0.ebuild
 2007171039 ./dev-python/pexpect/pexpect-4.8.0.ebuild
@@ -13167,23 +13631,22 @@
 2005252239 ./dev-python/ply/ply-3.11.ebuild
 2004251239 ./dev-python/plyr/plyr-1.0.6.ebuild
 2001230139 ./dev-python/plyvel/plyvel-1.2.0.ebuild
-2004032241 ./dev-python/pmw/pmw-1.3.3-r3.ebuild
 2004032241 ./dev-python/pmw/pmw-2.0.1-r2.ebuild
 2006062239 ./dev-python/pocketlint/pocketlint-0.20.ebuild
 2002052239 ./dev-python/pockets/pockets-0.5.1.ebuild
 2005140039 ./dev-python/pockets/pockets-0.9.1.ebuild
 2001051415 ./dev-python/podcastparser/podcastparser-0.6.4.ebuild
-2004032241 ./dev-python/polib/polib-1.1.0-r1.ebuild
+2008021209 ./dev-python/polib/polib-1.1.0-r1.ebuild
 2004251239 ./dev-python/polygon/polygon-3.0.7.ebuild
 2007282039 ./dev-python/portend/portend-2.6.ebuild
 2005101838 ./dev-python/poyo/poyo-0.5.0.ebuild
 2002112309 ./dev-python/precis-i18n/precis-i18n-1.0.1.ebuild
 2005251939 ./dev-python/pretend/pretend-1.0.9.ebuild
 2007310309 ./dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
-2005311909 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+2008021209 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
 2005271109 ./dev-python/priority/priority-1.3.0.ebuild
-2006161139 ./dev-python/process-tests/process-tests-2.0.2.ebuild
-2007241739 ./dev-python/process-tests/process-tests-2.1.1.ebuild
+2008021209 ./dev-python/process-tests/process-tests-2.0.2.ebuild
+2008021209 ./dev-python/process-tests/process-tests-2.1.1.ebuild
 2004032241 ./dev-python/progress/progress-1.3.ebuild
 2002121109 ./dev-python/progressbar/progressbar-2.5.ebuild
 2001182209 ./dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -13201,7 +13664,7 @@
 2007162209 ./dev-python/psutil/psutil-5.7.2.ebuild
 2007272339 ./dev-python/psycopg/psycopg-2.7.7.ebuild
 2007272339 ./dev-python/psycopg/psycopg-2.8.4.ebuild
-2007310609 ./dev-python/psycopg/psycopg-2.8.5.ebuild
+2008011209 ./dev-python/psycopg/psycopg-2.8.5.ebuild
 2002112309 ./dev-python/ptpython/ptpython-2.0.6.ebuild
 2004260739 ./dev-python/ptvsd/ptvsd-4.3.2.ebuild
 2005251939 ./dev-python/ptyprocess/ptyprocess-0.6.0.ebuild
@@ -13229,8 +13692,8 @@
 2001160839 ./dev-python/pyamg/pyamg-3.2.1-r1.ebuild
 2007091639 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8.ebuild
 2005252239 ./dev-python/pyasn1/pyasn1-0.4.8.ebuild
-2003250809 ./dev-python/pyatspi/pyatspi-2.36.0.ebuild
-2007290809 ./dev-python/pyatspi/pyatspi-2.34.0.ebuild
+2008021209 ./dev-python/pyatspi/pyatspi-2.34.0.ebuild
+2008021209 ./dev-python/pyatspi/pyatspi-2.36.0.ebuild
 2005131709 ./dev-python/pyaudio/pyaudio-0.2.11.ebuild
 2006081109 ./dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
 2007251138 ./dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13241,19 +13704,18 @@
 2001051415 ./dev-python/pycapnp/pycapnp-0.6.4.ebuild
 2007200339 ./dev-python/pycares/pycares-3.1.1.ebuild
 2002230040 ./dev-python/pycdio/pycdio-2.1.0.ebuild
-2003251909 ./dev-python/pychm/pychm-0.8.6.ebuild
+2008021209 ./dev-python/pychm/pychm-0.8.6.ebuild
 1912100809 ./dev-python/pychroot/pychroot-0.10.1.ebuild
 1912100809 ./dev-python/pychroot/pychroot-9999.ebuild
 2004190539 ./dev-python/pyclipper/pyclipper-1.1.0.ebuild
 2006042039 ./dev-python/pyclipper/pyclipper-1.1.0_p3-r1.ebuild
 2007230439 ./dev-python/pyclipper/pyclipper-1.2.0.ebuild
-2004150609 ./dev-python/pycodestyle/pycodestyle-2.5.0-r1.ebuild
 2007090839 ./dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
 2004211139 ./dev-python/pycollada/pycollada-0.7.1.ebuild
 2001051415 ./dev-python/pycountry/pycountry-19.8.18.ebuild
 2005252239 ./dev-python/pycparser/pycparser-2.20.ebuild
 2007120139 ./dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
-2007310439 ./dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
+2008021509 ./dev-python/pycryptodome/pycryptodome-3.9.8.ebuild
 2001100439 ./dev-python/pycson/pycson-0.7.ebuild
 2001051415 ./dev-python/pycuda/pycuda-2018.1.1.ebuild
 2001051415 ./dev-python/pycuda/pycuda-9999.ebuild
@@ -13263,15 +13725,15 @@
 2005121009 ./dev-python/pycxx/pycxx-7.1.2-r2.ebuild
 2004150609 ./dev-python/pydecomp/pydecomp-9999.ebuild
 2005312038 ./dev-python/pydecomp/pydecomp-0.3.ebuild
-2006010338 ./dev-python/pydiff/pydiff-0.2-r1.ebuild
+2008021209 ./dev-python/pydiff/pydiff-0.2-r1.ebuild
 2001062339 ./dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
 2005272209 ./dev-python/pydns/pydns-3.2.1.ebuild
 2006131439 ./dev-python/pydot/pydot-1.4.1.ebuild
 2002052309 ./dev-python/pydotplus/pydotplus-2.0.2.ebuild
 2001051415 ./dev-python/pyds9/pyds9-1.8.1.ebuild
 2007091709 ./dev-python/pyelftools/pyelftools-0.26.ebuild
-2003251709 ./dev-python/pyenchant/pyenchant-2.0.0.ebuild
 2007191609 ./dev-python/pyenchant/pyenchant-3.1.0.ebuild
+2008021209 ./dev-python/pyenchant/pyenchant-2.0.0.ebuild
 2007120609 ./dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
 2007122339 ./dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
 2007212039 ./dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -13279,7 +13741,7 @@
 2004032241 ./dev-python/pyflakes/pyflakes-2.1.1.ebuild
 2007090839 ./dev-python/pyflakes/pyflakes-2.2.0.ebuild
 2001051415 ./dev-python/pyflann/pyflann-1.9.1.ebuild
-2001051415 ./dev-python/pyfltk/pyfltk-1.3.3.ebuild
+2008021239 ./dev-python/pyfltk/pyfltk-1.3.3.ebuild
 2003062139 ./dev-python/pyformance/pyformance-0.4-r1.ebuild
 2007141939 ./dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
 2005032209 ./dev-python/pygal/pygal-2.4.0-r1.ebuild
@@ -13298,10 +13760,11 @@
 2007171109 ./dev-python/pygobject/pygobject-2.28.6-r55.ebuild
 2007192109 ./dev-python/pygobject/pygobject-3.36.1.ebuild
 2007290809 ./dev-python/pygobject/pygobject-3.34.0.ebuild
-2006062239 ./dev-python/pygpgme/pygpgme-0.3-r2.ebuild
+2008021239 ./dev-python/pygpgme/pygpgme-0.3-r2.ebuild
 2001051415 ./dev-python/pygpu/pygpu-0.6.7.ebuild
-2007110609 ./dev-python/pygraphviz/pygraphviz-1.5.ebuild
+2008010139 ./dev-python/pygraphviz/pygraphviz-1.5.ebuild
 2007272339 ./dev-python/pygresql/pygresql-5.1.ebuild
+2008010709 ./dev-python/pygresql/pygresql-5.2.ebuild
 2001051415 ./dev-python/pygsl/pygsl-2.1.1.ebuild
 2006040939 ./dev-python/pygtk/pygtk-2.24.0-r5.ebuild
 2004251739 ./dev-python/pyh2o/pyh2o-9999.ebuild
@@ -13309,7 +13772,7 @@
 2007131939 ./dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
 2004032241 ./dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
 2002091942 ./dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
-2007212209 ./dev-python/pyilmbase/pyilmbase-2.5.2.ebuild
+2008021409 ./dev-python/pyilmbase/pyilmbase-2.5.2-r1.ebuild
 2006082339 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
 2002052309 ./dev-python/pyinsane/pyinsane-2.0.13.ebuild
 2007142009 ./dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -13319,7 +13782,6 @@
 2001051415 ./dev-python/pykwalify/pykwalify-9999.ebuild
 2007091209 ./dev-python/pykwalify/pykwalify-1.7.0.ebuild
 2004040939 ./dev-python/pylama/pylama-7.7.1.ebuild
-2001051415 ./dev-python/pylast/pylast-1.9.0.ebuild
 2005091109 ./dev-python/pylast/pylast-3.2.1.ebuild
 2004222009 ./dev-python/pylibacl/pylibacl-0.5.4_p20191217.ebuild
 2004240909 ./dev-python/pylibacl/pylibacl-0.5.3.ebuild
@@ -13338,20 +13800,20 @@
 2002182109 ./dev-python/pymountboot/pymountboot-9999.ebuild
 2007171039 ./dev-python/pymountboot/pymountboot-0.2.3.ebuild
 2004032241 ./dev-python/pympler/pympler-0.6.ebuild
-2004032241 ./dev-python/pymssql/pymssql-2.1.3.ebuild
+2008021239 ./dev-python/pymssql/pymssql-2.1.3.ebuild
 2006112339 ./dev-python/pymysql/pymysql-0.9.3.ebuild
 2004090009 ./dev-python/pynacl/pynacl-1.2.1.ebuild
 2006082109 ./dev-python/pynacl/pynacl-1.3.0.ebuild
-2007310039 ./dev-python/pynacl/pynacl-1.4.0.ebuild
+2008021509 ./dev-python/pynacl/pynacl-1.4.0.ebuild
 2004191539 ./dev-python/pyocr/pyocr-0.7.2.ebuild
 2001051415 ./dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
 2004032241 ./dev-python/pyogg/pyogg-1.3-r2.ebuild
 2006290939 ./dev-python/pyopencl/pyopencl-2019.1.2.ebuild
 2007291439 ./dev-python/pyopencl/pyopencl-2020.2.ebuild
 2004032241 ./dev-python/pyopengl/pyopengl-3.1.0.ebuild
-2007270539 ./dev-python/pyopengl/pyopengl-3.1.5.ebuild
+2008021009 ./dev-python/pyopengl/pyopengl-3.1.5.ebuild
 2003081409 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
-2006081409 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
+2008021139 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
 2005252309 ./dev-python/pyopenssl/pyopenssl-19.1.0.ebuild
 2003190539 ./dev-python/pyotherside/pyotherside-1.5.9.ebuild
 2007041239 ./dev-python/pyotp/pyotp-2.3.0.ebuild
@@ -13365,7 +13827,6 @@
 2004032241 ./dev-python/pypax/pypax-0.9.5.ebuild
 2001051415 ./dev-python/pypcap/pypcap-1.2.3.ebuild
 2002211709 ./dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
-2005311909 ./dev-python/pyperclip/pyperclip-1.5.27.ebuild
 2006091609 ./dev-python/pyperclip/pyperclip-1.7.0.ebuild
 2005121009 ./dev-python/pyphen/pyphen-0.9.5.ebuild
 2007201509 ./dev-python/pypng/pypng-0.0.20.ebuild
@@ -13373,9 +13834,9 @@
 2003190639 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
 2007041239 ./dev-python/pyproj/pyproj-2.4.2-r1.ebuild
 2003252339 ./dev-python/pypy/pypy-7.3.0.ebuild
-2006302209 ./dev-python/pypy/pypy-7.3.1-r1.ebuild
+2008021239 ./dev-python/pypy/pypy-7.3.1-r2.ebuild
 2003252339 ./dev-python/pypy3/pypy3-7.3.0.ebuild
-2007021309 ./dev-python/pypy3/pypy3-7.3.1-r1.ebuild
+2008021239 ./dev-python/pypy3/pypy3-7.3.1-r2.ebuild
 2007201509 ./dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
 2001051415 ./dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
 2001290139 ./dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild
@@ -13391,7 +13852,7 @@
 2007170609 ./dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
 2002281939 ./dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
 2005032209 ./dev-python/pyscard/pyscard-1.9.9.ebuild
-2004032241 ./dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+2008021239 ./dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
 2005271239 ./dev-python/pyserial/pyserial-3.4.ebuild
 2007251138 ./dev-python/pysha3/pysha3-1.0.2-r1.ebuild
 2004180139 ./dev-python/pysmi/pysmi-0.3.4.ebuild
@@ -13410,13 +13871,12 @@
 2006021508 ./dev-python/pyte/pyte-0.8.0-r1.ebuild
 2007111009 ./dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
 2007310509 ./dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
-2003261841 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
-2007170739 ./dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
-2001051415 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
-2006161139 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
+2008021239 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+2008021239 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+2008020109 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
 2004291439 ./dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
 2007111009 ./dev-python/pytest-django/pytest-django-3.9.0.ebuild
-2007141939 ./dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+2008011339 ./dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
 2006150539 ./dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
 2002052339 ./dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
 2002052339 ./dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -13431,30 +13891,30 @@
 2005261239 ./dev-python/pytest-mock/pytest-mock-2.0.0.ebuild
 2007111139 ./dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
 2007122339 ./dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
-2003252109 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
-2007170739 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
+2008021239 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
 2002052339 ./dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
-2007292139 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
+2008021239 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
 2006201739 ./dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild
 2007140139 ./dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
 2007111109 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
 2004252209 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
 2001051415 ./dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
-2007081139 ./dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
 2007111139 ./dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
-2007170909 ./dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
+2008020139 ./dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
+2008020139 ./dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
 2007122339 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2004032241 ./dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
 2005162309 ./dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
 2005211109 ./dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
 2007120209 ./dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
 2007171409 ./dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
+2007312339 ./dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
 2006120109 ./dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
-2004032241 ./dev-python/pytest/pytest-3.10.1.ebuild
-2004032241 ./dev-python/pytest/pytest-4.5.0.ebuild
-2007120609 ./dev-python/pytest/pytest-4.6.11.ebuild
 2007120109 ./dev-python/pytest/pytest-5.4.3.ebuild
-2007310239 ./dev-python/pytest/pytest-6.0.1.ebuild
+2008010139 ./dev-python/pytest/pytest-3.10.1.ebuild
+2008010139 ./dev-python/pytest/pytest-4.5.0.ebuild
+2008010139 ./dev-python/pytest/pytest-4.6.11.ebuild
+2008021539 ./dev-python/pytest/pytest-6.0.1.ebuild
 2007111109 ./dev-python/python-augeas/python-augeas-1.1.0.ebuild
 2002031339 ./dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
 2002031339 ./dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -13472,8 +13932,8 @@
 2003182139 ./dev-python/python-debian/python-debian-0.1.36.ebuild
 2005302109 ./dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
 2005032209 ./dev-python/python-discid/python-discid-1.2.0.ebuild
-2005111509 ./dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
-2006221909 ./dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
+2008021239 ./dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
+2008021239 ./dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
 2003261841 ./dev-python/python-docs/python-docs-3.7.7.ebuild
 2003261841 ./dev-python/python-docs/python-docs-3.8.2.ebuild
 2004211009 ./dev-python/python-docs/python-docs-2.7.17.ebuild
@@ -13482,7 +13942,7 @@
 2007080039 ./dev-python/python-docs/python-docs-3.6.11.ebuild
 2007080039 ./dev-python/python-docs/python-docs-3.7.8.ebuild
 2007080039 ./dev-python/python-docs/python-docs-3.8.3.ebuild
-2003111909 ./dev-python/python-editor/python-editor-1.0.4.ebuild
+2008021239 ./dev-python/python-editor/python-editor-1.0.4.ebuild
 2004051139 ./dev-python/python-efl/python-efl-1.23.0.ebuild
 2007171139 ./dev-python/python-efl/python-efl-1.24.0.ebuild
 2004220439 ./dev-python/python-engineio/python-engineio-3.12.1.ebuild
@@ -13491,8 +13951,8 @@
 2006150539 ./dev-python/python-evdev/python-evdev-1.3.0.ebuild
 2007170439 ./dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
 2004032241 ./dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
-2004261009 ./dev-python/python-gammu/python-gammu-2.11.ebuild
-2005070509 ./dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+2008021239 ./dev-python/python-gammu/python-gammu-2.11.ebuild
+2008021239 ./dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
 2001131309 ./dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
 2006162209 ./dev-python/python-glanceclient/python-glanceclient-2.17.1.ebuild
 2007111139 ./dev-python/python-gnupg/python-gnupg-0.4.6.ebuild
@@ -13502,14 +13962,14 @@
 2007091209 ./dev-python/python-jose/python-jose-3.1.0.ebuild
 2007300939 ./dev-python/python-jose/python-jose-3.2.0.ebuild
 2007190139 ./dev-python/python-keystoneclient/python-keystoneclient-4.0.0.ebuild
-2002102209 ./dev-python/python-ldap/python-ldap-9999.ebuild
-2004032241 ./dev-python/python-ldap/python-ldap-3.2.0.ebuild
+2008021239 ./dev-python/python-ldap/python-ldap-3.2.0.ebuild
+2008021239 ./dev-python/python-ldap/python-ldap-9999.ebuild
 2002060439 ./dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
 2004201209 ./dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
 2002060009 ./dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
 2007201209 ./dev-python/python-ly/python-ly-0.9.6.ebuild
 2006040939 ./dev-python/python-lzo/python-lzo-1.12-r1.ebuild
-2007111139 ./dev-python/python-magic/python-magic-0.4.18.ebuild
+2008021239 ./dev-python/python-magic/python-magic-0.4.18.ebuild
 2001131309 ./dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
 2003162209 ./dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
 2002230040 ./dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
@@ -13537,7 +13997,7 @@
 2001131309 ./dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
 2002112239 ./dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
 2001051415 ./dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
-2001051415 ./dev-python/python-slip/python-slip-0.6.5.ebuild
+2008021239 ./dev-python/python-slip/python-slip-0.6.5.ebuild
 2006040939 ./dev-python/python-stdnum/python-stdnum-1.13.ebuild
 2003162209 ./dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
 2004162109 ./dev-python/python-systemd/python-systemd-234.ebuild
@@ -13545,7 +14005,7 @@
 2001131309 ./dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
 2002052339 ./dev-python/python-utils/python-utils-2.3.0.ebuild
 2002060009 ./dev-python/python-varlink/python-varlink-30.3.0.ebuild
-2005041739 ./dev-python/python-xlib/python-xlib-0.27.ebuild
+2008021239 ./dev-python/python-xlib/python-xlib-0.27.ebuild
 2005302109 ./dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
 2002060009 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
 2005302109 ./dev-python/python-zunclient/python-zunclient-4.0.1.ebuild
@@ -13556,7 +14016,7 @@
 1702282250 ./dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
 2002060009 ./dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
 2007151139 ./dev-python/pytidylib/pytidylib-0.3.2.ebuild
-2001051415 ./dev-python/pytoml/pytoml-0.1.20.ebuild
+2008021239 ./dev-python/pytoml/pytoml-0.1.20.ebuild
 2005171109 ./dev-python/pytools/pytools-2020.1.ebuild
 2007172339 ./dev-python/pytools/pytools-9999.ebuild
 2007291439 ./dev-python/pytools/pytools-2020.3.1.ebuild
@@ -13566,7 +14026,7 @@
 2003251909 ./dev-python/pyudev/pyudev-0.22.0.ebuild
 2003190539 ./dev-python/pyusb/pyusb-1.0.2.ebuild
 2004032241 ./dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
-2001051415 ./dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
+2008021239 ./dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
 2004040539 ./dev-python/pywinrm/pywinrm-0.4.1.ebuild
 2003081739 ./dev-python/pyx/pyx-0.15.ebuild
 2004240909 ./dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -13578,12 +14038,12 @@
 2005132039 ./dev-python/pyzmq/pyzmq-19.0.0.ebuild
 2007310539 ./dev-python/pyzmq/pyzmq-19.0.1_p20200608.ebuild
 2006192309 ./dev-python/qrcode/qrcode-6.1.ebuild
-2006110209 ./dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
-2006160909 ./dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
+2008020239 ./dev-python/qscintilla-python/qscintilla-python-2.11.4.ebuild
+2008020239 ./dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
 2005270009 ./dev-python/qtawesome/qtawesome-0.7.2.ebuild
-2005030609 ./dev-python/qtconsole/qtconsole-4.3.1.ebuild
 2007072309 ./dev-python/qtconsole/qtconsole-4.7.5.ebuild
-2007310409 ./dev-python/qtconsole/qtconsole-4.7.4.ebuild
+2008010139 ./dev-python/qtconsole/qtconsole-4.3.1.ebuild
+2008010139 ./dev-python/qtconsole/qtconsole-4.7.4.ebuild
 1804221108 ./dev-python/quex/quex-0.65.4.ebuild
 2004040839 ./dev-python/radon/radon-4.1.0.ebuild
 2006201739 ./dev-python/raet/raet-0.6.8-r1.ebuild
@@ -13593,7 +14053,7 @@
 2004261339 ./dev-python/ratelimit/ratelimit-1.4.1.ebuild
 2007302339 ./dev-python/rdflib/rdflib-5.0.0.ebuild
 2007251138 ./dev-python/readme_renderer/readme_renderer-26.0.ebuild
-2005211139 ./dev-python/rebulk/rebulk-2.0.1.ebuild
+2008021009 ./dev-python/rebulk/rebulk-2.0.1.ebuild
 2005171109 ./dev-python/recommonmark/recommonmark-0.6.0.ebuild
 2003291009 ./dev-python/redis-py/redis-py-3.3.11.ebuild
 2001051415 ./dev-python/redlock-py/redlock-py-1.0.8.ebuild
@@ -13603,8 +14063,8 @@
 2007170639 ./dev-python/regex/regex-2020.4.4.ebuild
 2005061009 ./dev-python/rencode/rencode-1.0.5-r1.ebuild
 2007171039 ./dev-python/rencode/rencode-1.0.6.ebuild
-2001051415 ./dev-python/reno/reno-2.7.0.ebuild
-2007170509 ./dev-python/reno/reno-2.11.3.ebuild
+2008021139 ./dev-python/reno/reno-2.11.3.ebuild
+2008021139 ./dev-python/reno/reno-2.7.0.ebuild
 2006071209 ./dev-python/reportlab/reportlab-3.5.42.ebuild
 2007140239 ./dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
 2005090239 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
@@ -13627,9 +14087,9 @@
 2001051415 ./dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
 2007111139 ./dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
 2004032241 ./dev-python/retrying/retrying-1.3.3.ebuild
-2004211009 ./dev-python/rfc3986/rfc3986-1.2.0.ebuild
-2007310439 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
-2006092309 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+2008021239 ./dev-python/rfc3986/rfc3986-1.2.0.ebuild
+2008021239 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
+2008021239 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
 1912281939 ./dev-python/robotbackgroundlogger/robotbackgroundlogger-1.2.ebuild
 2002112051 ./dev-python/robotframework/robotframework-3.0.4.ebuild
 2005121009 ./dev-python/roman/roman-3.2.ebuild
@@ -13660,7 +14120,7 @@
 2001131309 ./dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
 2002112309 ./dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
 2007172339 ./dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
-2005091109 ./dev-python/ryu/ryu-4.26-r1.ebuild
+2008010139 ./dev-python/ryu/ryu-4.26-r1.ebuild
 2002041639 ./dev-python/s3fs/s3fs-0.1.5.ebuild
 2007061739 ./dev-python/s3fs/s3fs-0.4.2.ebuild
 2006101709 ./dev-python/s3transfer/s3transfer-0.3.3.ebuild
@@ -13671,7 +14131,7 @@
 2006120109 ./dev-python/scripttest/scripttest-1.3.0.ebuild
 2007171839 ./dev-python/scrypt/scrypt-0.8.15.ebuild
 2003092139 ./dev-python/seaborn/seaborn-0.10.0.ebuild
-2007282039 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
+2008011209 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
 2007162239 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2007302339 ./dev-python/semantic_version/semantic_version-2.8.5.ebuild
 2006170909 ./dev-python/semver/semver-2.10.2.ebuild
@@ -13702,10 +14162,10 @@
 2001051415 ./dev-python/simplesoapy/simplesoapy-9999.ebuild
 2001051415 ./dev-python/simplespectral/simplespectral-1.0.0.ebuild
 2001051415 ./dev-python/simplespectral/simplespectral-9999.ebuild
-2005111509 ./dev-python/simpy/simpy-3.0.13.ebuild
+2008010139 ./dev-python/simpy/simpy-3.0.13.ebuild
 2004032241 ./dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
-2006092339 ./dev-python/sip/sip-4.19.22.ebuild
-2006092239 ./dev-python/sip/sip-4.19.23.ebuild
+2008020239 ./dev-python/sip/sip-4.19.22-r1.ebuild
+2008020239 ./dev-python/sip/sip-4.19.23-r1.ebuild
 2005141509 ./dev-python/six/six-1.14.0.ebuild
 2007162109 ./dev-python/six/six-1.15.0.ebuild
 2003031239 ./dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
@@ -13717,7 +14177,7 @@
 2005301039 ./dev-python/snakeoil/snakeoil-0.8.8.ebuild
 2005301039 ./dev-python/snakeoil/snakeoil-9999.ebuild
 2007201509 ./dev-python/snappy/snappy-0.5.1.ebuild
-2005311939 ./dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+2008021239 ./dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
 2001051415 ./dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
 2005211139 ./dev-python/socketio-client/socketio-client-0.7.2.ebuild
 2007251138 ./dev-python/socketpool/socketpool-0.5.3-r2.ebuild
@@ -13728,17 +14188,17 @@
 2006241039 ./dev-python/speaklater/speaklater-1.3-r1.ebuild
 2001100439 ./dev-python/speg/speg-0.3.ebuild
 2006040939 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
-2004032241 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+2008020139 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
 2006052238 ./dev-python/sphinx-gallery/sphinx-gallery-0.3.1-r1.ebuild
 2004261609 ./dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
 2003300039 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
-2004032241 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+2008020139 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
 2005111839 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
 2005011709 ./dev-python/sphinx/sphinx-2.4.4.ebuild
-2005061739 ./dev-python/sphinx/sphinx-2.0.1-r1.ebuild
 2007070939 ./dev-python/sphinx/sphinx-3.1.2.ebuild
 2007181739 ./dev-python/sphinx/sphinx-3.0.4.ebuild
-2007271309 ./dev-python/sphinx/sphinx-1.7.5-r2.ebuild
+2008010139 ./dev-python/sphinx/sphinx-1.7.5-r2.ebuild
+2008010139 ./dev-python/sphinx/sphinx-2.0.1-r1.ebuild
 2002112309 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
 2004221139 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
 2007241739 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.4.3-r1.ebuild
@@ -13769,7 +14229,6 @@
 2007291109 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.2.0.ebuild
 2007292039 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.1.2.ebuild
 2007111239 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
-2007271309 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
 2001051415 ./dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
 2005270009 ./dev-python/spyder-kernels/spyder-kernels-1.9.1.ebuild
 2007170739 ./dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
@@ -13778,8 +14237,8 @@
 2005302109 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
 2004261609 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
 2004261609 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
-2005182138 ./dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
-2007170609 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+2008021239 ./dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
+2008021239 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
 2002060939 ./dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
 2003251609 ./dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
 2005030609 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -13794,13 +14253,13 @@
 2007151439 ./dev-python/stevedore/stevedore-3.0.0.ebuild
 2007170509 ./dev-python/stevedore/stevedore-3.1.0.ebuild
 2007192139 ./dev-python/stevedore/stevedore-3.2.0.ebuild
-2005250944 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+2008021239 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
 2006040939 ./dev-python/stripe/stripe-2.46.0.ebuild
 2003301709 ./dev-python/subprocess32/subprocess32-3.5.4.ebuild
 2007170509 ./dev-python/subunit/subunit-1.4.0.ebuild
-2004261609 ./dev-python/subvertpy/subvertpy-0.10.1.ebuild
+2008021239 ./dev-python/subvertpy/subvertpy-0.10.1.ebuild
 2001051415 ./dev-python/suds/suds-0.6-r1.ebuild
-2007191709 ./dev-python/sure/sure-1.4.11.ebuild
+2008021239 ./dev-python/sure/sure-1.4.11.ebuild
 2001051415 ./dev-python/svg-path/svg-path-3.0.ebuild
 2005181339 ./dev-python/svgwrite/svgwrite-1.4.ebuild
 2003120209 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.5.0.ebuild
@@ -13821,13 +14280,13 @@
 2005170909 ./dev-python/tempita/tempita-0.5.3-r2.ebuild
 2007192139 ./dev-python/tempora/tempora-4.0.0.ebuild
 2007282039 ./dev-python/tempora/tempora-3.0.0.ebuild
-2005302339 ./dev-python/tenacity/tenacity-6.1.0.ebuild
-2007061509 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+2008020039 ./dev-python/tenacity/tenacity-6.1.0-r1.ebuild
+2008021239 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
 2006211839 ./dev-python/terminado/terminado-0.8.3.ebuild
 2007300909 ./dev-python/terminaltables/terminaltables-3.1.0.ebuild
 2007300909 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2007071839 ./dev-python/testfixtures/testfixtures-6.14.1.ebuild
-2007282039 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
+2008011209 ./dev-python/testpath/testpath-0.4.4-r1.ebuild
 2004032241 ./dev-python/testrepository/testrepository-0.0.20.ebuild
 2005311909 ./dev-python/testresources/testresources-2.0.1.ebuild
 2005311909 ./dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -13839,7 +14298,7 @@
 2003221539 ./dev-python/theano/theano-1.0.4.ebuild
 2005091309 ./dev-python/thrift/thrift-0.11.0.ebuild
 2007151839 ./dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
-2004261609 ./dev-python/tinycss/tinycss-0.4.ebuild
+2008020209 ./dev-python/tinycss/tinycss-0.4.ebuild
 2005031339 ./dev-python/tinycss2/tinycss2-1.0.2.ebuild
 2001051415 ./dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
 2006161339 ./dev-python/tld/tld-0.12.2.ebuild
@@ -13871,7 +14330,7 @@
 2005291109 ./dev-python/tvdb_api/tvdb_api-2.0-r1.ebuild
 2006012338 ./dev-python/twine/twine-3.1.1.ebuild
 2007251138 ./dev-python/twine/twine-1.15.0.ebuild
-2007310439 ./dev-python/twine/twine-3.2.0.ebuild
+2008011209 ./dev-python/twine/twine-3.2.0.ebuild
 2006040939 ./dev-python/twisted/twisted-19.10.0.ebuild
 2006211239 ./dev-python/twisted/twisted-20.3.0.ebuild
 2005041009 ./dev-python/twython/twython-3.7.0.ebuild
@@ -13886,11 +14345,13 @@
 2007111239 ./dev-python/typing/typing-3.7.4.2.ebuild
 2007141509 ./dev-python/typing/typing-3.7.4.3.ebuild
 2007111239 ./dev-python/tzlocal/tzlocal-2.1.ebuild
-2007111309 ./dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+2008011339 ./dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
+2008011339 ./dev-python/u-msgpack/u-msgpack-2.7.0.ebuild
 2007170739 ./dev-python/ujson/ujson-1.35-r1.ebuild
 2007201509 ./dev-python/ujson/ujson-3.0.0.ebuild
+2008021509 ./dev-python/ujson/ujson-3.1.0.ebuild
 2006071409 ./dev-python/uncertainties/uncertainties-3.1.4.ebuild
-2006010910 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+2008021239 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
 2003272009 ./dev-python/unidecode/unidecode-0.04.21.ebuild
 2006102109 ./dev-python/unidecode/unidecode-1.1.1.ebuild
 2007120239 ./dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -13903,13 +14364,14 @@
 2004121239 ./dev-python/urllib3/urllib3-1.25.8.ebuild
 2007180239 ./dev-python/urllib3/urllib3-1.25.9.ebuild
 2007231309 ./dev-python/urllib3/urllib3-1.25.10.ebuild
-2006032038 ./dev-python/urwid/urwid-2.1.0.ebuild
+2008021239 ./dev-python/urwid/urwid-2.1.0.ebuild
 2002061039 ./dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
 2003182209 ./dev-python/utidylib/utidylib-0.6.ebuild
 2007201509 ./dev-python/uvloop/uvloop-0.14.0.ebuild
 2007161609 ./dev-python/vcrpy/vcrpy-4.0.2.ebuild
+2008011339 ./dev-python/vcrpy/vcrpy-4.1.0.ebuild
 2007291539 ./dev-python/vcstools/vcstools-0.1.42.ebuild
-2004211009 ./dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+2008021239 ./dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
 2006160909 ./dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
 2006092339 ./dev-python/verboselogs/verboselogs-1.7.ebuild
 2003291439 ./dev-python/versioneer/versioneer-0.18.ebuild
@@ -13919,10 +14381,11 @@
 2007251138 ./dev-python/virtualenv/virtualenv-16.7.10.ebuild
 2007251138 ./dev-python/virtualenv/virtualenv-20.0.27.ebuild
 2007251138 ./dev-python/virtualenv/virtualenv-20.0.28.ebuild
+2008011339 ./dev-python/virtualenv/virtualenv-20.0.29.ebuild
 2005020739 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2002061039 ./dev-python/visitor/visitor-0.1.3.ebuild
 2002061039 ./dev-python/vobject/vobject-0.9.6.1-r1.ebuild
-2005311909 ./dev-python/voluptuous/voluptuous-0.11.5.ebuild
+2008021239 ./dev-python/voluptuous/voluptuous-0.11.5.ebuild
 2001051415 ./dev-python/vpython/vpython-7.4.6.ebuild
 2007251138 ./dev-python/waitress/waitress-1.4.3.ebuild
 2007251138 ./dev-python/waitress/waitress-1.4.4.ebuild
@@ -13933,7 +14396,6 @@
 2007302339 ./dev-python/wcwidth/wcwidth-0.2.5.ebuild
 2003231509 ./dev-python/weasyprint/weasyprint-51.ebuild
 2005101838 ./dev-python/webassets/webassets-2.0.ebuild
-2006092309 ./dev-python/webcolors/webcolors-1.10.ebuild
 2006092309 ./dev-python/webcolors/webcolors-1.11.1.ebuild
 2007271309 ./dev-python/webencodings/webencodings-0.5.1-r1.ebuild
 2007251138 ./dev-python/webob/webob-1.8.5-r3.ebuild
@@ -13955,8 +14417,8 @@
 2006300939 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2007201509 ./dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
 2007251138 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
-2004271139 ./dev-python/wsproto/wsproto-0.15.0.ebuild
-2007162309 ./dev-python/wstools/wstools-0.4.8.ebuild
+2008020739 ./dev-python/wsproto/wsproto-0.15.0.ebuild
+2008021239 ./dev-python/wstools/wstools-0.4.8.ebuild
 2007251138 ./dev-python/wtforms/wtforms-2.2.1.ebuild
 2007251439 ./dev-python/wtforms/wtforms-2.3.1.ebuild
 2007310939 ./dev-python/wtforms/wtforms-2.3.3.ebuild
@@ -13969,7 +14431,7 @@
 2006051939 ./dev-python/xcffib/xcffib-0.9.0.ebuild
 2007211609 ./dev-python/xcffib/xcffib-0.10.0.ebuild
 2007241739 ./dev-python/xcffib/xcffib-0.10.1.ebuild
-2006051939 ./dev-python/xlrd/xlrd-1.2.0.ebuild
+2008010139 ./dev-python/xlrd/xlrd-1.2.0.ebuild
 2006101409 ./dev-python/xlsxwriter/xlsxwriter-1.2.9.ebuild
 2007091209 ./dev-python/xlsxwriter/xlsxwriter-1.2.8.ebuild
 2007300939 ./dev-python/xlsxwriter/xlsxwriter-1.3.0.ebuild
@@ -13984,6 +14446,7 @@
 2001131309 ./dev-python/yaql/yaql-1.1.3.ebuild
 2007161609 ./dev-python/yarl/yarl-1.4.2.ebuild
 2007270909 ./dev-python/yarl/yarl-1.5.0.ebuild
+2008011339 ./dev-python/yarl/yarl-1.5.1.ebuild
 2004200209 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2002052009 ./dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
 2007140239 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -13993,17 +14456,17 @@
 2004032241 ./dev-python/zipp/zipp-1.0.0.ebuild
 2005111839 ./dev-python/zipp/zipp-2.0.1.ebuild
 2005152039 ./dev-python/zipp/zipp-3.1.0.ebuild
-2003081739 ./dev-python/zope-component/zope-component-4.4.1.ebuild
-2001122339 ./dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
+2008021239 ./dev-python/zope-component/zope-component-4.4.1.ebuild
+2008021239 ./dev-python/zope-configuration/zope-configuration-4.3.1.ebuild
 2002112309 ./dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
 2005251939 ./dev-python/zope-event/zope-event-4.4.ebuild
-2001122339 ./dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
-2001051415 ./dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
+2008021239 ./dev-python/zope-exceptions/zope-exceptions-4.3.ebuild
+2008021239 ./dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.0.ebuild
 2004150639 ./dev-python/zope-interface/zope-interface-4.7.1.ebuild
 2007181639 ./dev-python/zope-interface/zope-interface-5.1.0.ebuild
-2001122339 ./dev-python/zope-schema/zope-schema-4.9.3.ebuild
+2008021239 ./dev-python/zope-schema/zope-schema-4.9.3.ebuild
 2007121239 ./dev-python/zope-testing/zope-testing-4.7-r1.ebuild
-2001122339 ./dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
+2008021239 ./dev-python/zope-testrunner/zope-testrunner-5.1.ebuild
 2002121409 ./dev-python/zstandard/zstandard-0.12.0.ebuild
 2005062339 ./dev-python/zstandard/zstandard-0.8.1.ebuild
 2005301009 ./dev-python/zstandard/zstandard-0.13.0.ebuild
@@ -14013,19 +14476,19 @@
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
 2007141909 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
 2007292039 ./dev-python/elementpath/elementpath-1.4.6.ebuild
-2007282039 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
+2008011209 ./dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
 2007251138 ./dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
 2007251138 ./dev-python/pypiserver/pypiserver-1.3.2.ebuild
 2007310539 ./dev-python/pytest-services/pytest-services-2.1.0.ebuild
-2006092309 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
-2006092309 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+2008021239 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+2008021239 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
 2007141909 ./dev-python/towncrier/towncrier-19.2.0.ebuild
 2007300439 ./dev-python/xmlschema/xmlschema-1.2.2.ebuild
 2007120609 ./dev-python/soupsieve/soupsieve-2.0.1.ebuild
 2007251339 ./dev-python/soupsieve/soupsieve-1.9.5.ebuild
 2007251339 ./dev-python/soupsieve/soupsieve-1.9.6.ebuild
 2007310709 ./dev-python/alagitpull/alagitpull-0.0.23.ebuild
-2007091209 ./dev-python/pipfile/pipfile-0.0.2.ebuild
+2008021209 ./dev-python/pipfile/pipfile-0.0.2.ebuild
 1912080109 ./dev-python/flit/flit-2.1.0.ebuild
 2001310039 ./dev-python/flit_core/flit_core-2.1.0.ebuild
 2001310039 ./dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -14042,7 +14505,7 @@
 2006031839 ./dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
 2005101838 ./dev-python/pybind11/pybind11-2.4.3.ebuild
 2007091209 ./dev-python/pybind11/pybind11-2.5.0.ebuild
-2007282039 ./dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+2008011209 ./dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
 2004111109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
 2004111109 ./dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
 2004111109 ./dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -14052,13 +14515,13 @@
 2004111109 ./dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
 2004111109 ./dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
 1912290609 ./dev-python/helpdev/helpdev-0.6.10.ebuild
-2007170739 ./dev-python/helpdev/helpdev-0.7.1.ebuild
+2007312309 ./dev-python/helpdev/helpdev-0.7.1.ebuild
 2006200009 ./dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
 2006200009 ./dev-python/contextvars/contextvars-2.4.ebuild
 2006200009 ./dev-python/immutables/immutables-0.11.ebuild
 2007302309 ./dev-python/immutables/immutables-0.14.ebuild
 2007170739 ./dev-python/libsass/libsass-0.20.0.ebuild
-2007170739 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+2007312309 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
 2007170739 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2007111809 ./dev-python/pikepdf/pikepdf-1.17.0.ebuild
 2007011139 ./dev-python/vdf/vdf-3.3.ebuild
@@ -14077,7 +14540,7 @@
 2004231109 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
 2001241009 ./dev-python/pweave/pweave-0.30.3.ebuild
 2001242209 ./dev-python/snaketrace/snaketrace-0.1.1.ebuild
-2007310339 ./dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+2008020239 ./dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r2.ebuild
 2005041939 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
 2006150309 ./dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
 2007022239 ./dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -14095,8 +14558,7 @@
 2007272339 ./dev-python/sarge/sarge-0.1.5.ebuild
 2005250209 ./dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
 2002140609 ./dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
-2003252109 ./dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
-2007170739 ./dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild
+2008021239 ./dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
 2005270009 ./dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
 2005270009 ./dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
 2005270009 ./dev-python/spyder-notebook/spyder-notebook-0.2.3.ebuild
@@ -14123,6 +14585,7 @@
 2007021140 ./dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
 2007251138 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
 2007021609 ./dev-python/mongomock/mongomock-3.19.0.ebuild
+2008021009 ./dev-python/mongomock/mongomock-3.20.0.ebuild
 2007021609 ./dev-python/sentinels/sentinels-1.0.0.ebuild
 2005071839 ./dev-python/python-caja/python-caja-1.24.0.ebuild
 2004080010 ./dev-python/slackclient/slackclient-2.5.0.ebuild
@@ -14136,6 +14599,7 @@
 2007310609 ./dev-python/cppy/cppy-1.1.0.ebuild
 2004271139 ./dev-python/dataclasses/dataclasses-0.7.ebuild
 2006081339 ./dev-python/blessed/blessed-1.17.8.ebuild
+2007311639 ./dev-python/blessed/blessed-1.17.9.ebuild
 2007310409 ./dev-python/pebble/pebble-4.5.3.ebuild
 2006251009 ./dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
 2007091209 ./dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -14150,10 +14614,10 @@
 2007180509 ./dev-python/cbor2/cbor2-5.1.0.ebuild
 2007180509 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
 2005151109 ./dev-python/pypugjs/pypugjs-5.9.4-r1.ebuild
-2005101639 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
+2008021209 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
 2006062109 ./dev-python/google-api-core/google-api-core-1.17.0.ebuild
 2006062109 ./dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
-2005140739 ./dev-python/bareos/bareos-19.2.7.ebuild
+2008020109 ./dev-python/bareos/bareos-19.2.8.ebuild
 2005302109 ./dev-python/python-vitrageclient/python-vitrageclient-4.0.1.ebuild
 2007091209 ./dev-python/wand/wand-0.6.2.ebuild
 2007251439 ./dev-python/python-email-validator/python-email-validator-1.1.1.ebuild
@@ -14177,9 +14641,10 @@
 2006121909 ./dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
 2007301809 ./dev-python/spur/spur-0.3.21.ebuild
 2007071839 ./dev-python/fsspec/fsspec-0.7.4.ebuild
+2008011339 ./dev-python/fsspec/fsspec-0.8.0.ebuild
 2007021609 ./dev-python/loky/loky-2.8.0-r1.ebuild
 2006190009 ./dev-python/text-unidecode/text-unidecode-1.3.ebuild
-2007300739 ./dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+2008011209 ./dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
 2007202039 ./dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
 2006281409 ./dev-python/latexcodec/latexcodec-2.0.0.ebuild
 2006281409 ./dev-python/pybtex/pybtex-0.22.2.ebuild
@@ -14194,7 +14659,7 @@
 2007240239 ./dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
 2007291439 ./dev-python/PyICU/PyICU-2.4.3.ebuild
 2007291439 ./dev-python/PyICU/PyICU-2.5.ebuild
-2007310239 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
+2008021539 ./dev-python/iniconfig/iniconfig-1.0.0.ebuild
 2005201639 ./dev-qt/assistant/assistant-5.14.2.ebuild
 2005261809 ./dev-qt/assistant/assistant-5.15.0.ebuild
 2005261809 ./dev-qt/designer/designer-5.15.0.ebuild
@@ -14365,10 +14830,10 @@
 2007162039 ./dev-ros/collada_urdf/collada_urdf-9999.ebuild
 2007082039 ./dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
 2007082039 ./dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
-2007291539 ./dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
-2007291539 ./dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
-2007291539 ./dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
-2007291539 ./dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
+2007311339 ./dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
+2007311339 ./dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
+2007311339 ./dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.14.0.ebuild
+2007311339 ./dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
 2007291539 ./dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
 2007291539 ./dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
 2007162039 ./dev-ros/control_msgs/control_msgs-1.5.2.ebuild
@@ -14377,12 +14842,12 @@
 2007162039 ./dev-ros/control_toolbox/control_toolbox-9999.ebuild
 2007082039 ./dev-ros/controller_interface/controller_interface-0.19.1.ebuild
 2007082039 ./dev-ros/controller_interface/controller_interface-9999.ebuild
-2007291539 ./dev-ros/controller_manager/controller_manager-0.19.1.ebuild
-2007291539 ./dev-ros/controller_manager/controller_manager-9999.ebuild
+2007311339 ./dev-ros/controller_manager/controller_manager-0.19.1.ebuild
+2007311339 ./dev-ros/controller_manager/controller_manager-9999.ebuild
 2007291539 ./dev-ros/controller_manager_msgs/controller_manager_msgs-0.19.1.ebuild
 2007291539 ./dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
-2007291539 ./dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
-2007291539 ./dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
+2007311339 ./dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
+2007311339 ./dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
 2007162039 ./dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
 2007162039 ./dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
 2007291539 ./dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild
@@ -14393,8 +14858,8 @@
 2007291539 ./dev-ros/cv_bridge/cv_bridge-9999.ebuild
 2007091509 ./dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
 2007091509 ./dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
-2007291539 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
-2007291539 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+2007311339 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
+2007311339 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
 2007091509 ./dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4.ebuild
 2007091509 ./dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
 2007291539 ./dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
@@ -14409,8 +14874,8 @@
 2007162039 ./dev-ros/driver_base/driver_base-9999.ebuild
 2007291539 ./dev-ros/dwa_local_planner/dwa_local_planner-1.17.0.ebuild
 2007291539 ./dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
-2007291639 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
-2007291639 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+2007311339 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
+2007311339 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
 2007091409 ./dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
 2007091409 ./dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
 2007162039 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
@@ -14487,16 +14952,16 @@
 2007291539 ./dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
 2007291539 ./dev-ros/image_geometry/image_geometry-1.15.0.ebuild
 2007291539 ./dev-ros/image_geometry/image_geometry-9999.ebuild
-2007091509 ./dev-ros/image_proc/image_proc-1.15.2.ebuild
-2007091509 ./dev-ros/image_proc/image_proc-9999.ebuild
+2007311339 ./dev-ros/image_proc/image_proc-1.15.2.ebuild
+2007311339 ./dev-ros/image_proc/image_proc-9999.ebuild
 2007091509 ./dev-ros/image_publisher/image_publisher-1.15.2.ebuild
 2007091509 ./dev-ros/image_publisher/image_publisher-9999.ebuild
 2007091509 ./dev-ros/image_rotate/image_rotate-1.15.2.ebuild
 2007091509 ./dev-ros/image_rotate/image_rotate-9999.ebuild
 2007161609 ./dev-ros/image_transport/image_transport-1.12.0.ebuild
 2007161609 ./dev-ros/image_transport/image_transport-9999.ebuild
-2007291539 ./dev-ros/image_view/image_view-1.15.2.ebuild
-2007291539 ./dev-ros/image_view/image_view-9999.ebuild
+2007311339 ./dev-ros/image_view/image_view-1.15.2-r1.ebuild
+2007311339 ./dev-ros/image_view/image_view-9999.ebuild
 2007091539 ./dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
 2007091539 ./dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
 2007301609 ./dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
@@ -14523,14 +14988,14 @@
 2007091409 ./dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
 2007291539 ./dev-ros/kdl_parser/kdl_parser-1.14.0.ebuild
 2007291539 ./dev-ros/kdl_parser/kdl_parser-9999.ebuild
-2007291739 ./dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
-2007291739 ./dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+2007311409 ./dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
+2007311409 ./dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
 2007291539 ./dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
 2007291539 ./dev-ros/laser_assembler/laser_assembler-9999.ebuild
-2007291539 ./dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
-2007291539 ./dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
-2007291539 ./dev-ros/laser_filters/laser_filters-1.8.11.ebuild
-2007291539 ./dev-ros/laser_filters/laser_filters-9999.ebuild
+2007311409 ./dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+2007311409 ./dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
+2007311409 ./dev-ros/laser_filters/laser_filters-1.8.11.ebuild
+2007311409 ./dev-ros/laser_filters/laser_filters-9999.ebuild
 2007291539 ./dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
 2007291539 ./dev-ros/laser_geometry/laser_geometry-9999.ebuild
 2007161939 ./dev-ros/laser_proc/laser_proc-0.1.6.ebuild
@@ -14548,8 +15013,8 @@
 2007161939 ./dev-ros/mavros/mavros-9999.ebuild
 2007161939 ./dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
 2007161939 ./dev-ros/mavros_extras/mavros_extras-9999.ebuild
-2007161939 ./dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
-2007161939 ./dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+2007311339 ./dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
+2007311339 ./dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
 2007161939 ./dev-ros/media_export/media_export-0.3.0.ebuild
 2007161939 ./dev-ros/media_export/media_export-9999.ebuild
 2007291539 ./dev-ros/message_filters/message_filters-1.15.7.ebuild
@@ -14595,8 +15060,8 @@
 2007161939 ./dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
 2007161609 ./dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
 2007161609 ./dev-ros/octomap_ros/octomap_ros-9999.ebuild
-2007291539 ./dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
-2007291539 ./dev-ros/opencv_apps/opencv_apps-9999.ebuild
+2007311409 ./dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+2007311409 ./dev-ros/opencv_apps/opencv_apps-9999.ebuild
 2007291539 ./dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
 2007291539 ./dev-ros/opencv_tests/opencv_tests-9999.ebuild
 2007291539 ./dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
@@ -14622,8 +15087,8 @@
 2007161609 ./dev-ros/polled_camera/polled_camera-9999.ebuild
 2007291539 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
 2007291539 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
-2007291639 ./dev-ros/pr2_description/pr2_description-1.12.4.ebuild
-2007291639 ./dev-ros/pr2_description/pr2_description-9999.ebuild
+2007311639 ./dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+2007311639 ./dev-ros/pr2_description/pr2_description-9999.ebuild
 2007161609 ./dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
 2007161609 ./dev-ros/pr2_machine/pr2_machine-9999.ebuild
 2007161609 ./dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
@@ -14672,9 +15137,8 @@
 2007291539 ./dev-ros/rosbag/rosbag-9999.ebuild
 2007151839 ./dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.1.ebuild
 2007151839 ./dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
-2007082039 ./dev-ros/rosbag_storage/rosbag_storage-1.15.7.ebuild
-2007082039 ./dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
-2007291539 ./dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild
+2007311339 ./dev-ros/rosbag_storage/rosbag_storage-1.15.8.ebuild
+2007311339 ./dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
 2007102009 ./dev-ros/rosbash/rosbash-1.15.5.ebuild
 2007102009 ./dev-ros/rosbash/rosbash-9999.ebuild
 2007291539 ./dev-ros/rosbash/rosbash-1.15.6.ebuild
@@ -14717,7 +15181,6 @@
 2007102009 ./dev-ros/roslang/roslang-1.15.5.ebuild
 2007102009 ./dev-ros/roslang/roslang-9999.ebuild
 2007291539 ./dev-ros/roslang/roslang-1.15.6.ebuild
-2007291539 ./dev-ros/roslaunch/roslaunch-1.15.7.ebuild
 2007291539 ./dev-ros/roslaunch/roslaunch-1.15.8.ebuild
 2007291539 ./dev-ros/roslaunch/roslaunch-9999.ebuild
 2007291609 ./dev-ros/roslib/roslib-1.15.6.ebuild
@@ -14737,9 +15200,8 @@
 2007291539 ./dev-ros/rosmsg/rosmsg-1.15.7.ebuild
 2007291539 ./dev-ros/rosmsg/rosmsg-1.15.8.ebuild
 2007291539 ./dev-ros/rosmsg/rosmsg-9999.ebuild
-2007291539 ./dev-ros/rosnode/rosnode-1.15.7.ebuild
-2007291539 ./dev-ros/rosnode/rosnode-1.15.8.ebuild
-2007291539 ./dev-ros/rosnode/rosnode-9999.ebuild
+2007311639 ./dev-ros/rosnode/rosnode-1.15.8.ebuild
+2007311639 ./dev-ros/rosnode/rosnode-9999.ebuild
 2007082039 ./dev-ros/rosout/rosout-1.15.7.ebuild
 2007082039 ./dev-ros/rosout/rosout-9999.ebuild
 2007291539 ./dev-ros/rosout/rosout-1.15.8.ebuild
@@ -14751,8 +15213,8 @@
 2007291539 ./dev-ros/rospy/rospy-1.15.7.ebuild
 2007291539 ./dev-ros/rospy/rospy-1.15.8.ebuild
 2007291539 ./dev-ros/rospy/rospy-9999.ebuild
-2007291808 ./dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
-2007291808 ./dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
+2007311639 ./dev-ros/rospy_tutorials/rospy_tutorials-0.10.1.ebuild
+2007311639 ./dev-ros/rospy_tutorials/rospy_tutorials-9999.ebuild
 2007291539 ./dev-ros/rosserial_arduino/rosserial_arduino-0.8.0.ebuild
 2007291539 ./dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
 2007291539 ./dev-ros/rosserial_client/rosserial_client-0.8.0.ebuild
@@ -14902,9 +15364,8 @@
 2007291539 ./dev-ros/test_rosbag/test_rosbag-1.15.7.ebuild
 2007291539 ./dev-ros/test_rosbag/test_rosbag-1.15.8.ebuild
 2007291539 ./dev-ros/test_rosbag/test_rosbag-9999.ebuild
-2007082039 ./dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.7.ebuild
-2007082039 ./dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
 2007291539 ./dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.8.ebuild
+2007311339 ./dev-ros/test_rosbag_storage/test_rosbag_storage-9999.ebuild
 2007291539 ./dev-ros/test_roscpp/test_roscpp-1.15.7.ebuild
 2007291539 ./dev-ros/test_roscpp/test_roscpp-1.15.8.ebuild
 2007291539 ./dev-ros/test_roscpp/test_roscpp-9999.ebuild
@@ -15009,10 +15470,8 @@
 2007101909 ./dev-ros/voxel_grid/voxel_grid-1.17.0.ebuild
 2007291539 ./dev-ros/xacro/xacro-1.14.1.ebuild
 2007291539 ./dev-ros/xacro/xacro-9999.ebuild
-2005181938 ./dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
-2005181938 ./dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
-2007082039 ./dev-ros/xmlrpcpp/xmlrpcpp-1.15.7.ebuild
-2007291539 ./dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
+2007311339 ./dev-ros/xmlrpcpp/xmlrpcpp-1.15.8.ebuild
+2007311339 ./dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
 2007231839 ./dev-ros/ament_cmake_core/ament_cmake_core-0.9.6.ebuild
 2007231839 ./dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
 2007292139 ./dev-ros/ament_cmake_core/ament_cmake_core-1.0.0.ebuild
@@ -15724,22 +16183,20 @@
 1902231039 ./dev-ruby/nokogumbo/nokogumbo-2.0.1.ebuild
 2004120939 ./dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
 1901311039 ./dev-ruby/notify/notify-0.5.2-r1.ebuild
-1901311039 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+2008011209 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
 2005311139 ./dev-ruby/oauth/oauth-0.5.4.ebuild
 2002020939 ./dev-ruby/oauth2/oauth2-1.4.3.ebuild
 2007200509 ./dev-ruby/oauth2/oauth2-1.4.4.ebuild
 2003111039 ./dev-ruby/octokit/octokit-4.17.0.ebuild
 2003291109 ./dev-ruby/octokit/octokit-4.18.0.ebuild
 2007170409 ./dev-ruby/octokit/octokit-4.18.0-r1.ebuild
-1903301009 ./dev-ruby/omniauth/omniauth-1.9.0.ebuild
 2003031039 ./dev-ruby/omniauth/omniauth-1.9.1.ebuild
 2004122139 ./dev-ruby/open4/open4-1.3.4.ebuild
 1712290939 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild
-1901091239 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
-2004122139 ./dev-ruby/optimist/optimist-3.0.0.ebuild
+2008011209 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
 2004220909 ./dev-ruby/optimist/optimist-3.0.1.ebuild
-1901290109 ./dev-ruby/optionable/optionable-0.2.0.ebuild
-1901290109 ./dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
+2008011209 ./dev-ruby/optionable/optionable-0.2.0.ebuild
+2008011209 ./dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
 2005240739 ./dev-ruby/origin/origin-2.3.1.ebuild
 1911090939 ./dev-ruby/ox/ox-2.10.1.ebuild
 1906151309 ./dev-ruby/ox/ox-2.11.0.ebuild
@@ -15748,13 +16205,11 @@
 2002011009 ./dev-ruby/ox/ox-2.13.1.ebuild
 2002100939 ./dev-ruby/ox/ox-2.13.2.ebuild
 2005302209 ./dev-ruby/packetfu/packetfu-1.1.13.ebuild
-1901181139 ./dev-ruby/paint/paint-2.1.0.ebuild
-1908290839 ./dev-ruby/paint/paint-2.1.1.ebuild
 2002220839 ./dev-ruby/paint/paint-2.2.0.ebuild
 1910070839 ./dev-ruby/parallel/parallel-1.18.0.ebuild
 2005302209 ./dev-ruby/parallel/parallel-1.19.1.ebuild
 2006170909 ./dev-ruby/parallel/parallel-1.19.2.ebuild
-1901212309 ./dev-ruby/paramesan/paramesan-0.1.1.ebuild
+2008011209 ./dev-ruby/paramesan/paramesan-0.1.1.ebuild
 1910030939 ./dev-ruby/parser/parser-2.6.5.0.ebuild
 2004050809 ./dev-ruby/parser/parser-2.7.1.0.ebuild
 2004170809 ./dev-ruby/parser/parser-2.7.1.1.ebuild
@@ -15775,14 +16230,14 @@
 1904292139 ./dev-ruby/patron/patron-0.13.1-r1.ebuild
 2005302209 ./dev-ruby/patron/patron-0.13.3.ebuild
 1801222238 ./dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
-1901290109 ./dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
+2008011209 ./dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
 2004122139 ./dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
 2004122139 ./dev-ruby/pdf-core/pdf-core-0.8.1.ebuild
 2004122139 ./dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
 2004122139 ./dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild
 2004122139 ./dev-ruby/pdf-reader/pdf-reader-2.3.0.ebuild
 2004122139 ./dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild
-1901290109 ./dev-ruby/permutation/permutation-0.1.8-r1.ebuild
+2008011209 ./dev-ruby/permutation/permutation-0.1.8-r1.ebuild
 2003180939 ./dev-ruby/pg/pg-0.21.0.ebuild
 2006151839 ./dev-ruby/pg/pg-1.2.2.ebuild
 1901290109 ./dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
@@ -16461,7 +16916,6 @@
 2001191739 ./dev-tex/biblatex-gost/biblatex-gost-1.17.ebuild
 1909272239 ./dev-tex/biblatex/biblatex-3.12.ebuild
 2005041739 ./dev-tex/biblatex/biblatex-3.14.ebuild
-1805050508 ./dev-tex/bibtex2html/bibtex2html-1.98.ebuild
 2002111439 ./dev-tex/bibtex2html/bibtex2html-1.99.ebuild
 2005311939 ./dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
 1909082039 ./dev-tex/catdvi/catdvi-0.14-r2.ebuild
@@ -16492,7 +16946,7 @@
 2004032241 ./dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
 1911100209 ./dev-tex/latex-calendar/latex-calendar-3.1.ebuild
 2006280009 ./dev-tex/latex2html/latex2html-2015.ebuild
-2006280009 ./dev-tex/latex2html/latex2html-2017.2-r2.ebuild
+2008021609 ./dev-tex/latex2html/latex2html-2017.2-r2.ebuild
 2004032241 ./dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
 2004032241 ./dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
 2003261841 ./dev-tex/latexdiff/latexdiff-9999.ebuild
@@ -16706,7 +17160,6 @@
 2005060009 ./dev-util/byacc/byacc-20191125.ebuild
 1911160409 ./dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
 2005090009 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
-2006050509 ./dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild
 2004241039 ./dev-util/catalyst/catalyst-3.0.9.ebuild
 2005190708 ./dev-util/catalyst/catalyst-9999.ebuild
 2005232339 ./dev-util/catalyst/catalyst-3.0.12.ebuild
@@ -16717,7 +17170,7 @@
 2007271739 ./dev-util/cbindgen/cbindgen-0.14.3.ebuild
 2005302309 ./dev-util/ccache/ccache-3.7.9.ebuild
 2007212309 ./dev-util/ccache/ccache-3.7.11.ebuild
-2007282039 ./dev-util/ccache/ccache-3.7.10.ebuild
+2008011209 ./dev-util/ccache/ccache-3.7.10.ebuild
 2002091639 ./dev-util/cccc/cccc-3.1.5-r1.ebuild
 1912210209 ./dev-util/cflow/cflow-1.6.ebuild
 1912110241 ./dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -16743,9 +17196,10 @@
 1804120208 ./dev-util/cmake-fedora/cmake-fedora-2.7.1.ebuild
 2005221739 ./dev-util/cmake/cmake-3.13.5.ebuild
 2005221739 ./dev-util/cmake/cmake-3.16.5.ebuild
-2005221739 ./dev-util/cmake/cmake-3.17.2.ebuild
 2005301139 ./dev-util/cmake/cmake-3.17.3.ebuild
 2007221939 ./dev-util/cmake/cmake-3.18.0.ebuild
+2007311439 ./dev-util/cmake/cmake-3.17.4.ebuild
+2007311439 ./dev-util/cmake/cmake-3.18.1.ebuild
 2004032241 ./dev-util/cmdtest/cmdtest-0.30.ebuild
 2004032241 ./dev-util/cmdtest/cmdtest-0.32.ebuild
 2004032241 ./dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -16826,7 +17280,7 @@
 2004032241 ./dev-util/debootstrap/debootstrap-1.0.115.ebuild
 2006270039 ./dev-util/debootstrap/debootstrap-1.0.123.ebuild
 1912311139 ./dev-util/debugedit/debugedit-4.15.0.ebuild
-2004301309 ./dev-util/debugedit/debugedit-4.15.1.ebuild
+2008021509 ./dev-util/debugedit/debugedit-4.15.1.ebuild
 2004211009 ./dev-util/dejagnu/dejagnu-1.6.ebuild
 2006290009 ./dev-util/dejagnu/dejagnu-1.6.2.ebuild
 2004032241 ./dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -16837,7 +17291,7 @@
 2006062109 ./dev-util/dialog/dialog-1.3.20170131.ebuild
 2004032241 ./dev-util/diffball/diffball-1.0.1-r2.ebuild
 2003211339 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
-2007242338 ./dev-util/diffoscope/diffoscope-153.ebuild
+2008010209 ./dev-util/diffoscope/diffoscope-154.ebuild
 2003261841 ./dev-util/diffstat/diffstat-1.63.ebuild
 2006062109 ./dev-util/diffstat/diffstat-1.60.ebuild
 2006062109 ./dev-util/diffstat/diffstat-1.61.ebuild
@@ -16861,13 +17315,8 @@
 1702282250 ./dev-util/dropwatch/dropwatch-1.4-r1.ebuild
 1702282250 ./dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
 2002230040 ./dev-util/duma/duma-2.5.15-r2.ebuild
-1912031409 ./dev-util/dwarves/dwarves-1.12.ebuild
-1912031409 ./dev-util/dwarves/dwarves-1.13.ebuild
-1912031409 ./dev-util/dwarves/dwarves-1.15.ebuild
-1912170009 ./dev-util/dwarves/dwarves-1.16-r1.ebuild
-1912170009 ./dev-util/dwarves/dwarves-1.16.ebuild
 2002122239 ./dev-util/dwarves/dwarves-9999.ebuild
-2005071309 ./dev-util/dwarves/dwarves-1.17.ebuild
+2008011709 ./dev-util/dwarves/dwarves-1.17.ebuild
 1812240109 ./dev-util/dwdiff/dwdiff-2.1.1.ebuild
 1812240109 ./dev-util/dwdiff/dwdiff-2.1.2.ebuild
 2001191639 ./dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -16908,8 +17357,8 @@
 2006080009 ./dev-util/glib-utils/glib-utils-2.62.6.ebuild
 2007132339 ./dev-util/glib-utils/glib-utils-2.64.4.ebuild
 1912210209 ./dev-util/global/global-6.5.7.ebuild
-1912310609 ./dev-util/global/global-6.6.4.ebuild
 2002151310 ./dev-util/global/global-6.3.1.ebuild
+2008011209 ./dev-util/global/global-6.6.4.ebuild
 2002270739 ./dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
 2003160039 ./dev-util/glslang/glslang-8.13.3559.ebuild
 2006160239 ./dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
@@ -17003,9 +17452,9 @@
 2005071839 ./dev-util/lldb/lldb-9.0.1-r1.ebuild
 2006232139 ./dev-util/lldb/lldb-11.0.0.9999.ebuild
 2007152209 ./dev-util/lldb/lldb-12.0.0.9999.ebuild
-2007181809 ./dev-util/lldb/lldb-10.0.0.ebuild
 2007212239 ./dev-util/lldb/lldb-10.0.1.ebuild
 2007291339 ./dev-util/lldb/lldb-11.0.0_rc1.ebuild
+2008010139 ./dev-util/lldb/lldb-10.0.0.ebuild
 2002230040 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2006212138 ./dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -17020,7 +17469,7 @@
 2005172009 ./dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
 2007191709 ./dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
 2005210239 ./dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
-2005210239 ./dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
+2007311939 ./dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
 1712280139 ./dev-util/makeheaders/makeheaders-0_p4.ebuild
 1907310209 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 2002112051 ./dev-util/makepp/makepp-2.0.99.1.ebuild
@@ -17380,9 +17829,11 @@
 2006290409 ./dev-vcs/darcs/darcs-2.12.0.ebuild
 2006290409 ./dev-vcs/darcs/darcs-2.12.4.ebuild
 2006290409 ./dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+2008011139 ./dev-vcs/darcs/darcs-2.14.4.ebuild
 1807302309 ./dev-vcs/easygit/easygit-1.7.5.2.ebuild
 2007171109 ./dev-vcs/fossil/fossil-2.11.1.ebuild
 1911101840 ./dev-vcs/git-annex/git-annex-6.20170818-r1.ebuild
+2008011139 ./dev-vcs/git-annex/git-annex-8.20200617.ebuild
 2001051415 ./dev-vcs/git-bz/git-bz-0.2015.09.08.ebuild
 2003221739 ./dev-vcs/git-cola/git-cola-3.5-r1.ebuild
 1712241839 ./dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
@@ -17438,7 +17889,7 @@
 1707301237 ./dev-vcs/gitstats/gitstats-9999.ebuild
 1805201639 ./dev-vcs/gti/gti-9999.ebuild
 2002112051 ./dev-vcs/guilt/guilt-0.36-r1.ebuild
-2005100128 ./dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild
+2008021909 ./dev-vcs/hg-evolve/hg-evolve-10.0.1.ebuild
 1804262239 ./dev-vcs/hg-git/hg-git-0.8.8.ebuild
 2002021639 ./dev-vcs/hg-git/hg-git-0.8.13.ebuild
 2005302339 ./dev-vcs/hg-git/hg-git-0.9.0_rc1.ebuild
@@ -17446,10 +17897,10 @@
 2005260939 ./dev-vcs/hub/hub-2.14.1.ebuild
 2006142109 ./dev-vcs/hub/hub-2.14.2.ebuild
 2002230040 ./dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
-2006281509 ./dev-vcs/mercurial/mercurial-5.4.1.ebuild
 2006281509 ./dev-vcs/mercurial/mercurial-9999.ebuild
 2007261139 ./dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
 2007261139 ./dev-vcs/mercurial/mercurial-5.3.2.ebuild
+2008021339 ./dev-vcs/mercurial/mercurial-5.4.2.ebuild
 1705101844 ./dev-vcs/mr/mr-1.20170129.ebuild
 1807091709 ./dev-vcs/mr/mr-1.20171231.ebuild
 1906302139 ./dev-vcs/mr/mr-1.20180726.ebuild
@@ -17782,7 +18233,6 @@
 1801290438 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
 1912081509 ./games-board/tali/tali-3.32.1.ebuild
 2007050039 ./games-board/tali/tali-3.36.4.ebuild
-1902080209 ./games-board/teg/teg-0.11.2-r1.ebuild
 2002230040 ./games-board/tetzle/tetzle-2.1.3.ebuild
 2001220239 ./games-board/xboard/xboard-4.9.1.ebuild
 1805220609 ./games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -17833,8 +18283,8 @@
 1808150339 ./games-emulation/libretro-twentyfortyeight/libretro-twentyfortyeight-0.0.1_pre20180723.ebuild
 1808150339 ./games-emulation/libretro-twentyfortyeight/libretro-twentyfortyeight-9999.ebuild
 1804291439 ./games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
-2001051415 ./games-emulation/m64py/m64py-0.2.4.ebuild
 2007121009 ./games-emulation/m64py/m64py-0.2.5.ebuild
+2008020139 ./games-emulation/m64py/m64py-0.2.4.ebuild
 1804291439 ./games-emulation/mamory/mamory-0.2.25-r1.ebuild
 1904032239 ./games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild
 1910290109 ./games-emulation/mednafen/mednafen-0.9.46.ebuild
@@ -18443,7 +18893,7 @@
 2004032241 ./gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
 2004032241 ./gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
 2006132027 ./gnome-base/libglade/libglade-2.6.4-r2.ebuild
-2007302309 ./gnome-base/libglade/libglade-2.6.4-r3.ebuild
+2008012239 ./gnome-base/libglade/libglade-2.6.4-r3.ebuild
 2004301909 ./gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
 2004032241 ./gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
 2006132027 ./gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -18451,6 +18901,7 @@
 2004032241 ./gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
 2006162009 ./gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
 2006132027 ./gnome-base/librsvg/librsvg-2.40.21.ebuild
+2008020109 ./gnome-base/librsvg/librsvg-2.48.8.ebuild
 2006291909 ./gnome-base/nautilus/nautilus-3.34.3.ebuild
 2007130039 ./gnome-base/nautilus/nautilus-3.36.3.ebuild
 2004032241 ./gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -18533,7 +18984,9 @@
 2007190239 ./gnome-extra/sushi/sushi-3.34.0.ebuild
 2005012109 ./gnome-extra/synapse/synapse-0.2.99.4.ebuild
 2006162009 ./gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
+2008021439 ./gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
 2007190239 ./gnome-extra/yelp/yelp-3.34.0.ebuild
+2008021439 ./gnome-extra/yelp/yelp-3.36.0.ebuild
 2003261841 ./gnome-extra/zenity/zenity-3.32.0.ebuild
 2004230009 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
 2007151139 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-13.ebuild
@@ -18728,6 +19181,7 @@
 2007301039 ./kde-apps/analitza/analitza-20.04.3.ebuild
 2003190939 ./kde-apps/ark/ark-19.12.3.ebuild
 2007301039 ./kde-apps/ark/ark-20.04.3.ebuild
+2008020209 ./kde-apps/ark/ark-20.04.3-r1.ebuild
 2003190939 ./kde-apps/artikulate/artikulate-19.12.3.ebuild
 2007301039 ./kde-apps/artikulate/artikulate-20.04.3.ebuild
 2003190939 ./kde-apps/audiocd-kio/audiocd-kio-19.12.3.ebuild
@@ -18882,6 +19336,7 @@
 2007301039 ./kde-apps/kdepim-meta/kdepim-meta-20.04.3.ebuild
 2003190939 ./kde-apps/kdepim-runtime/kdepim-runtime-19.12.3.ebuild
 2007301039 ./kde-apps/kdepim-runtime/kdepim-runtime-20.04.3.ebuild
+2008020209 ./kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
 2003190939 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.3.ebuild
 2007301039 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-20.04.3.ebuild
 2004271709 ./kde-apps/kdesdk-meta/kdesdk-meta-19.12.3.ebuild
@@ -18956,6 +19411,7 @@
 2007301039 ./kde-apps/kmahjongg/kmahjongg-20.04.3.ebuild
 2003190939 ./kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.3.ebuild
 2007301039 ./kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3.ebuild
+2008020209 ./kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
 2003190939 ./kde-apps/kmail/kmail-19.12.3.ebuild
 2007301039 ./kde-apps/kmail/kmail-20.04.3.ebuild
 2003190939 ./kde-apps/kmailtransport/kmailtransport-19.12.3.ebuild
@@ -19346,8 +19802,6 @@
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
 2002241739 ./kde-misc/kdeconnect/kdeconnect-1.4.ebuild
 2007301039 ./kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild
-2005101239 ./kde-misc/kdiff3/kdiff3-1.8.2-r1.ebuild
-2006251339 ./kde-misc/kdiff3/kdiff3-1.8.3.ebuild
 2007301039 ./kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
 2005111509 ./kde-misc/kdirstat/kdirstat-3.2.1.ebuild
 1912250439 ./kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
@@ -19369,7 +19823,6 @@
 2006071239 ./kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
 2001020339 ./kde-misc/playbar2/playbar2-2.5-r1.ebuild
 2005081846 ./kde-misc/rsibreak/rsibreak-0.12.13.ebuild
-1912251909 ./kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
 2007301039 ./kde-misc/skanlite/skanlite-2.2.0.ebuild
 2007280139 ./kde-misc/tellico/tellico-3.3.1.ebuild
 2006071309 ./kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -19411,7 +19864,7 @@
 2005211709 ./kde-plasma/kscreen/kscreen-5.18.5.ebuild
 2007281909 ./kde-plasma/kscreen/kscreen-5.19.4.ebuild
 2005211709 ./kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
-2007281909 ./kde-plasma/kscreenlocker/kscreenlocker-5.19.4.ebuild
+2008020209 ./kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
 2005211709 ./kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
 2007281909 ./kde-plasma/ksshaskpass/ksshaskpass-5.19.4.ebuild
 2005211709 ./kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
@@ -19463,7 +19916,7 @@
 2007281909 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.4.ebuild
 2005211709 ./kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
 2006231839 ./kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
-2007281909 ./kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
+2008020209 ./kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
 2005211709 ./kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
 2007281909 ./kde-plasma/sddm-kcm/sddm-kcm-5.19.4.ebuild
 2005211709 ./kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
@@ -19506,40 +19959,40 @@
 2001282209 ./lxde-base/menu-cache/menu-cache-1.1.0.ebuild
 2005210239 ./lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
 2005210239 ./lxqt-base/liblxqt/liblxqt-0.15.0.ebuild
-2006150209 ./lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
+2007311939 ./lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
 2005210239 ./lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
-2005210239 ./lxqt-base/libsysstat/libsysstat-0.4.3.ebuild
+2007311939 ./lxqt-base/libsysstat/libsysstat-0.4.3.ebuild
 2005210239 ./lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-about/lxqt-about-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-admin/lxqt-admin-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-config/lxqt-config-0.14.1-r1.ebuild
 2005210239 ./lxqt-base/lxqt-config/lxqt-config-0.15.0.ebuild
-2006150209 ./lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
+2007311939 ./lxqt-base/lxqt-config/lxqt-config-0.15.0-r1.ebuild
 2005210239 ./lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
 2005210239 ./lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
-2005210239 ./lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
-2005210239 ./lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-meta/lxqt-meta-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-notificationd/lxqt-notificationd-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
+2007311939 ./lxqt-base/lxqt-panel/lxqt-panel-0.15.1.ebuild
 2005210239 ./lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-policykit/lxqt-policykit-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
 2005212308 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.0-r1.ebuild
-2006150209 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
+2007311939 ./lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
 2005210239 ./lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-runner/lxqt-runner-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-session/lxqt-session-0.15.0.ebuild
 2005210239 ./lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
-2005210239 ./lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild
+2007311939 ./lxqt-base/lxqt-sudo/lxqt-sudo-0.15.0.ebuild
 2005200938 ./mail-client/aerc/aerc-0.4.0.ebuild
 2005200938 ./mail-client/aerc/aerc-9999.ebuild
 2001082109 ./mail-client/alot/alot-0.8.1.ebuild
@@ -19714,8 +20167,8 @@
 2005221808 ./mate-base/mate-menus/mate-menus-1.24.0-r2.ebuild
 2004062209 ./mate-base/mate-panel/mate-panel-1.24.0-r1.ebuild
 2005081846 ./mate-base/mate-panel/mate-panel-1.22.2-r1.ebuild
-2004132039 ./mate-base/mate-session-manager/mate-session-manager-1.24.0-r2.ebuild
-2005081846 ./mate-base/mate-session-manager/mate-session-manager-1.22.3-r2.ebuild
+2008021039 ./mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild
+2008021039 ./mate-base/mate-session-manager/mate-session-manager-1.24.0-r3.ebuild
 2004062109 ./mate-base/mate-settings-daemon/mate-settings-daemon-1.24.0.ebuild
 2005081846 ./mate-base/mate-settings-daemon/mate-settings-daemon-1.22.1.ebuild
 1904220509 ./mate-base/mate/mate-1.22.ebuild
@@ -19735,9 +20188,9 @@
 2005081846 ./mate-extra/mate-netbook/mate-netbook-1.22.2.ebuild
 2004062109 ./mate-extra/mate-polkit/mate-polkit-1.24.0.ebuild
 2005081846 ./mate-extra/mate-polkit/mate-polkit-1.22.0-r1.ebuild
-2004062109 ./mate-extra/mate-power-manager/mate-power-manager-1.22.1.ebuild
-2004081839 ./mate-extra/mate-power-manager/mate-power-manager-1.24.1.ebuild
-2005081846 ./mate-extra/mate-power-manager/mate-power-manager-1.22.2.ebuild
+2008021039 ./mate-extra/mate-power-manager/mate-power-manager-1.22.1-r1.ebuild
+2008021039 ./mate-extra/mate-power-manager/mate-power-manager-1.22.2-r1.ebuild
+2008021039 ./mate-extra/mate-power-manager/mate-power-manager-1.24.1-r1.ebuild
 2004062109 ./mate-extra/mate-screensaver/mate-screensaver-1.24.0.ebuild
 2005081846 ./mate-extra/mate-screensaver/mate-screensaver-1.22.2.ebuild
 2004062109 ./mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -19935,7 +20388,7 @@
 2007230439 ./media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
 2002112051 ./media-fonts/noto/noto-20190524.ebuild
 2003120039 ./media-fonts/noto/noto-20200308.ebuild
-2007310809 ./media-fonts/noto/noto-20200521.ebuild
+2008011239 ./media-fonts/noto/noto-20200521.ebuild
 1802140308 ./media-fonts/nunito/nunito-1.0-r1.ebuild
 1702282250 ./media-fonts/nuosu-sil/nuosu-sil-2.1.1.ebuild
 1702282250 ./media-fonts/ohsnap/ohsnap-1.8.0.ebuild
@@ -20039,7 +20492,6 @@
 1912131839 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
 2002101639 ./media-gfx/birdfont/birdfont-2.18.3.ebuild
 2004261309 ./media-gfx/blender/blender-2.79b-r2.ebuild
-2003192209 ./media-gfx/cairosvg/cairosvg-1.0.22.ebuild
 2005032209 ./media-gfx/cairosvg/cairosvg-2.4.2.ebuild
 1805010009 ./media-gfx/cellwriter/cellwriter-1.3.5.ebuild
 1906102309 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -20067,8 +20519,8 @@
 2007270509 ./media-gfx/darktable/darktable-3.0.2.ebuild
 1805191409 ./media-gfx/dawn/dawn-3.90b-r1.ebuild
 2007230839 ./media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
-2006160209 ./media-gfx/digikam/digikam-7.0.0_rc.ebuild
 2007010109 ./media-gfx/digikam/digikam-6.4.0-r1.ebuild
+2008020209 ./media-gfx/digikam/digikam-7.0.0.ebuild
 2001230109 ./media-gfx/displaycal/displaycal-3.8.8.1-r1.ebuild
 2004101139 ./media-gfx/displaycal/displaycal-3.8.9.3-r1.ebuild
 1710052115 ./media-gfx/ditaa/ditaa-0.10.ebuild
@@ -20084,6 +20536,7 @@
 2003161239 ./media-gfx/entangle/entangle-2.0.ebuild
 2002091942 ./media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
 1912081509 ./media-gfx/eog/eog-3.32.2.ebuild
+2008021509 ./media-gfx/eog/eog-3.36.3.ebuild
 2004062109 ./media-gfx/eom/eom-1.24.0.ebuild
 2005081846 ./media-gfx/eom/eom-1.22.2.ebuild
 1909210939 ./media-gfx/ephoto/ephoto-1.5.ebuild
@@ -20167,6 +20620,7 @@
 2005171439 ./media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
 2007241509 ./media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
 1912110241 ./media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
+2007312039 ./media-gfx/gthumb/gthumb-3.10.0.ebuild
 1702282250 ./media-gfx/gtkam/gtkam-1.0.ebuild
 2004032241 ./media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
 1912131839 ./media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
@@ -20224,7 +20678,7 @@
 1906051109 ./media-gfx/llgal/llgal-0.13.19.ebuild
 1912312039 ./media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
 2005210239 ./media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
-2005210239 ./media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
+2007311939 ./media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
 2006050139 ./media-gfx/maim/maim-5.6.3.ebuild
 2006050139 ./media-gfx/maim/maim-9999.ebuild
 2005212308 ./media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -20322,7 +20776,7 @@
 2007180009 ./media-gfx/simple-scan/simple-scan-3.36.4.ebuild
 1912110241 ./media-gfx/slic3r/slic3r-1.1.7.ebuild
 1912110241 ./media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
-1912110241 ./media-gfx/slic3r/slic3r-9999.ebuild
+2008011409 ./media-gfx/slic3r/slic3r-9999.ebuild
 1811092309 ./media-gfx/solvespace/solvespace-2.3.ebuild
 1911091539 ./media-gfx/springgraph/springgraph-88.ebuild
 2006070509 ./media-gfx/sxiv/sxiv-9999.ebuild
@@ -20386,9 +20840,9 @@
 1912110241 ./media-libs/allegro/allegro-4.4.2-r2.ebuild
 2002230239 ./media-libs/allegro/allegro-4.4.3.1.ebuild
 2007041609 ./media-libs/allegro/allegro-5.2.5.0.ebuild
-2005062039 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
-2006201439 ./media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
-2007081339 ./media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
+2008021509 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+2008021509 ./media-libs/alsa-lib/alsa-lib-1.2.3.1.ebuild
+2008021509 ./media-libs/alsa-lib/alsa-lib-1.2.3.2.ebuild
 2004032241 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2005311939 ./media-libs/alure/alure-1.2-r1.ebuild
 2005311939 ./media-libs/alure/alure-1.2-r2.ebuild
@@ -20399,11 +20853,12 @@
 2005011709 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
 2006090739 ./media-libs/assimp/assimp-5.0.1.ebuild
 2006242039 ./media-libs/aubio/aubio-0.4.9.ebuild
-2007221039 ./media-libs/audiofile/audiofile-0.3.6-r4.ebuild
+2008011109 ./media-libs/audiofile/audiofile-0.3.6-r4.ebuild
 2004261339 ./media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
 2004261339 ./media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild
 2002112051 ./media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
 2002112051 ./media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+2008011439 ./media-libs/avidemux-plugins/avidemux-plugins-2.7.4-r1.ebuild
 2004100109 ./media-libs/babl/babl-0.1.66.ebuild
 2005061039 ./media-libs/babl/babl-0.1.74.ebuild
 2006251139 ./media-libs/babl/babl-0.1.66-r1.ebuild
@@ -20504,6 +20959,7 @@
 2002181439 ./media-libs/glm/glm-0.9.9.5.ebuild
 2006172239 ./media-libs/glm/glm-0.9.9.7.ebuild
 2007071009 ./media-libs/glm/glm-0.9.9.8.ebuild
+2008011809 ./media-libs/glm/glm-0.9.9.8-r1.ebuild
 2003200239 ./media-libs/glpng/glpng-1.46-r1.ebuild
 2003261841 ./media-libs/glu/glu-9999.ebuild
 2004032241 ./media-libs/glu/glu-9.0.1.ebuild
@@ -20587,7 +21043,6 @@
 2005071609 ./media-libs/libaacs/libaacs-0.10.0.ebuild
 2004032241 ./media-libs/libafterimage/libafterimage-1.20-r2.ebuild
 2004032241 ./media-libs/libafterimage/libafterimage-1.20-r3.ebuild
-2004032241 ./media-libs/libao/libao-1.2.2.ebuild
 2007310009 ./media-libs/libao/libao-1.2.2-r1.ebuild
 2004032241 ./media-libs/libaom/libaom-1.0.0-r2.ebuild
 2006091709 ./media-libs/libaom/libaom-2.0.0.ebuild
@@ -20696,7 +21151,7 @@
 1811080309 ./media-libs/liblrdf/liblrdf-0.6.1.ebuild
 1901172039 ./media-libs/liblscp/liblscp-0.6.0.ebuild
 1912261309 ./media-libs/liblscp/liblscp-9999.ebuild
-2004032241 ./media-libs/libmad/libmad-0.15.1b-r9.ebuild
+2008021409 ./media-libs/libmad/libmad-0.15.1b-r10.ebuild
 2004062109 ./media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
 2004062109 ./media-libs/libmatemixer/libmatemixer-1.24.0.ebuild
 2004032241 ./media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -20805,7 +21260,7 @@
 2005021609 ./media-libs/libv4l/libv4l-1.18.1.ebuild
 1912110241 ./media-libs/libvisio/libvisio-0.1.7.ebuild
 1912110241 ./media-libs/libvisio/libvisio-9999.ebuild
-1910111911 ./media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+2008011239 ./media-libs/libvisual/libvisual-0.4.0-r3.ebuild
 2004032241 ./media-libs/libvorbis/libvorbis-1.3.6-r1.ebuild
 2007061209 ./media-libs/libvorbis/libvorbis-1.3.7.ebuild
 2003052309 ./media-libs/libvpx/libvpx-1.8.2.ebuild
@@ -20826,15 +21281,15 @@
 2005070709 ./media-libs/libzen/libzen-0.4.38.ebuild
 1912110241 ./media-libs/libzmf/libzmf-0.0.2.ebuild
 1912110241 ./media-libs/libzmf/libzmf-9999.ebuild
-2006132027 ./media-libs/lilv/lilv-0.24.6.ebuild
-2007061209 ./media-libs/lilv/lilv-0.24.8.ebuild
+2008021409 ./media-libs/lilv/lilv-0.24.6-r1.ebuild
+2008021409 ./media-libs/lilv/lilv-0.24.8-r1.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.10.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.5-r2.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
 2002230040 ./media-libs/lsp-plugins/lsp-plugins-9999.ebuild
 2006162209 ./media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
 2007221039 ./media-libs/lv2/lv2-1.18.0.ebuild
-1704231426 ./media-libs/lvtk/lvtk-1.2.0.ebuild
+2008011539 ./media-libs/lvtk/lvtk-1.2.0.ebuild
 2004032241 ./media-libs/memphis/memphis-0.2.3.ebuild
 2007300009 ./media-libs/mesa/mesa-20.0.8.ebuild
 2007300009 ./media-libs/mesa/mesa-20.1.4.ebuild
@@ -20895,7 +21350,7 @@
 2003261841 ./media-libs/portaudio/portaudio-19.06.00-r2.ebuild
 2004032241 ./media-libs/portaudio/portaudio-19.06.00-r1.ebuild
 2005262139 ./media-libs/portaudio/portaudio-19.06.00-r3.ebuild
-2007260409 ./media-libs/portmidi/portmidi-217-r3.ebuild
+2008012239 ./media-libs/portmidi/portmidi-217-r3.ebuild
 1912312209 ./media-libs/ptex/ptex-2.3.2.ebuild
 2002112051 ./media-libs/qhull/qhull-2015.2.ebuild
 1912291610 ./media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -21031,8 +21486,8 @@
 2005062039 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
 1908030939 ./media-plugins/alsaequal/alsaequal-0.7.1.ebuild
 1712171539 ./media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
-1708230031 ./media-plugins/ams-lv2/ams-lv2-1.1.0.ebuild
 1712031809 ./media-plugins/ams-lv2/ams-lv2-1.2.1.ebuild
+2008011509 ./media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
 2005282209 ./media-plugins/audacious-plugins/audacious-plugins-3.10.1-r3.ebuild
 2006021508 ./media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
 2007281739 ./media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
@@ -21230,8 +21685,8 @@
 2007292139 ./media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.1.3.ebuild
 2007292139 ./media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
 2003252109 ./media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.5.ebuild
-2007292139 ./media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
-2007292139 ./media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+2007312209 ./media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.3.0.ebuild
+2007312209 ./media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
 1811292309 ./media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.3.ebuild
 2002062009 ./media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.5.ebuild
 2002112051 ./media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
@@ -21240,19 +21695,24 @@
 2007271839 ./media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.1.1.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+2007312209 ./media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0.ebuild
 1812032139 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.1.ebuild
 2002230040 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
 2007271839 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.1.1.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+2007312209 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.0.ebuild
+2007312209 ./media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.1.ebuild
 2007271839 ./media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.1.1.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+2007312209 ./media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
 1812100109 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.1.ebuild
 2002080509 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild
 2002112051 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.1.1.ebuild
 2007292139 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+2007312209 ./media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
 1907030039 ./media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.3.ebuild
 1908051739 ./media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.4.ebuild
 1908262009 ./media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild
@@ -21294,20 +21754,20 @@
 2007292139 ./media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
 1812230739 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.4.ebuild
 2005170009 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-3.5.6.ebuild
-2007292139 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
-2007292139 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+2007312209 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
+2007312209 ./media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
 2002112051 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-6.0.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
 1902061809 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-4.7.1.ebuild
 1903052209 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-4.7.2.ebuild
-2007292139 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+2007312209 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-7.0.0.ebuild
+2007312209 ./media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
 1901151809 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.11.ebuild
 1811150009 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.5.ebuild
 1812230739 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-3.7.8.ebuild
-2007292139 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
-2007292139 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+2007312209 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
+2007312209 ./media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
 1812230739 ./media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.4.ebuild
 2005170009 ./media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-2.4.6.ebuild
 2007292139 ./media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild
@@ -21322,12 +21782,12 @@
 2007292139 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
 2002230040 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
-2007292139 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
-2007292139 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+2008020439 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.2.4.ebuild
+2008020439 ./media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
 1901200139 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.16.ebuild
 1901301839 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-3.5.17.ebuild
-2007292139 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
+2008020439 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-6.0.0.ebuild
+2008020439 ./media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
 2001092309 ./media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.15.ebuild
 2005181709 ./media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.16.ebuild
 2007092339 ./media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.18.ebuild
@@ -21339,8 +21799,8 @@
 2003100409 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.19.ebuild
 2005210709 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.20.ebuild
 2007040409 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.21.ebuild
-2007292139 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
-2007292139 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+2008020439 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-6.0.5.ebuild
+2008020439 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
 2002112051 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
 2007292139 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
 2007292139 ./media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -21351,16 +21811,16 @@
 1812230739 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.8.ebuild
 1901151809 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.9.ebuild
 2002230040 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
-2007292139 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+2008020439 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
+2008020439 ./media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
 1811180639 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.6.ebuild
 1812230739 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.7.ebuild
 1901151809 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.4.8.ebuild
 2002112051 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
 2002112051 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
 2002112051 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
-2007292139 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+2008020439 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
+2008020439 ./media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
 1811130439 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.2.ebuild
 1902081739 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3.ebuild
 2002112051 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
@@ -21383,8 +21843,8 @@
 2007292139 ./media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-5.0.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
 1811061909 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.1.0.ebuild
-2007292139 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
-2007292139 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+2008020439 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2.ebuild
+2008020439 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
 1707301512 ./media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-1.1.0.ebuild
 1811061909 ./media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.0.0.ebuild
 2007292139 ./media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-2.3.2.ebuild
@@ -21392,12 +21852,12 @@
 2002112051 ./media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
 1707301512 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-1.1.0.ebuild
 1811061909 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.0.0.ebuild
-2007292139 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
-2007292139 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+2008020439 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-2.3.1.ebuild
+2008020439 ./media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
 1707301512 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-1.1.0.ebuild
 1811061909 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.0.0.ebuild
-2007292139 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
-2007292139 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+2008020439 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-2.2.2.ebuild
+2008020439 ./media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
 1811061909 ./media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-2.0.0.ebuild
 1903201739 ./media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.0.0.ebuild
 2002230539 ./media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-3.0.1.ebuild
@@ -21466,7 +21926,8 @@
 2007292139 ./media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.2.0.ebuild
 2007292139 ./media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
 1911121409 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
-2006132027 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
+2008011239 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r3.ebuild
+2008011239 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
 1702282250 ./media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r1.ebuild
 2007091609 ./media-plugins/live/live-2020.03.06.ebuild
 2007091609 ./media-plugins/live/live-2020.05.15.ebuild
@@ -21646,7 +22107,7 @@
 2006111109 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-9999.ebuild
-2007310209 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
+2008010239 ./media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.1.0.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
 2007292139 ./media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-9999.ebuild
 2007310309 ./media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-2.1.2.ebuild
@@ -21735,8 +22196,8 @@
 2006021438 ./media-sound/audacious/audacious-9999.ebuild
 2007281739 ./media-sound/audacious/audacious-4.0.5.ebuild
 2004252339 ./media-sound/audacity/audacity-2.2.2.ebuild
-2004252339 ./media-sound/audacity/audacity-2.3.2.ebuild
 2005010309 ./media-sound/audacity/audacity-2.3.3.ebuild
+2008021409 ./media-sound/audacity/audacity-2.4.2.ebuild
 1912252009 ./media-sound/audex/audex-0.95_pre20190721.ebuild
 1905221909 ./media-sound/audicle/audicle-1.0.0.7-r2.ebuild
 1910161509 ./media-sound/audiocompress/audiocompress-2.0.ebuild
@@ -21770,6 +22231,7 @@
 1702282250 ./media-sound/chordii/chordii-4.5.1.ebuild
 1702282250 ./media-sound/chordii/chordii-4.5.3.ebuild
 1811090409 ./media-sound/chuck/chuck-1.4.0.0.ebuild
+2008021539 ./media-sound/chuck/chuck-1.4.0.1.ebuild
 2001031339 ./media-sound/clementine/clementine-9999.ebuild
 2005281209 ./media-sound/clementine/clementine-1.4.0_rc1.ebuild
 1712022009 ./media-sound/cmix/cmix-1.6.ebuild
@@ -21786,7 +22248,7 @@
 2002230040 ./media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
 1702282250 ./media-sound/dagrab/dagrab-0.513-r1.ebuild
 1810021539 ./media-sound/darkice/darkice-1.2.ebuild
-1903242339 ./media-sound/darkice/darkice-1.3.ebuild
+2008021609 ./media-sound/darkice/darkice-1.3.ebuild
 1710131617 ./media-sound/darksnow/darksnow-0.7.1.ebuild
 1702282250 ./media-sound/daudio/daudio-0.3-r1.ebuild
 1702282250 ./media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -21856,7 +22318,6 @@
 2002112051 ./media-sound/gtkguitune/gtkguitune-0.8.ebuild
 2007040239 ./media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
 2007040239 ./media-sound/guayadeque/guayadeque-9999.ebuild
-1702282250 ./media-sound/guimup/guimup-0.3.2.ebuild
 2006251139 ./media-sound/guitarix/guitarix-0.39.0.ebuild
 2006251139 ./media-sound/guitarix/guitarix-0.40.0.ebuild
 2006251139 ./media-sound/guitarix/guitarix-9999.ebuild
@@ -21886,7 +22347,6 @@
 2007171839 ./media-sound/kid3/kid3-3.8.3.ebuild
 2004261209 ./media-sound/klick/klick-0.12.2-r2.ebuild
 1912291610 ./media-sound/kmetronome/kmetronome-1.0.1.ebuild
-2007220239 ./media-sound/lame/lame-3.100-r1.ebuild
 2007220239 ./media-sound/lame/lame-3.100-r2.ebuild
 2007260409 ./media-sound/lash/lash-0.5.4-r3.ebuild
 2007281209 ./media-sound/lilypond/lilypond-2.21.1.ebuild
@@ -21972,7 +22432,7 @@
 2006130239 ./media-sound/musepack-tools/musepack-tools-465-r1.ebuild
 2004021609 ./media-sound/musescore/musescore-9999.ebuild
 2007210339 ./media-sound/musescore/musescore-3.4.2.ebuild
-2006280009 ./media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
+2007311409 ./media-sound/music-file-organizer/music-file-organizer-1.0.3.ebuild
 2006061309 ./media-sound/musique/musique-1.5-r1.ebuild
 2003210109 ./media-sound/ncmpc/ncmpc-0.34.ebuild
 2007261309 ./media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -21993,7 +22453,7 @@
 1903170109 ./media-sound/pasystray/pasystray-0.7.1.ebuild
 2007171109 ./media-sound/patchage/patchage-1.0.2.ebuild
 2005210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
-2005210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
+2007311939 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.15.0.ebuild
 1910111911 ./media-sound/pavucontrol/pavucontrol-3.0.ebuild
 2002231739 ./media-sound/pavucontrol/pavucontrol-4.0.ebuild
 1808261439 ./media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -22136,7 +22596,7 @@
 1912110309 ./media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
 1912121909 ./media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
 2006280009 ./media-sound/twolame/twolame-0.3.13-r2.ebuild
-2007310039 ./media-sound/twolame/twolame-0.4.0.ebuild
+2008021609 ./media-sound/twolame/twolame-0.4.0.ebuild
 2002112051 ./media-sound/umix/umix-1.0.2-r1.ebuild
 2001101439 ./media-sound/umurmur/umurmur-0.2.17-r3.ebuild
 2001101439 ./media-sound/umurmur/umurmur-9999.ebuild
@@ -22151,6 +22611,7 @@
 1912121909 ./media-sound/vlevel/vlevel-0.5-r1.ebuild
 1910180209 ./media-sound/vlorb/vlorb-1.2.ebuild
 1702282250 ./media-sound/vmpk/vmpk-0.6.2a.ebuild
+2008021539 ./media-sound/vmpk/vmpk-0.7.2.ebuild
 1911191609 ./media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
 1805132239 ./media-sound/volwheel/volwheel-0.2.8-r1.ebuild
 2004032241 ./media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -22201,8 +22662,8 @@
 2006222209 ./media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
 1702282250 ./media-tv/mythtv-status/mythtv-status-0.10.4.ebuild
 2007041239 ./media-tv/mythtv/mythtv-31.0-r1.ebuild
-2007041239 ./media-tv/mythtv/mythtv-31.0.ebuild
 2007241509 ./media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
+2008020139 ./media-tv/mythtv/mythtv-31.0-r2.ebuild
 1907151840 ./media-tv/nvtv/nvtv-0.4.7-r3.ebuild
 2002091942 ./media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
 2004131809 ./media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
@@ -22705,7 +23166,7 @@
 2005060209 ./net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-26-r1.ebuild
 1702282250 ./net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
 2002112051 ./net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
-2007290039 ./net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
+2008011209 ./net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
 2006111139 ./net-analyzer/nagios/nagios-4.4.6.ebuild
 1702282250 ./net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
 2001051415 ./net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -22750,6 +23211,7 @@
 1702282250 ./net-analyzer/netwox/netwox-5.39.0.ebuild
 2003121939 ./net-analyzer/nfdump/nfdump-1.6.19.ebuild
 2003291609 ./net-analyzer/nfdump/nfdump-1.6.20.ebuild
+2008021409 ./net-analyzer/nfdump/nfdump-1.6.21.ebuild
 2003261841 ./net-analyzer/ngrep/ngrep-1.47.ebuild
 2004032241 ./net-analyzer/ngrep/ngrep-1.45-r3.ebuild
 1907151840 ./net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
@@ -23033,17 +23495,16 @@
 2006132027 ./net-dns/avahi/avahi-0.7-r5.ebuild
 2006132027 ./net-dns/avahi/avahi-0.8-r2.ebuild
 2007021239 ./net-dns/bind-tools/bind-tools-9.14.12.ebuild
-2007021239 ./net-dns/bind-tools/bind-tools-9.16.3.ebuild
 2007202109 ./net-dns/bind-tools/bind-tools-9.16.5.ebuild
 2007292009 ./net-dns/bind-tools/bind-tools-9.16.4.ebuild
-2007231439 ./net-dns/bind/bind-9.14.12.ebuild
-2007231439 ./net-dns/bind/bind-9.16.3.ebuild
-2007231439 ./net-dns/bind/bind-9.16.4.ebuild
+2008021839 ./net-dns/bind/bind-9.14.12.ebuild
+2008021839 ./net-dns/bind/bind-9.16.4.ebuild
+2008021839 ./net-dns/bind/bind-9.16.5.ebuild
 2005260039 ./net-dns/c-ares/c-ares-1.16.1.ebuild
 2004291509 ./net-dns/coredns/coredns-1.6.9.ebuild
 2007221109 ./net-dns/coredns/coredns-1.7.0.ebuild
 2004032241 ./net-dns/ddclient/ddclient-3.9.0-r3.ebuild
-2007310609 ./net-dns/ddclient/ddclient-3.9.1.ebuild
+2008011209 ./net-dns/ddclient/ddclient-3.9.1.ebuild
 2002230040 ./net-dns/djbdns/djbdns-1.05-r33.ebuild
 1810200209 ./net-dns/dnrd/dnrd-2.20.3-r2.ebuild
 1909191939 ./net-dns/dnscap/dnscap-1.10.2.ebuild
@@ -23137,11 +23598,9 @@
 1912021839 ./net-firewall/ferm/ferm-2.5.ebuild
 2002251809 ./net-firewall/ferm/ferm-2.5.1.ebuild
 1903302209 ./net-firewall/firehol/firehol-3.1.6.ebuild
-2003211809 ./net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
-2003211809 ./net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+2008020239 ./net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+2008020239 ./net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
 2005212209 ./net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
-2002151310 ./net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
-2004101809 ./net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
 2007020309 ./net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
 1902190039 ./net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
 2001172009 ./net-firewall/ipset/ipset-7.5.ebuild
@@ -23204,7 +23663,7 @@
 2006111709 ./net-fs/netatalk/netatalk-3.1.12.ebuild
 2004032241 ./net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
 2006231109 ./net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
-2007171039 ./net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
+2008011109 ./net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
 1811150109 ./net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild
 2007310109 ./net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7.ebuild
 1702282250 ./net-fs/nfstest/nfstest-1.0.2.ebuild
@@ -23324,9 +23783,9 @@
 2007181639 ./net-im/signal-desktop-bin/signal-desktop-bin-1.34.4-r1.ebuild
 2002110039 ./net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
 2007230139 ./net-im/skypeforlinux/skypeforlinux-8.62.0.85.ebuild
-2007301709 ./net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
-2007301709 ./net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
-2002112051 ./net-im/swift/swift-4.0.2-r1.ebuild
+2008012309 ./net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
+2008012309 ./net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+2008012309 ./net-im/swift/swift-4.0.2-r2.ebuild
 2007181639 ./net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
 1907282009 ./net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
 1907282009 ./net-im/telepathy-logger/telepathy-logger-0.8.2.ebuild
@@ -23617,7 +24076,7 @@
 2004211009 ./net-libs/libnsl/libnsl-0-r1.ebuild
 2004211009 ./net-libs/libnsl/libnsl-1.2.0.ebuild
 2007102339 ./net-libs/libnsl/libnsl-1.3.0-r1.ebuild
-2007260009 ./net-libs/libntlm/libntlm-1.6.ebuild
+2008011109 ./net-libs/libntlm/libntlm-1.6.ebuild
 2006041239 ./net-libs/libnxml/libnxml-0.18.3.ebuild
 2004032241 ./net-libs/liboauth/liboauth-1.0.3-r1.ebuild
 2002112051 ./net-libs/liboping/liboping-1.10.0-r2.ebuild
@@ -23662,7 +24121,7 @@
 2004071839 ./net-libs/librsync/librsync-2.3.0.ebuild
 2005310209 ./net-libs/librsync/librsync-2.3.1.ebuild
 2002091942 ./net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
-2002091942 ./net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+2008021509 ./net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
 2002112051 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
 2007200439 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
 2007240009 ./net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3.ebuild
@@ -23822,9 +24281,9 @@
 2007300309 ./net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
 2002112051 ./net-libs/wvstreams/wvstreams-99999.ebuild
 2007081009 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
-2006251009 ./net-libs/xrootd/xrootd-4.12.0.ebuild
 2006261439 ./net-libs/xrootd/xrootd-4.12.3.ebuild
 2007081609 ./net-libs/xrootd/xrootd-5.0.0.ebuild
+2008021509 ./net-libs/xrootd/xrootd-4.12.0.ebuild
 1912110241 ./net-libs/zeromq/zeromq-3.2.5.ebuild
 2004032241 ./net-libs/zeromq/zeromq-4.3.2.ebuild
 2005062039 ./net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -23948,6 +24407,7 @@
 1702282250 ./net-mail/ripole/ripole-0.2.2.ebuild
 2007092109 ./net-mail/rss2email/rss2email-3.11-r1.ebuild
 2007092109 ./net-mail/rss2email/rss2email-3.11.ebuild
+2008021739 ./net-mail/rss2email/rss2email-3.12.ebuild
 1801032209 ./net-mail/safecat/safecat-1.13.ebuild
 1912111540 ./net-mail/sendEmail/sendEmail-1.56-r1.ebuild
 1912111540 ./net-mail/sendEmail/sendEmail-1.56-r2.ebuild
@@ -23963,8 +24423,8 @@
 1910130039 ./net-mail/tpop3d/tpop3d-1.5.5.ebuild
 2002230040 ./net-mail/vacation/vacation-1.2.7.0.ebuild
 1801032209 ./net-mail/vchkuser/vchkuser-0.4.ebuild
-2003261841 ./net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
 2005271109 ./net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+2008010009 ./net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
 2002230040 ./net-mail/vqadmin/vqadmin-2.3.7.ebuild
 2002112051 ./net-mail/ytnef/ytnef-1.9.3.ebuild
 2003201139 ./net-mail/automx2/automx2-2019.0.ebuild
@@ -24333,7 +24793,7 @@
 1806111939 ./net-misc/openr2/openr2-1.3.0.ebuild
 2004040039 ./net-misc/openssh/openssh-8.1_p1-r3.ebuild
 2004172109 ./net-misc/openssh/openssh-8.2_p1-r6.ebuild
-2007280039 ./net-misc/openssh/openssh-8.3_p1-r4.ebuild
+2007312209 ./net-misc/openssh/openssh-8.3_p1-r4.ebuild
 2006232209 ./net-misc/openvswitch/openvswitch-2.13.0.ebuild
 1911141209 ./net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild
 2002040039 ./net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild
@@ -24361,9 +24821,9 @@
 1702282250 ./net-misc/portspoof/portspoof-9999.ebuild
 1711100154 ./net-misc/pps-tools/pps-tools-1.0.1.ebuild
 2002140110 ./net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
-2007171039 ./net-misc/pps-tools/pps-tools-1.0.2.ebuild
+2008011109 ./net-misc/pps-tools/pps-tools-1.0.2.ebuild
 1801051039 ./net-misc/proxychains/proxychains-4.12-r1.ebuild
-1911190509 ./net-misc/proxychains/proxychains-4.14.ebuild
+2008021509 ./net-misc/proxychains/proxychains-4.14.ebuild
 2003261841 ./net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
 2005072109 ./net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
 2005072109 ./net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -24421,13 +24881,11 @@
 2007061109 ./net-misc/rsync/rsync-3.2.2.ebuild
 2007281009 ./net-misc/rsync/rsync-3.2.3_pre1.ebuild
 2007281009 ./net-misc/rsync/rsync-9999.ebuild
-2007310009 ./net-misc/rsync/rsync-3.2.2-r1.ebuild
+2008011209 ./net-misc/rsync/rsync-3.2.2-r1.ebuild
 1702282250 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2002230040 ./net-misc/rwhoisd/rwhoisd-1.5.9.6.ebuild
 2004202139 ./net-misc/rygel/rygel-0.38.3.ebuild
 2007050109 ./net-misc/rygel/rygel-0.38.4.ebuild
-1807050409 ./net-misc/s3cmd/s3cmd-1.6.1.ebuild
-2005071839 ./net-misc/s3cmd/s3cmd-2.0.0.ebuild
 2005071839 ./net-misc/s3cmd/s3cmd-2.0.2.ebuild
 1710032143 ./net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
 1810090339 ./net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
@@ -24608,8 +25066,8 @@
 2005091409 ./net-news/canto-daemon/canto-daemon-0.9.7.ebuild
 2007190239 ./net-news/liferea/liferea-1.12.7-r1.ebuild
 2007190239 ./net-news/liferea/liferea-1.12.8.ebuild
-1901041039 ./net-news/newsboat/newsboat-2.13.ebuild
 2007020109 ./net-news/newsboat/newsboat-2.19-r1.ebuild
+2008012239 ./net-news/newsboat/newsboat-2.13.ebuild
 1904181209 ./net-news/quiterss/quiterss-9999.ebuild
 2004031539 ./net-news/quiterss/quiterss-0.19.3.ebuild
 2001182039 ./net-news/rssguard/rssguard-3.5.9-r1.ebuild
@@ -24820,7 +25278,7 @@
 1705270153 ./net-proxy/hatop/hatop-0.7.7.ebuild
 2007302139 ./net-proxy/hatop/hatop-0.8.0.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
-2006202109 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
+2008020739 ./net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.2.4.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.3.0.ebuild
 1912111540 ./net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -24920,9 +25378,8 @@
 1703171656 ./net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
 1908230109 ./net-vpn/vtun/vtun-3.0.3-r1.ebuild
 1703171738 ./net-vpn/vtun/vtun-3.0.3.ebuild
-2007301839 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild
-2007301839 ./net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
-2006290009 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
+2007311539 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild
+2007311539 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
 2002271709 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.0.ebuild
 2006081109 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.2.ebuild
 2005140739 ./net-vpn/tailscale/tailscale-0.98_p0.ebuild
@@ -24972,6 +25429,8 @@
 2002091942 ./net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
 2006031739 ./net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
 2006031739 ./net-wireless/gnuradio/gnuradio-9999.ebuild
+2008012109 ./net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
+2008012109 ./net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
 1912111540 ./net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
 1904182109 ./net-wireless/gqrx-scanner/gqrx-scanner-1.0.1_p20190329.ebuild
 2006041239 ./net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
@@ -25124,7 +25583,7 @@
 2004032241 ./net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
 2004032241 ./net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
 2004032241 ./net-wireless/wireless-tools/wireless-tools-30_pre9.ebuild
-2007191739 ./net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+2008011109 ./net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
 2002181809 ./net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
 2002181809 ./net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
 1911111739 ./net-wireless/yatebts/yatebts-6.0.0-r1.ebuild
@@ -25603,7 +26062,7 @@
 2006131939 ./sci-chemistry/nmrglue/nmrglue-0.7.ebuild
 1702282250 ./sci-chemistry/numbat/numbat-0.999-r1.ebuild
 1710160551 ./sci-chemistry/openbabel-perl/openbabel-perl-2.4.1.ebuild
-2001051415 ./sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild
+2008021509 ./sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild
 2002140110 ./sci-chemistry/openbabel/openbabel-2.4.1-r1.ebuild
 2002140110 ./sci-chemistry/openbabel/openbabel-2.4.1.ebuild
 1702282250 ./sci-chemistry/ortep3/ortep3-1.0.3-r1.ebuild
@@ -25616,7 +26075,6 @@
 1902052209 ./sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
 2007010239 ./sci-chemistry/propka/propka-3.2.0.ebuild
 1912110241 ./sci-chemistry/psi/psi-3.4.0-r2.ebuild
-2003042109 ./sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
 2006040039 ./sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
 2002230040 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
 1702282250 ./sci-chemistry/raster3d/raster3d-3.0.2.ebuild
@@ -25664,7 +26122,7 @@
 1705021323 ./sci-electronics/Stage/Stage-4.3.0.ebuild
 1705021323 ./sci-electronics/Stage/Stage-9999.ebuild
 1702282250 ./sci-electronics/alliance/alliance-5.0.20110203.ebuild
-2001051415 ./sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
+2008021509 ./sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
 1702282250 ./sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild
 1802061938 ./sci-electronics/drawtiming/drawtiming-0.7.1-r2.ebuild
 2001270109 ./sci-electronics/eagle/eagle-7.3.0-r1.ebuild
@@ -25895,8 +26353,8 @@
 2002230040 ./sci-libs/blis/blis-0.6.0.ebuild
 1707312112 ./sci-libs/bliss/bliss-0.73-r1.ebuild
 2007102009 ./sci-libs/bliss/bliss-0.73-r2.ebuild
-2001051415 ./sci-libs/bmrblib/bmrblib-1.0.3.ebuild
-2006132027 ./sci-libs/bmrblib/bmrblib-1.0.4.ebuild
+2008021509 ./sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+2008021509 ./sci-libs/bmrblib/bmrblib-1.0.4.ebuild
 2007191909 ./sci-libs/btf/btf-1.2.6.ebuild
 1702282250 ./sci-libs/buddy/buddy-2.4-r1.ebuild
 2007191909 ./sci-libs/camd/camd-2.4.6.ebuild
@@ -25985,7 +26443,7 @@
 2004032241 ./sci-libs/fftw/fftw-3.3.6_p2.ebuild
 2006100809 ./sci-libs/fftw/fftw-3.3.8.ebuild
 2006100809 ./sci-libs/fftw/fftw-9999.ebuild
-2007272209 ./sci-libs/fftw/fftw-3.3.8-r1.ebuild
+2008011209 ./sci-libs/fftw/fftw-3.3.8-r1.ebuild
 1902171609 ./sci-libs/flann/flann-9999.ebuild
 2005231409 ./sci-libs/flann/flann-1.9.1-r3.ebuild
 2002151310 ./sci-libs/fplll/fplll-4.0.4.ebuild
@@ -26010,7 +26468,7 @@
 2006280009 ./sci-libs/hdf/hdf-4.2.13-r1.ebuild
 2006280009 ./sci-libs/hdf/hdf-4.2.13.ebuild
 2006280009 ./sci-libs/hdf5/hdf5-1.10.5.ebuild
-2007251639 ./sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+2008011209 ./sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
 1707291219 ./sci-libs/htslib/htslib-1.5.ebuild
 2003201209 ./sci-libs/htslib/htslib-1.9.ebuild
 1804230508 ./sci-libs/hypre/hypre-2.14.0.ebuild
@@ -26043,7 +26501,7 @@
 1910111911 ./sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
 2004032241 ./sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
 2006012309 ./sci-libs/lapack/lapack-3.8.0.ebuild
-2007260009 ./sci-libs/lapack/lapack-3.8.0-r1.ebuild
+2008011209 ./sci-libs/lapack/lapack-3.8.0-r1.ebuild
 2007191909 ./sci-libs/ldl/ldl-2.2.6.ebuild
 1912110241 ./sci-libs/lemon/lemon-1.3.1.ebuild
 2002112051 ./sci-libs/levmar/levmar-2.6.ebuild
@@ -26126,13 +26584,7 @@
 2004241209 ./sci-libs/metis/metis-4.0.3-r2.ebuild
 2007191909 ./sci-libs/metis/metis-5.1.0-r4.ebuild
 2007211309 ./sci-libs/metis/metis-4.0.3-r1.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.10.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.11.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.3-r1.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.4.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.4_pre98.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.5.ebuild
-2001051415 ./sci-libs/minfx/minfx-1.0.6.ebuild
+2008021509 ./sci-libs/minfx/minfx-1.0.11.ebuild
 1703191202 ./sci-libs/minuit/minuit-5.34.14.ebuild
 2002230040 ./sci-libs/mkl-rt/mkl-rt-2019.4.243.ebuild
 2002230040 ./sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
@@ -26214,10 +26666,10 @@
 2001161009 ./sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
 2001161009 ./sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
 2006170109 ./sci-libs/scipy/scipy-1.4.1.ebuild
-2006222209 ./sci-libs/scipy/scipy-1.1.0.ebuild
 2006221909 ./sci-libs/scipy/scipy-1.5.0.ebuild
 2007081139 ./sci-libs/scipy/scipy-1.5.1.ebuild
 2007241739 ./sci-libs/scipy/scipy-1.5.2.ebuild
+2008021509 ./sci-libs/scipy/scipy-1.1.0.ebuild
 1911240739 ./sci-libs/scotch/scotch-5.1.12b.ebuild
 1912311709 ./sci-libs/scotch/scotch-6.0.4-r2.ebuild
 2003211239 ./sci-libs/shapelib/shapelib-1.5.0.ebuild
@@ -26288,7 +26740,7 @@
 2004141609 ./sci-libs/brial/brial-1.2.8.ebuild
 2004231939 ./sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
 2007082109 ./sci-libs/cartopy/cartopy-0.18.0.ebuild
-2004031909 ./sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
+2008010109 ./sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
 2005010139 ./sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
 2005010139 ./sci-libs/ginkgo/ginkgo-9999.ebuild
 2005041609 ./sci-libs/linbox/linbox-1.6.3.ebuild
@@ -26426,7 +26878,7 @@
 1702282250 ./sci-mathematics/yafu/yafu-1.34.3.ebuild
 1702282250 ./sci-mathematics/yafu/yafu-9999.ebuild
 2003202239 ./sci-mathematics/z3/z3-4.8.6.ebuild
-2007302339 ./sci-mathematics/z3/z3-4.8.8.ebuild
+2008011209 ./sci-mathematics/z3/z3-4.8.8.ebuild
 2002281539 ./sci-mathematics/gp2c/gp2c-0.0.11.2-r1.ebuild
 2003061709 ./sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
 2007231009 ./sci-mathematics/eclib/eclib-20190909.ebuild
@@ -27592,7 +28044,7 @@
 2006132027 ./sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
 2006132027 ./sys-apps/hwloc/hwloc-2.0.4.ebuild
 2006132027 ./sys-apps/hwloc/hwloc-2.1.0.ebuild
-2007310209 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
+2008021609 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
 2004032241 ./sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
 2003111509 ./sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
 1912221009 ./sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.6.ebuild
@@ -27752,8 +28204,8 @@
 2004032241 ./sys-apps/paxctl/paxctl-0.9.ebuild
 1911082039 ./sys-apps/paxctld/paxctld-1.2.3.ebuild
 2004211009 ./sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
-2005311239 ./sys-apps/pciutils/pciutils-3.7.0.ebuild
-2007102239 ./sys-apps/pciutils/pciutils-3.6.4.ebuild
+2008010539 ./sys-apps/pciutils/pciutils-3.6.4.ebuild
+2008010539 ./sys-apps/pciutils/pciutils-3.7.0.ebuild
 2003261841 ./sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
 2006201239 ./sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
 2006201239 ./sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -27911,8 +28363,8 @@
 2003261841 ./sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
 2003261841 ./sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
 2003261841 ./sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
-2003261841 ./sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
 2004032241 ./sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+2008021509 ./sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
 2004211009 ./sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
 1910071309 ./sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
 1909131609 ./sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -27937,8 +28389,8 @@
 2004291939 ./sys-apps/util-linux/util-linux-2.34-r3.ebuild
 2004291939 ./sys-apps/util-linux/util-linux-9999.ebuild
 2005101239 ./sys-apps/util-linux/util-linux-2.35.1-r2.ebuild
-2007022009 ./sys-apps/util-linux/util-linux-2.35.2.ebuild
 2007231639 ./sys-apps/util-linux/util-linux-2.36.ebuild
+2008012239 ./sys-apps/util-linux/util-linux-2.35.2.ebuild
 1911270209 ./sys-apps/vbetool/vbetool-1.1.ebuild
 2003261841 ./sys-apps/watchdog/watchdog-5.15.ebuild
 2004301339 ./sys-apps/watchdog/watchdog-5.16.ebuild
@@ -27968,6 +28420,7 @@
 2005290509 ./sys-apps/lsvpd/lsvpd-1.7.11.ebuild
 2003042239 ./sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
 2005102239 ./sys-apps/hw-probe/hw-probe-1.5.ebuild
+2008010009 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
 2002092009 ./sys-auth/authenticator/authenticator-9999.ebuild
 2002151310 ./sys-auth/consolekit/consolekit-9999.ebuild
@@ -28044,8 +28497,9 @@
 2006171839 ./sys-auth/passwdqc/passwdqc-1.4.0.ebuild
 1802112038 ./sys-auth/polkit-pkla-compat/polkit-pkla-compat-0.1.ebuild
 1912291610 ./sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
-2004032241 ./sys-auth/polkit/polkit-0.115-r4.ebuild
-2004192339 ./sys-auth/polkit/polkit-0.116-r1.ebuild
+2008010209 ./sys-auth/polkit/polkit-0.115-r4.ebuild
+2008010209 ./sys-auth/polkit/polkit-0.116-r1.ebuild
+2008010209 ./sys-auth/polkit/polkit-0.117.ebuild
 2006041239 ./sys-auth/realtime-base/realtime-base-0.1.ebuild
 2005091439 ./sys-auth/rtkit/rtkit-0.12-r1.ebuild
 2005091439 ./sys-auth/rtkit/rtkit-0.13-r1.ebuild
@@ -28235,8 +28689,8 @@
 1804042008 ./sys-boot/plymouth/plymouth-0.9.3-r2.ebuild
 2001032309 ./sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
 2004032241 ./sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
-2007132139 ./sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
 2007132139 ./sys-boot/plymouth/plymouth-9999.ebuild
+2007312339 ./sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
 1903260239 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild
 1907152339 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild
 1912310139 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190925.ebuild
@@ -28408,7 +28862,7 @@
 1912110241 ./sys-cluster/libqb/libqb-1.0.1.ebuild
 1912112039 ./sys-cluster/libqb/libqb-0.17.2.ebuild
 1912112039 ./sys-cluster/libqb/libqb-1.0.5.ebuild
-2007201539 ./sys-cluster/libqb/libqb-1.9.0.ebuild
+2008011109 ./sys-cluster/libqb/libqb-1.9.0.ebuild
 1707301222 ./sys-cluster/libquo/libquo-1.2.2.ebuild
 1707301222 ./sys-cluster/libquo/libquo-1.2.3.ebuild
 1707301222 ./sys-cluster/libquo/libquo-1.2.4-r1.ebuild
@@ -28542,47 +28996,49 @@
 1912111540 ./sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
 1912111540 ./sys-devel/binutils-apple/binutils-apple-8.1.ebuild
 1912111540 ./sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
-2004071339 ./sys-devel/binutils-config/binutils-config-5.2.ebuild
 2005230009 ./sys-devel/binutils-config/binutils-config-9999.ebuild
 2007170609 ./sys-devel/binutils-config/binutils-config-5.3.1.ebuild
-2007282039 ./sys-devel/binutils-config/binutils-config-5.3.2.ebuild
+2008011209 ./sys-devel/binutils-config/binutils-config-5.3.2.ebuild
 2002140110 ./sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
 2004011439 ./sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
 2005192309 ./sys-devel/binutils-hppa64/binutils-hppa64-2.34-r1.ebuild
 2007252109 ./sys-devel/binutils-hppa64/binutils-hppa64-2.35.ebuild
+2007311939 ./sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
 2004032241 ./sys-devel/binutils/binutils-2.32-r2.ebuild
 2004071339 ./sys-devel/binutils/binutils-2.33.1-r1.ebuild
 2004211009 ./sys-devel/binutils/binutils-2.32-r1.ebuild
 2007251439 ./sys-devel/binutils/binutils-2.34-r1.ebuild
 2007252109 ./sys-devel/binutils/binutils-2.35.ebuild
 2007252109 ./sys-devel/binutils/binutils-9999.ebuild
+2007311939 ./sys-devel/binutils/binutils-2.34-r2.ebuild
 2004211009 ./sys-devel/bison/bison-3.1.ebuild
 2007271109 ./sys-devel/bison/bison-3.7.ebuild
-2007292009 ./sys-devel/bison/bison-3.6.4.ebuild
+2008011239 ./sys-devel/bison/bison-3.6.4.ebuild
 2005151239 ./sys-devel/bmake/bmake-20200318.ebuild
 2004032241 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
 2003092139 ./sys-devel/clang-common/clang-common-9.0.1.ebuild
 2006232139 ./sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
 2007152209 ./sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
-2007181809 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2007212239 ./sys-devel/clang-common/clang-common-10.0.1.ebuild
 2007291339 ./sys-devel/clang-common/clang-common-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2001182039 ./sys-devel/clang-runtime/clang-runtime-11.0.0.9999.ebuild
 2003092139 ./sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
 2007152209 ./sys-devel/clang-runtime/clang-runtime-12.0.0.9999.ebuild
-2007181809 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 2007212239 ./sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild
 2007291339 ./sys-devel/clang-runtime/clang-runtime-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 2005072109 ./sys-devel/clang/clang-9.0.1.ebuild
-2007181809 ./sys-devel/clang/clang-10.0.0.ebuild
 2007212239 ./sys-devel/clang/clang-10.0.1.ebuild
 2007240009 ./sys-devel/clang/clang-11.0.0.9999.ebuild
 2007240009 ./sys-devel/clang/clang-12.0.0.9999.ebuild
 2007291339 ./sys-devel/clang/clang-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/clang/clang-10.0.0.ebuild
 1910071309 ./sys-devel/cons/cons-2.3.0.ebuild
 2003261841 ./sys-devel/crossdev/crossdev-99999999.ebuild
 2005242039 ./sys-devel/crossdev/crossdev-20200131.ebuild
 2007302009 ./sys-devel/crossdev/crossdev-20200326.ebuild
+2008012309 ./sys-devel/crossdev/crossdev-20200801.ebuild
 1803112309 ./sys-devel/ct-ng/ct-ng-1.23.0.ebuild
 2002112051 ./sys-devel/ct-ng/ct-ng-1.24.0.ebuild
 2004212039 ./sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -28596,12 +29052,11 @@
 2002140110 ./sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
 2006250009 ./sys-devel/gcc-config/gcc-config-9999.ebuild
 2007120409 ./sys-devel/gcc-config/gcc-config-2.3.ebuild
-2007282039 ./sys-devel/gcc-config/gcc-config-2.3.1.ebuild
+2008011209 ./sys-devel/gcc-config/gcc-config-2.3.1.ebuild
 2003261841 ./sys-devel/gcc/gcc-9.2.0-r4.ebuild
 2004032241 ./sys-devel/gcc/gcc-9.2.0-r2.ebuild
 2004041739 ./sys-devel/gcc/gcc-7.5.0.ebuild
 2004220009 ./sys-devel/gcc/gcc-9.3.0.ebuild
-2005300039 ./sys-devel/gcc/gcc-4.9.4-r1.ebuild
 2005300039 ./sys-devel/gcc/gcc-5.5.0.ebuild
 2006040009 ./sys-devel/gcc/gcc-6.5.0-r1.ebuild
 2006180009 ./sys-devel/gcc/gcc-8.4.0.ebuild
@@ -28614,6 +29069,7 @@
 2007242109 ./sys-devel/gcc/gcc-6.5.0-r2.ebuild
 2007251209 ./sys-devel/gcc/gcc-8.4.0-r1.ebuild
 2007272209 ./sys-devel/gcc/gcc-9.3.0-r1.ebuild
+2008011639 ./sys-devel/gcc/gcc-4.9.4-r1.ebuild
 1912111540 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2004172239 ./sys-devel/gdb/gdb-9999.ebuild
 2005200039 ./sys-devel/gdb/gdb-9.1.ebuild
@@ -28646,15 +29102,15 @@
 2003092139 ./sys-devel/lld/lld-9.0.1.ebuild
 2006232139 ./sys-devel/lld/lld-11.0.0.9999.ebuild
 2007152209 ./sys-devel/lld/lld-12.0.0.9999.ebuild
-2007181809 ./sys-devel/lld/lld-10.0.0.ebuild
 2007212239 ./sys-devel/lld/lld-10.0.1.ebuild
 2007291339 ./sys-devel/lld/lld-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/lld/lld-10.0.0.ebuild
 2003092139 ./sys-devel/llvm-common/llvm-common-9.0.1.ebuild
 2006232139 ./sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
 2007152209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
-2007181809 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2007212239 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2007291339 ./sys-devel/llvm-common/llvm-common-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
@@ -28667,15 +29123,15 @@
 2006162309 ./sys-devel/llvm-roc/llvm-roc-3.5.1.ebuild
 2007082139 ./sys-devel/llvm-roc/llvm-roc-3.6.0.ebuild
 2005062039 ./sys-devel/llvm/llvm-9.0.1.ebuild
-2007181809 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2007212239 ./sys-devel/llvm/llvm-10.0.1.ebuild
 2007231309 ./sys-devel/llvm/llvm-11.0.0.9999.ebuild
 2007240009 ./sys-devel/llvm/llvm-12.0.0.9999.ebuild
 2007291339 ./sys-devel/llvm/llvm-11.0.0_rc1.ebuild
+2008010139 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2001182039 ./sys-devel/llvmgold/llvmgold-11.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
 2007152209 ./sys-devel/llvmgold/llvmgold-12.ebuild
-2007181809 ./sys-devel/llvmgold/llvmgold-10.ebuild
+2008010139 ./sys-devel/llvmgold/llvmgold-10.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.17.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.18-r1.ebuild
 2003261841 ./sys-devel/make/make-4.3.ebuild
@@ -28844,10 +29300,10 @@
 1807260709 ./sys-fs/davl/davl-1.2.4-r2.ebuild
 2005032310 ./sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
 2002051339 ./sys-fs/ddrescue/ddrescue-1.24.ebuild
-2003031939 ./sys-fs/ddrescue/ddrescue-1.25.ebuild
+2008021509 ./sys-fs/ddrescue/ddrescue-1.25.ebuild
 1904180639 ./sys-fs/dfc/dfc-3.1.1.ebuild
 2006290009 ./sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
-2007251439 ./sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+2008011209 ./sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
 1911190009 ./sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
 2007271809 ./sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
 2007271809 ./sys-fs/dislocker/dislocker-9999.ebuild
@@ -28994,7 +29450,7 @@
 2004191509 ./sys-fs/udiskie/udiskie-2.1.1.ebuild
 2005081846 ./sys-fs/udiskie/udiskie-2.2.0.ebuild
 2004032241 ./sys-fs/udisks/udisks-2.8.4.ebuild
-2006151539 ./sys-fs/udisks/udisks-2.9.0.ebuild
+2008011209 ./sys-fs/udisks/udisks-2.9.0.ebuild
 2007042339 ./sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
 1912111540 ./sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
 1912111540 ./sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
@@ -29011,8 +29467,8 @@
 2003221409 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
 2002270639 ./sys-fs/zerofree/zerofree-1.0.4.ebuild
 2002270639 ./sys-fs/zerofree/zerofree-1.1.1.ebuild
-1912070409 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
 1912070409 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
+2007312239 ./sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
 2006110109 ./sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
 2007131909 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
 2006110109 ./sys-fs/zfs/zfs-0.8.4-r1.ebuild
@@ -29104,6 +29560,12 @@
 2007291639 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.135.ebuild
 2007291639 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.54.ebuild
 2007291639 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.11.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.191.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.136.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-4.4.232.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.232.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.55.ebuild
+2007312209 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.12.ebuild
 2006150209 ./sys-kernel/git-sources/git-sources-5.8_rc1.ebuild
 2006221009 ./sys-kernel/git-sources/git-sources-5.8_rc2.ebuild
 2006290209 ./sys-kernel/git-sources/git-sources-5.8_rc3.ebuild
@@ -29163,12 +29625,12 @@
 2006201439 ./sys-kernel/rt-sources/rt-sources-4.9.227_p146.ebuild
 2006201439 ./sys-kernel/rt-sources/rt-sources-5.4.44_p27.ebuild
 2006201439 ./sys-kernel/rt-sources/rt-sources-5.6.17_p10.ebuild
-2007221239 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.231.ebuild
-2007221239 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.231.ebuild
-2007290909 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.190.ebuild
-2007291639 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.135.ebuild
-2007291639 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.54.ebuild
-2007291639 ./sys-kernel/vanilla-sources/vanilla-sources-5.7.11.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.191.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.136.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.232.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.232.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.55.ebuild
+2008010109 ./sys-kernel/vanilla-sources/vanilla-sources-5.7.12.ebuild
 1907151840 ./sys-kernel/xbox-sources/xbox-sources-2.6.16.26.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
@@ -29183,14 +29645,20 @@
 2007162209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
 2007241509 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.53.ebuild
 2007241509 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.7.10.ebuild
+2008011639 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild
+2008011809 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild
 2006081639 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.40.ebuild
-2007162209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
 2007241509 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.53.ebuild
 2007241509 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.10.ebuild
+2008011709 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
+2008011639 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.55.ebuild
+2008011809 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.12.ebuild
 2006081639 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40.ebuild
-2007162209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
 2007241509 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.53.ebuild
 2007241509 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.7.10.ebuild
+2008011709 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
+2008011639 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild
+2008011809 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12.ebuild
 2007181939 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
 2007181939 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.1.0.ebuild
 2007152309 ./sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
@@ -29199,18 +29667,19 @@
 2004071339 ./sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild
 2006201509 ./sys-libs/binutils-libs/binutils-libs-2.34-r1.ebuild
 2007252109 ./sys-libs/binutils-libs/binutils-libs-2.35.ebuild
+2007311939 ./sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
 2003092139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
-2007181809 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2007291739 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild
 2007291739 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
 2007291739 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc1.ebuild
 2007291739 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
+2008010139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2003092139 ./sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
 2006232139 ./sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
 2007152209 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
-2007181809 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2007212239 ./sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
 2007291339 ./sys-libs/compiler-rt/compiler-rt-11.0.0_rc1.ebuild
+2008010139 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 1912111540 ./sys-libs/csu/csu-79.ebuild
@@ -29268,7 +29737,7 @@
 2006132027 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
 2004201209 ./sys-libs/libblockdev/libblockdev-9999.ebuild
 2005122209 ./sys-libs/libblockdev/libblockdev-2.23-r1.ebuild
-2007260909 ./sys-libs/libblockdev/libblockdev-2.24.ebuild
+2008011209 ./sys-libs/libblockdev/libblockdev-2.24.ebuild
 2007301709 ./sys-libs/libcap-ng/libcap-ng-0.7.10.ebuild
 2005172139 ./sys-libs/libcap/libcap-2.26-r2.ebuild
 2005172139 ./sys-libs/libcap/libcap-2.27.ebuild
@@ -29276,17 +29745,17 @@
 2007260039 ./sys-libs/libcap/libcap-2.41.ebuild
 2002131609 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
 2005060109 ./sys-libs/libcxx/libcxx-9.0.1.ebuild
-2007181809 ./sys-libs/libcxx/libcxx-10.0.0.ebuild
 2007212239 ./sys-libs/libcxx/libcxx-10.0.1.ebuild
 2007291439 ./sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
 2007291439 ./sys-libs/libcxx/libcxx-11.0.0_rc1.ebuild
 2007291439 ./sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
+2008010139 ./sys-libs/libcxx/libcxx-10.0.0.ebuild
 2003092139 ./sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
-2007181809 ./sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
 2007212239 ./sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
 2007291439 ./sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
 2007291439 ./sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild
 2007291439 ./sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
+2008010139 ./sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
 2003030309 ./sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
 2003162339 ./sys-libs/libfaketime/libfaketime-0.9.7.ebuild
 2006140039 ./sys-libs/libfaketime/libfaketime-0.9.8.ebuild
@@ -29304,9 +29773,9 @@
 2006132027 ./sys-libs/libomp/libomp-9.0.1.ebuild
 2006232139 ./sys-libs/libomp/libomp-11.0.0.9999.ebuild
 2007152209 ./sys-libs/libomp/libomp-12.0.0.9999.ebuild
-2007181809 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2007212239 ./sys-libs/libomp/libomp-10.0.1.ebuild
 2007291339 ./sys-libs/libomp/libomp-11.0.0_rc1.ebuild
+2008010139 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2003121709 ./sys-libs/libosinfo/libosinfo-1.6.0.ebuild
 2007261509 ./sys-libs/libosinfo/libosinfo-1.8.0.ebuild
 2004032241 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -29342,11 +29811,11 @@
 2002151310 ./sys-libs/libxcrypt/libxcrypt-2.4.ebuild
 2006232209 ./sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild
 2003092139 ./sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
-2007181809 ./sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
 2007212239 ./sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
 2007291439 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
 2007291439 ./sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc1.ebuild
 2007291439 ./sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
+2008010139 ./sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
 2004032241 ./sys-libs/lwp/lwp-2.8.ebuild
 2004032241 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2002191739 ./sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
@@ -29386,7 +29855,7 @@
 1712292340 ./sys-libs/tapi/tapi-2.0.0.ebuild
 2006280009 ./sys-libs/tdb/tdb-1.4.3.ebuild
 2006132027 ./sys-libs/tevent/tevent-0.10.2.ebuild
-2005101409 ./sys-libs/timezone-data/timezone-data-2020a.ebuild
+2008021839 ./sys-libs/timezone-data/timezone-data-2020a.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
 2002021609 ./sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -29563,7 +30032,7 @@
 2004032241 ./virtual/cdrtools/cdrtools-0.ebuild
 2004211009 ./virtual/checkpassword/checkpassword-0.ebuild
 2004032241 ./virtual/commonlisp/commonlisp-0.ebuild
-2004211009 ./virtual/cron/cron-0-r1.ebuild
+2007311609 ./virtual/cron/cron-0-r2.ebuild
 2004211009 ./virtual/daemontools/daemontools-0.ebuild
 2005062039 ./virtual/dev-manager/dev-manager-0-r2.ebuild
 2006250039 ./virtual/editor/editor-0-r3.ebuild
@@ -29665,33 +30134,44 @@
 2007182339 ./virtual/perl-Archive-Tar/perl-Archive-Tar-2.360.0.ebuild
 2007182339 ./virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
 2007182339 ./virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild
-2004211009 ./virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild
-2004211009 ./virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild
-2004211009 ./virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
+2008010039 ./virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
+2008010039 ./virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
+2008010039 ./virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
 2004211009 ./virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
+2008010039 ./virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild
 2007182339 ./virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
 2006080939 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
 2007182339 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.93.0.ebuild
 2004211009 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
+2008010039 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild
 2004211009 ./virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
-2004211009 ./virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
+2008010039 ./virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild
+2008010039 ./virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild
 2004211009 ./virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
+2008010039 ./virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild
 2004211009 ./virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
-2004211009 ./virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild
-2004211009 ./virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild
+2008010039 ./virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild
+2008020039 ./virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
+2008010039 ./virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
 2004211009 ./virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
+2008020039 ./virtual/perl-Dumpvalue/perl-Dumpvalue-1.210.0.ebuild
 2004211009 ./virtual/perl-Encode/perl-Encode-3.10.0.ebuild
+2008020039 ./virtual/perl-Encode/perl-Encode-3.60.0.ebuild
 2004211009 ./virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
+2008020039 ./virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild
 2004211009 ./virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
-2004211009 ./virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild
-2004211009 ./virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
+2008020039 ./virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild
+2008020039 ./virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
+2008020039 ./virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
 2004211009 ./virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
-2004211009 ./virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild
-2004211009 ./virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild
-2004211009 ./virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild
-2004211009 ./virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild
-2004211009 ./virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
+2008020039 ./virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild
+2008020039 ./virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
+2008020039 ./virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
+2008020039 ./virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
+2008020039 ./virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
+2008020039 ./virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
 2004211009 ./virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
+2008020039 ./virtual/perl-Filter-Simple/perl-Filter-Simple-0.960.0.ebuild
 2004211009 ./virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
 2004211009 ./virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0.ebuild
 2004211009 ./virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
@@ -29759,17 +30239,8 @@
 2007290039 ./virtual/podofo-build/podofo-build-0.9.6.ebuild
 1912252209 ./virtual/pypy/pypy-7.3.0.ebuild
 1912252209 ./virtual/pypy3/pypy3-7.3.0.ebuild
-2004032241 ./virtual/python-backports_abc/python-backports_abc-0.ebuild
 2005252309 ./virtual/python-cffi/python-cffi-0.ebuild
-2004032241 ./virtual/python-enum34/python-enum34-2.ebuild
-2004032241 ./virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
-2004211009 ./virtual/python-futures/python-futures-1.ebuild
 2005262139 ./virtual/python-greenlet/python-greenlet-1.0-r1.ebuild
-2004032241 ./virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
-2007132009 ./virtual/python-pathlib/python-pathlib-1.0.ebuild
-2004032241 ./virtual/python-singledispatch/python-singledispatch-0.ebuild
-2004032241 ./virtual/python-typing/python-typing-0-r1.ebuild
-2004211009 ./virtual/python-unittest-mock/python-unittest-mock-1.ebuild
 2006051909 ./virtual/qmail/qmail-1.03.ebuild
 2004032241 ./virtual/resolvconf/resolvconf-1.ebuild
 2004122139 ./virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -29845,9 +30316,9 @@
 1910071309 ./www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
 1908200639 ./www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
 1706121125 ./www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
-2001051415 ./www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
-2001051415 ./www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
-2005091109 ./www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
+2008021509 ./www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
+2008021509 ./www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+2008021509 ./www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
 1712020139 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
@@ -29873,6 +30344,7 @@
 2005062339 ./www-apps/blohg/blohg-0.13-r4.ebuild
 2002230040 ./www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
 2002230040 ./www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
+2008020009 ./www-apps/bugzilla/bugzilla-5.0.6.ebuild
 1909230439 ./www-apps/cgisysinfo/cgisysinfo-0.4.1.ebuild
 2001021339 ./www-apps/cgit/cgit-1.2.1.ebuild
 2003240139 ./www-apps/cgit/cgit-1.2.3.ebuild
@@ -29951,15 +30423,6 @@
 1909070939 ./www-apps/nanoc/nanoc-4.11.10.ebuild
 1909111109 ./www-apps/nanoc/nanoc-4.11.11.ebuild
 1909291239 ./www-apps/nanoc/nanoc-4.11.12.ebuild
-2002092009 ./www-apps/netbox/netbox-2.5.11.ebuild
-2002092009 ./www-apps/netbox/netbox-2.5.12.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.1.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.4.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.5.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.6.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.7.ebuild
-2002092009 ./www-apps/netbox/netbox-2.6.8.ebuild
-2002132339 ./www-apps/netbox/netbox-2.6.12.ebuild
 2002130309 ./www-apps/netbox/netbox-2.7.2.ebuild
 2003030209 ./www-apps/netbox/netbox-2.7.6.ebuild
 2003102009 ./www-apps/netbox/netbox-2.7.8.ebuild
@@ -30012,13 +30475,13 @@
 1912111540 ./www-apps/wiliki/wiliki-0.6.1-r1.ebuild
 2006111039 ./www-apps/wordpress/wordpress-5.4.2.ebuild
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
-2007262009 ./www-client/chromium/chromium-85.0.4183.39.ebuild
 2007262009 ./www-client/chromium/chromium-86.0.4209.2.ebuild
 2007292039 ./www-client/chromium/chromium-84.0.4147.105.ebuild
+2007312309 ./www-client/chromium/chromium-85.0.4183.48.ebuild
 2002112051 ./www-client/dillo/dillo-3.0.5.ebuild
-2002231739 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2002231739 ./www-client/dillo/dillo-3.1_p20181005.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
+2008021509 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 1910111911 ./www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
 1908291709 ./www-client/elinks/elinks-9999.ebuild
 2004032241 ./www-client/elinks/elinks-0.12_pre6-r4.ebuild
@@ -30124,8 +30587,7 @@
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-9999.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
-2001261409 ./www-plugins/passff-host/passff-host-1.2.1.ebuild
-2002120939 ./www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
+2008010139 ./www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
 2001040209 ./www-plugins/passff/passff-1.9.1.ebuild
 1712242039 ./www-plugins/pdfjs/pdfjs-1.9.426.ebuild
 1909260009 ./www-plugins/pdfjs/pdfjs-2.1.266.ebuild
@@ -30180,7 +30642,7 @@
 2004111839 ./www-servers/tornado/tornado-5.1-r1.ebuild
 2005271909 ./www-servers/tornado/tornado-6.0.3.ebuild
 2007120209 ./www-servers/tornado/tornado-6.0.4.ebuild
-2006081009 ./www-servers/uwsgi/uwsgi-2.0.18.ebuild
+2008021509 ./www-servers/uwsgi/uwsgi-2.0.18.ebuild
 2004201809 ./www-servers/varnish/varnish-6.4.0.ebuild
 2004270309 ./www-servers/varnish/varnish-6.0.6.ebuild
 2004270309 ./www-servers/varnish/varnish-6.3.2.ebuild
@@ -30289,7 +30751,6 @@
 2007260009 ./x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
 2007260009 ./x11-base/xorg-server/xorg-server-9999.ebuild
 2004032241 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
-2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -30297,6 +30758,7 @@
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
 2007291239 ./x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
+2008011009 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
 2004032241 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2004032241 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2004032241 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -30341,7 +30803,7 @@
 2002231739 ./x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
 2003261841 ./x11-libs/cairo/cairo-9999.ebuild
 2004032241 ./x11-libs/cairo/cairo-1.16.0-r3.ebuild
-2007211239 ./x11-libs/cairo/cairo-1.16.0-r4.ebuild
+2007312109 ./x11-libs/cairo/cairo-1.16.0-r4.ebuild
 1910111911 ./x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
 2002230040 ./x11-libs/dnd/dnd-1.1-r3.ebuild
 1702282250 ./x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
@@ -30383,6 +30845,7 @@
 2007152009 ./x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
 2004032241 ./x11-libs/libSM/libSM-1.2.3.ebuild
 2004032241 ./x11-libs/libX11/libX11-1.6.9.ebuild
+2007312309 ./x11-libs/libX11/libX11-1.6.10.ebuild
 2004032241 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2004032241 ./x11-libs/libXau/libXau-1.0.9.ebuild
 2004032241 ./x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -30421,13 +30884,13 @@
 2006151909 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
 2004032241 ./x11-libs/libdrm/libdrm-2.4.100.ebuild
 2004042209 ./x11-libs/libdrm/libdrm-9999.ebuild
-2007211239 ./x11-libs/libdrm/libdrm-2.4.102.ebuild
+2007312109 ./x11-libs/libdrm/libdrm-2.4.102.ebuild
 2006091709 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2002222009 ./x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
 2002222009 ./x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
 2005210239 ./x11-libs/libfm-qt/libfm-qt-0.14.1-r2.ebuild
 2005210239 ./x11-libs/libfm-qt/libfm-qt-0.15.1.ebuild
-2006150209 ./x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
+2007311939 ./x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
 2002222009 ./x11-libs/libfm/libfm-1.2.5.ebuild
 2002222009 ./x11-libs/libfm/libfm-1.3.1.ebuild
 2002222009 ./x11-libs/libfm/libfm-9999.ebuild
@@ -30468,7 +30931,7 @@
 2004032241 ./x11-libs/libwnck/libwnck-3.30.0.ebuild
 2005302309 ./x11-libs/libxcb/libxcb-1.14.ebuild
 2004032241 ./x11-libs/libxkbcommon/libxkbcommon-0.10.0.ebuild
-2007211239 ./x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
+2007312109 ./x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
 2004032241 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 2004032241 ./x11-libs/libxklavier/libxklavier-5.4.ebuild
 2004032241 ./x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -30686,7 +31149,7 @@
 1810202209 ./x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
 2002112051 ./x11-misc/numlockx/numlockx-1.2.ebuild
 2005210239 ./x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
-2005210239 ./x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
+2007311939 ./x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
 1804202309 ./x11-misc/obconf/obconf-9999.ebuild
 2002091809 ./x11-misc/obconf/obconf-2.0.4.ebuild
 2006252139 ./x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
@@ -30695,7 +31158,7 @@
 1805212239 ./x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild
 1808051439 ./x11-misc/parcellite/parcellite-1.2.1.ebuild
 2005210239 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
-2005210239 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
+2007311939 ./x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
 1911020309 ./x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
 1804202309 ./x11-misc/pcmanfm/pcmanfm-9999.ebuild
 2002112051 ./x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -30712,7 +31175,7 @@
 2006040939 ./x11-misc/qlipper/qlipper-5.1.2.ebuild
 2005210239 ./x11-misc/qps/qps-1.10.20.ebuild
 2005210239 ./x11-misc/qps/qps-2.0.0.ebuild
-2006150209 ./x11-misc/qps/qps-2.1.0-r1.ebuild
+2007311939 ./x11-misc/qps/qps-2.1.0-r1.ebuild
 1912311709 ./x11-misc/qt5ct/qt5ct-0.41.ebuild
 2007161639 ./x11-misc/qt5ct/qt5ct-1.0.ebuild
 2007211609 ./x11-misc/qt5ct/qt5ct-1.1.ebuild
@@ -30856,7 +31319,7 @@
 2004032241 ./x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
 2007231109 ./x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
 2007252109 ./x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
-2007272209 ./x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
+2008011209 ./x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
 2002112051 ./x11-misc/xdialog/xdialog-2.3.1.ebuild
 2002112051 ./x11-misc/xdiskusage/xdiskusage-1.51.ebuild
 2006191509 ./x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -30886,7 +31349,7 @@
 1905150039 ./x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
 2004032241 ./x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild
 2006232309 ./x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
-2007211239 ./x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+2007312109 ./x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
 2002230040 ./x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
 2002230040 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2002121439 ./x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -30895,6 +31358,7 @@
 2006141309 ./x11-misc/xlockmore/xlockmore-5.64.ebuild
 2007220939 ./x11-misc/xlockmore/xlockmore-5.65.ebuild
 2006060139 ./x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
+2008011139 ./x11-misc/xmobar/xmobar-0.35.1.ebuild
 1909152040 ./x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
 2001270739 ./x11-misc/xmountains/xmountains-2.9-r1.ebuild
 2007021039 ./x11-misc/xnee/xnee-3.19-r2.ebuild
@@ -30974,7 +31438,7 @@
 2007230909 ./x11-misc/birdtray/birdtray-9999.ebuild
 2005220039 ./x11-misc/snixembed/snixembed-0.2.2.ebuild
 2006090609 ./x11-misc/snixembed/snixembed-0.3.0.ebuild
-2007300439 ./x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild
+2008020209 ./x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild
 2007300339 ./x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild
 1805220439 ./x11-plugins/allin1/allin1-0.5.0-r2.ebuild
 1805220439 ./x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -31188,8 +31652,8 @@
 2001292139 ./x11-plugins/wmxres/wmxres-1.2-r1.ebuild
 2003280239 ./x11-plugins/lurch/lurch-0.6.8.ebuild
 2007201909 ./x11-terms/alacritty/alacritty-0.4.3.ebuild
-2007201909 ./x11-terms/alacritty/alacritty-0.5.0_rc1.ebuild
-2007201909 ./x11-terms/alacritty/alacritty-9999.ebuild
+2008010409 ./x11-terms/alacritty/alacritty-0.5.0.ebuild
+2008010409 ./x11-terms/alacritty/alacritty-9999.ebuild
 2004241209 ./x11-terms/aterm/aterm-1.0.1-r4.ebuild
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 1804280409 ./x11-terms/eterm/eterm-9999.ebuild
@@ -31248,7 +31712,7 @@
 2007142239 ./x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
 2004032241 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
-2007140409 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
+2008021139 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
 2001211409 ./x11-themes/adwaita-qt/adwaita-qt-1.1.1.ebuild
 2007142239 ./x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
 2003261841 ./x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
@@ -31344,7 +31808,7 @@
 2005172009 ./x11-themes/light-themes/light-themes-17.04_p20170406.ebuild
 1909291339 ./x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
 2005210239 ./x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
-2005210239 ./x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
+2007311939 ./x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
 2004062109 ./x11-themes/mate-backgrounds/mate-backgrounds-1.22.0.ebuild
 2004081839 ./x11-themes/mate-backgrounds/mate-backgrounds-1.24.1.ebuild
 2005081846 ./x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.20.0.ebuild
@@ -31532,7 +31996,7 @@
 1909280709 ./x11-wm/subtle/subtle-9999.ebuild
 1810131239 ./x11-wm/treewm/treewm-0.4.5-r2.ebuild
 2004032241 ./x11-wm/twm/twm-1.0.10.ebuild
-2007211239 ./x11-wm/twm/twm-1.0.11.ebuild
+2007312109 ./x11-wm/twm/twm-1.0.11.ebuild
 1910072239 ./x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
 1806031009 ./x11-wm/windowlab/windowlab-1.40-r1.ebuild
 2006131209 ./x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
@@ -31579,12 +32043,14 @@
 2007191709 ./xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
 2004032241 ./xfce-base/xfconf/xfconf-4.14.1.ebuild
 2007161509 ./xfce-base/xfconf/xfconf-4.15.0.ebuild
-2007282239 ./xfce-base/xfconf/xfconf-4.14.3.ebuild
+2008011209 ./xfce-base/xfconf/xfconf-4.14.3.ebuild
 2003152212 ./xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
 2006191239 ./xfce-base/xfdesktop/xfdesktop-4.15.0.ebuild
 2002112051 ./xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
 2007262239 ./xfce-base/xfwm4/xfwm4-4.14.3.ebuild
-2007282239 ./xfce-base/xfwm4/xfwm4-4.14.2.ebuild
+2008011209 ./xfce-base/xfwm4/xfwm4-4.14.2.ebuild
+2008011809 ./xfce-base/xfwm4/xfwm4-4.14.4.ebuild
+2008011809 ./xfce-base/xfwm4/xfwm4-4.15.0.ebuild
 1807101539 ./xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild
 1912061739 ./xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r4.ebuild
 2007041609 ./xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.4.0.ebuild
@@ -32091,7 +32557,6 @@
 2006262339 metadata/md5-cache/app-accessibility/espeakup-0.71-r1
 2006262339 metadata/md5-cache/app-accessibility/espeakup-0.80
 2007041046 metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
-2007041046 metadata/md5-cache/app-accessibility/accerciser-3.22.0
 2007050309 metadata/md5-cache/app-accessibility/at-spi2-core-2.36.0
 2007041046 metadata/md5-cache/app-accessibility/brltty-5.2-r1
 2007041046 metadata/md5-cache/app-accessibility/brltty-6.0-r1
@@ -32109,9 +32574,9 @@
 2007201009 metadata/md5-cache/app-accessibility/accerciser-3.36.2
 2007250041 metadata/md5-cache/app-accessibility/edbrowse-3.7.5.1
 2007250041 metadata/md5-cache/app-accessibility/simon-9999
-2007291439 metadata/md5-cache/app-accessibility/Manifest.gz
 2007290809 metadata/md5-cache/app-accessibility/at-spi2-atk-2.34.2
 2007290809 metadata/md5-cache/app-accessibility/at-spi2-core-2.34.0
+2008021039 metadata/md5-cache/app-accessibility/Manifest.gz
 1712300140 metadata/md5-cache/app-admin/aws-elb-tools-1.0.15.1-r1
 1903312039 metadata/md5-cache/app-admin/checksec-1.11.1
 1810171539 metadata/md5-cache/app-admin/checksec-1.9.0
@@ -32492,9 +32957,14 @@
 2007302139 metadata/md5-cache/app-admin/graylog-3.3.2
 2007302139 metadata/md5-cache/app-admin/logstash-bin-6.8.11
 2007302139 metadata/md5-cache/app-admin/logstash-bin-7.8.1
-2007311209 metadata/md5-cache/app-admin/Manifest.gz
 2007311109 metadata/md5-cache/app-admin/sysstat-12.2.3
 2007311109 metadata/md5-cache/app-admin/sysstat-12.4.0
+2008021039 metadata/md5-cache/app-admin/Manifest.gz
+2008020109 metadata/md5-cache/app-admin/consul-1.8.1
+2007311939 metadata/md5-cache/app-admin/logrotate-3.17.0
+2008011009 metadata/md5-cache/app-admin/sshguard-2.4.1
+2008020209 metadata/md5-cache/app-admin/vault-1.4.3
+2008021039 metadata/md5-cache/app-admin/vault-1.5.0
 2007041046 metadata/md5-cache/app-antivirus/clamtk-6.03
 2007041046 metadata/md5-cache/app-antivirus/clamtk-6.03-r1
 2007041046 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
@@ -32579,7 +33049,6 @@
 2006141358 metadata/md5-cache/app-arch/wimlib-1.12.0
 2006141358 metadata/md5-cache/app-arch/wimlib-1.13.0
 2006141358 metadata/md5-cache/app-arch/xarchiver-0.5.4.14
-2006141358 metadata/md5-cache/app-arch/xarchiver-0.5.4.15
 2006141358 metadata/md5-cache/app-arch/zip-3.0-r3
 2006141358 metadata/md5-cache/app-arch/zoo-2.10-r5
 2006141358 metadata/md5-cache/app-arch/zopfli-1.0.2
@@ -32605,7 +33074,6 @@
 2007050309 metadata/md5-cache/app-arch/gcab-1.4
 2007041046 metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
 2007041046 metadata/md5-cache/app-arch/libarchive-3.4.2
-2007041046 metadata/md5-cache/app-arch/libarchive-3.4.3
 2007041046 metadata/md5-cache/app-arch/mt-st-9999
 2007041046 metadata/md5-cache/app-arch/patool-1.12
 2007041046 metadata/md5-cache/app-arch/pixz-9999
@@ -32644,14 +33112,16 @@
 2007250041 metadata/md5-cache/app-arch/brotli-9999
 2007250041 metadata/md5-cache/app-arch/innoextract-1.7
 2007250041 metadata/md5-cache/app-arch/innoextract-1.8
-2007250041 metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
 2007250041 metadata/md5-cache/app-arch/lz4-1.9.2
 2007250041 metadata/md5-cache/app-arch/lz4-9999
 2007250041 metadata/md5-cache/app-arch/snappy-1.1.8
 2007250041 metadata/md5-cache/app-arch/unshield-1.4.3
 2007241339 metadata/md5-cache/app-arch/zip-3.0-r4
-2007300309 metadata/md5-cache/app-arch/Manifest.gz
 2007300309 metadata/md5-cache/app-arch/zopfli-1.0.3
+2008011239 metadata/md5-cache/app-arch/Manifest.gz
+2008011239 metadata/md5-cache/app-arch/libarchive-3.4.3
+2007311939 metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
+2008011209 metadata/md5-cache/app-arch/xarchiver-0.5.4.15
 1806240109 metadata/md5-cache/app-backup/ccollect-0.8
 1706110808 metadata/md5-cache/app-backup/cdbkup-1.0-r2
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
@@ -32732,7 +33202,6 @@
 2007041046 metadata/md5-cache/app-backup/attic-9999
 2007041046 metadata/md5-cache/app-backup/backintime-1.2.1
 2007041046 metadata/md5-cache/app-backup/backintime-9999
-2007041046 metadata/md5-cache/app-backup/bareos-17.2.9
 2007041046 metadata/md5-cache/app-backup/borgbackup-1.1.11-r2
 2007041046 metadata/md5-cache/app-backup/borgbackup-1.1.13
 2007041046 metadata/md5-cache/app-backup/borgbackup-9999
@@ -32752,8 +33221,6 @@
 2007131639 metadata/md5-cache/app-backup/borgmatic-1.5.8
 2007201009 metadata/md5-cache/app-backup/bacula-9.6.5
 2007191539 metadata/md5-cache/app-backup/borgmatic-1.5.6
-2007250041 metadata/md5-cache/app-backup/bareos-18.2.8
-2007250041 metadata/md5-cache/app-backup/bareos-19.2.7
 2007251339 metadata/md5-cache/app-backup/borgmatic-1.5.9
 2007251339 metadata/md5-cache/app-backup/burp-2.3.30
 2007250041 metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -32761,8 +33228,11 @@
 2007250041 metadata/md5-cache/app-backup/zbackup-1.4.4-r1
 2007250041 metadata/md5-cache/app-backup/zbackup-9999
 2007271939 metadata/md5-cache/app-backup/rdiff-backup-2.0.5
-2007282209 metadata/md5-cache/app-backup/Manifest.gz
 2007281739 metadata/md5-cache/app-backup/luckybackup-0.5.0
+2008011739 metadata/md5-cache/app-backup/Manifest.gz
+2008011739 metadata/md5-cache/app-backup/bareos-17.2.10
+2008011739 metadata/md5-cache/app-backup/bareos-18.2.9
+2008011739 metadata/md5-cache/app-backup/bareos-19.2.8
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -33068,7 +33538,6 @@
 2007041046 metadata/md5-cache/app-crypt/openssl-blacklist-0.5.3
 2007041046 metadata/md5-cache/app-crypt/p11-kit-0.23.19-r1
 2007041046 metadata/md5-cache/app-crypt/p11-kit-0.23.20-r1
-2007041046 metadata/md5-cache/app-crypt/pius-2.2.4
 2007041046 metadata/md5-cache/app-crypt/pius-3.0.0
 2007041046 metadata/md5-cache/app-crypt/rhash-1.3.6-r1
 2007041046 metadata/md5-cache/app-crypt/rhash-1.3.8
@@ -33113,8 +33582,8 @@
 2007250041 metadata/md5-cache/app-crypt/zulucrypt-5.4.0
 2007250041 metadata/md5-cache/app-crypt/zulucrypt-5.4.0_pre20180223
 2007290809 metadata/md5-cache/app-crypt/libsecret-0.20.2
-2007301039 metadata/md5-cache/app-crypt/Manifest.gz
 2007301039 metadata/md5-cache/app-crypt/qca-2.3.1
+2008021539 metadata/md5-cache/app-crypt/Manifest.gz
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1702282308 metadata/md5-cache/app-dicts/eblook-1.6.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
@@ -33457,7 +33926,6 @@
 2007301709 metadata/md5-cache/app-dicts/sword-Nave-2.0
 2007301709 metadata/md5-cache/app-dicts/sword-RWP-2.0
 2007301709 metadata/md5-cache/app-dicts/sword-Robinson-2.1
-2007311209 metadata/md5-cache/app-dicts/Manifest.gz
 2007311209 metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
 2007311209 metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
 2007310039 metadata/md5-cache/app-dicts/sword-FinBiblia-2.0
@@ -33487,6 +33955,175 @@
 2007310039 metadata/md5-cache/app-dicts/sword-WLC-1.9
 2007310039 metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
 2007310039 metadata/md5-cache/app-dicts/sword-Wycliffe-2.3
+2007312109 metadata/md5-cache/app-dicts/Manifest.gz
+2007312109 metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
+2007312109 metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
+2007312109 metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
+2007312109 metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
+2007312109 metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
+2007312109 metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
+2007312109 metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
+2007312109 metadata/md5-cache/app-dicts/sword-GerTafel-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-Godbey-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
+2007312109 metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
+2007312109 metadata/md5-cache/app-dicts/sword-Haitian-1.5
+2007312109 metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-HebModern-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-HinERV-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-HunUj-1.7.3
+2007312109 metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
+2007312109 metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JEAffections-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JESermons-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JOChrist-0.5
+2007312109 metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
+2007312109 metadata/md5-cache/app-dicts/sword-JOGlory-0.5
+2007312109 metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JapBungo-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-JapKougo-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-KD-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-Kekchi-1.5
+2007312109 metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-KtuVb-3.1
+2007312109 metadata/md5-cache/app-dicts/sword-LEB-2.7
+2007312109 metadata/md5-cache/app-dicts/sword-LO-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-LXX-2.5
+2007312109 metadata/md5-cache/app-dicts/sword-Latvian-1.4
+2007312109 metadata/md5-cache/app-dicts/sword-LawGospel-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-Leeser-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-LinVB-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
+2007312109 metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-Maori-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-MapM-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-MollColossians-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-MonKJV-1.4
+2007312109 metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
+2007312109 metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
+2007312109 metadata/md5-cache/app-dicts/sword-NHEB-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-NHEBME-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-Ndebele-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
+2007312109 metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-NorSMB-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-Noyes-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-OEB-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-OEBcth-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-OSHB-1.4
+2007312109 metadata/md5-cache/app-dicts/sword-OSHM-1.4
+2007312109 metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Passion-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Phaistos-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-PohnOld-1.01
+2007312109 metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-PorAR-1.3
+2007312109 metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
+2007312109 metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-PorIBP-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-PotLykins-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-RecVer-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Rieger-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-RomCor-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARST-4.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
+2007312109 metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
+2007312109 metadata/md5-cache/app-dicts/sword-RusVZh-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
+2007312109 metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
+2007312109 metadata/md5-cache/app-dicts/sword-SP-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SPDSS-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SPE-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SPMT-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SPVar-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-Sentiment-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Shona-2.1
+2007312109 metadata/md5-cache/app-dicts/sword-SloKJV-11.0
+2007312109 metadata/md5-cache/app-dicts/sword-SloKJVA-0.3.41
+2007312109 metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SloStritar-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-SomKQA-2.0
+2007312109 metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Swe1917-2.0
+2007312109 metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-TNT-2.0
+2007312109 metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
+2007312109 metadata/md5-cache/app-dicts/sword-Tausug-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
+2007312109 metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
+2007312109 metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-UrduGeo-1.6
+2007312109 metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7
+2007312109 metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-UyCyr-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-VarApp-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Viet-1.4.1
+2007312109 metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-VietNVB-1.4
+2007312109 metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
+2007312109 metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
+2007312109 metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
+2007312109 metadata/md5-cache/app-dicts/sword-Webster1806-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1
+2007312109 metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-Westminster21-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-Worsley-1.6
+2007312109 metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-alzat-1.0
+2007312109 metadata/md5-cache/app-dicts/sword-br_en-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-en_eu-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-f35-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-la_en-1.1
+2007312109 metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
+2007312109 metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
 1908281339 metadata/md5-cache/app-doc/diveintopython-2
 1801310138 metadata/md5-cache/app-doc/diveintopython-3
 1903080839 metadata/md5-cache/app-doc/e16-docs-0.16.8.0.2
@@ -33667,9 +34304,6 @@
 2006141358 metadata/md5-cache/app-editors/emacs-24.5-r7
 2006141358 metadata/md5-cache/app-editors/emacs-25.3-r6
 2006141358 metadata/md5-cache/app-editors/emacs-26.3-r1
-2006141358 metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
-2006141358 metadata/md5-cache/app-editors/emacs-27.0.90
-2006141358 metadata/md5-cache/app-editors/emacs-27.0.91
 2006141358 metadata/md5-cache/app-editors/emact-2.58.0
 2006141358 metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
 2006141358 metadata/md5-cache/app-editors/fe-2.0
@@ -33772,10 +34406,12 @@
 2007250041 metadata/md5-cache/app-editors/neovim-9999
 2007250041 metadata/md5-cache/app-editors/okteta-0.26.3
 2007250041 metadata/md5-cache/app-editors/texworks-0.6.5
-2007311209 metadata/md5-cache/app-editors/Manifest.gz
-2007311209 metadata/md5-cache/app-editors/nano-4.9.3
 2007311209 metadata/md5-cache/app-editors/nano-5.0
 2007311209 metadata/md5-cache/app-editors/nano-9999
+2008021509 metadata/md5-cache/app-editors/Manifest.gz
+2008012139 metadata/md5-cache/app-editors/emacs-27.1_rc1
+2008021509 metadata/md5-cache/app-editors/nano-4.9.3
+2008020209 metadata/md5-cache/app-editors/okteta-0.26.4
 2002221412 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2002221412 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2002221412 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -34034,8 +34670,9 @@
 2007041046 metadata/md5-cache/app-emacs/eselect-mode-9999
 2007041046 metadata/md5-cache/app-emacs/pymacs-0.26-r1
 2007041046 metadata/md5-cache/app-emacs/twittering-mode-9999
-2007231409 metadata/md5-cache/app-emacs/Manifest.gz
 2007231409 metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+2008011609 metadata/md5-cache/app-emacs/Manifest.gz
+2008011609 metadata/md5-cache/app-emacs/ddskk-16.3
 1804270439 metadata/md5-cache/app-emulation/bochs-2.6.9
 1805292338 metadata/md5-cache/app-emulation/coldfire-0.3.1
 1909190709 metadata/md5-cache/app-emulation/cri-o-1.15.1
@@ -34113,8 +34750,6 @@
 2006130039 metadata/md5-cache/app-emulation/cri-o-1.17.0
 2006130039 metadata/md5-cache/app-emulation/cri-o-1.17.1
 2006130039 metadata/md5-cache/app-emulation/docker-swarm-1.2.9
-2006141358 metadata/md5-cache/app-emulation/buildah-1.14.5
-2006141358 metadata/md5-cache/app-emulation/buildah-1.14.6
 2006141358 metadata/md5-cache/app-emulation/buildah-1.14.8
 2006141358 metadata/md5-cache/app-emulation/containerd-1.2.10
 2006141358 metadata/md5-cache/app-emulation/containerd-1.2.12
@@ -34355,8 +34990,12 @@
 2007261939 metadata/md5-cache/app-emulation/xen-tools-4.14.0
 2007271309 metadata/md5-cache/app-emulation/ganeti-2.15.2-r11
 2007281709 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.22
-2007290109 metadata/md5-cache/app-emulation/Manifest.gz
 2007290109 metadata/md5-cache/app-emulation/conmon-2.0.20
+2008020039 metadata/md5-cache/app-emulation/Manifest.gz
+2008012339 metadata/md5-cache/app-emulation/buildah-1.14.10
+2008020039 metadata/md5-cache/app-emulation/buildah-1.15.1
+2008012239 metadata/md5-cache/app-emulation/docker-19.03.12
+2008010039 metadata/md5-cache/app-emulation/libpod-2.0.4
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -34376,7 +35015,6 @@
 2002112051 metadata/md5-cache/app-eselect/eselect-wine-1.2.2
 2003261841 metadata/md5-cache/app-eselect/eselect-lua-1
 2003261841 metadata/md5-cache/app-eselect/eselect-ruby-20191222
-2003261841 metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
 2004032241 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2004032241 metadata/md5-cache/app-eselect/eselect-cblas-0.1
 2004032241 metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
@@ -34394,7 +35032,6 @@
 2004032241 metadata/md5-cache/app-eselect/eselect-python-20190417
 2004032241 metadata/md5-cache/app-eselect/eselect-ruby-20170723
 2004032241 metadata/md5-cache/app-eselect/eselect-ruby-20190121
-2004032241 metadata/md5-cache/app-eselect/eselect-vi-1.1.9
 2004032241 metadata/md5-cache/app-eselect/eselect-xvmc-0.4
 2004211009 metadata/md5-cache/app-eselect/eselect-awk-0.2
 2004211009 metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
@@ -34417,9 +35054,9 @@
 2007192339 metadata/md5-cache/app-eselect/eselect-python-20200719
 2007192339 metadata/md5-cache/app-eselect/eselect-python-99999999
 2007231439 metadata/md5-cache/app-eselect/eselect-repository-7
-2007300309 metadata/md5-cache/app-eselect/eselect-vi-1.2
-2007310939 metadata/md5-cache/app-eselect/Manifest.gz
 2007310309 metadata/md5-cache/app-eselect/eselect-sh-0.4.1
+2008010909 metadata/md5-cache/app-eselect/Manifest.gz
+2007312109 metadata/md5-cache/app-eselect/eselect-vi-1.2
 1905191439 metadata/md5-cache/app-forensics/air-2.0.0-r2
 1908021439 metadata/md5-cache/app-forensics/libewf-20171104
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
@@ -34468,7 +35105,6 @@
 1708161738 metadata/md5-cache/app-i18n/ibus-table-latin-1.2.0.20100305
 1712121639 metadata/md5-cache/app-i18n/ibus-table-others-1.3.9
 1708121809 metadata/md5-cache/app-i18n/ibus-unikey-0.6.1-r2
-1809041539 metadata/md5-cache/app-i18n/libcangjie-1.3
 1808291609 metadata/md5-cache/app-i18n/nabi-1.0.0
 1807271709 metadata/md5-cache/app-i18n/rime-data-0.35
 1712311440 metadata/md5-cache/app-i18n/scim-hangul-0.4.0
@@ -34557,15 +35193,12 @@
 2006141358 metadata/md5-cache/app-i18n/uim-tomoe-gtk-0.6.0
 2006141358 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
 2006141358 metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
-2006141358 metadata/md5-cache/app-i18n/yaskkserv-1.1.0
-2006141358 metadata/md5-cache/app-i18n/yaskkserv-1.1.1
 2006161739 metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
 2007041046 metadata/md5-cache/app-i18n/enca-1.19-r2
 2007041046 metadata/md5-cache/app-i18n/ibus-1.5.21-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-1.5.22
 2007041046 metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r2
 2007041046 metadata/md5-cache/app-i18n/ibus-anthy-1.5.11-r1
-2007041046 metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-hangul-1.5.3-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92
@@ -34574,7 +35207,6 @@
 2007041046 metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1
 2007041046 metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1
-2007041046 metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.3
 2007041046 metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.0
 2007041046 metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
 2007041046 metadata/md5-cache/app-i18n/libchewing-9999
@@ -34595,7 +35227,6 @@
 2007041046 metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1
 2007041709 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2007041709 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
-2007250041 metadata/md5-cache/app-i18n/Manifest.gz
 2007250041 metadata/md5-cache/app-i18n/fcitx-4.2.9.6
 2007250041 metadata/md5-cache/app-i18n/fcitx-4.9999
 2007250041 metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
@@ -34639,6 +35270,11 @@
 2007250041 metadata/md5-cache/app-i18n/tagainijisho-9999
 2007250041 metadata/md5-cache/app-i18n/uchardet-0.0.6-r2
 2007250041 metadata/md5-cache/app-i18n/uchardet-9999
+2008011639 metadata/md5-cache/app-i18n/Manifest.gz
+2008011609 metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
+2008011609 metadata/md5-cache/app-i18n/ibus-typing-booster-2.9.4
+2008011539 metadata/md5-cache/app-i18n/libcangjie-1.3
+2008011639 metadata/md5-cache/app-i18n/yaskkserv-1.1.1
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2006141358 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2006141358 metadata/md5-cache/app-laptop/i8kutils-1.42
@@ -35121,7 +35757,6 @@
 2007041046 metadata/md5-cache/app-misc/chkcrontab-1.7
 2007041046 metadata/md5-cache/app-misc/dvtm-9999
 2007041046 metadata/md5-cache/app-misc/email2trac-2.12.2
-2007041046 metadata/md5-cache/app-misc/evemu-2.6.0
 2007041046 metadata/md5-cache/app-misc/evemu-2.7.0
 2007041046 metadata/md5-cache/app-misc/fdupes-9999
 2007041046 metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r13
@@ -35130,7 +35765,6 @@
 2007041046 metadata/md5-cache/app-misc/gcalcli-4.2.0
 2007050309 metadata/md5-cache/app-misc/geoclue-2.5.3-r2
 2007041046 metadata/md5-cache/app-misc/golly-3.3-r1
-2007041046 metadata/md5-cache/app-misc/golly-3.3-r3
 2007041046 metadata/md5-cache/app-misc/goobook-3.4-r1
 2007041046 metadata/md5-cache/app-misc/grabcartoons-9999
 2007041046 metadata/md5-cache/app-misc/grc-1.11-r1
@@ -35162,7 +35796,6 @@
 2007041046 metadata/md5-cache/app-misc/mtail-1.2.0
 2007041046 metadata/md5-cache/app-misc/neofetch-9999
 2007041046 metadata/md5-cache/app-misc/no-more-secrets-9999
-2007041046 metadata/md5-cache/app-misc/pax-utils-1.2.6
 2007041046 metadata/md5-cache/app-misc/qcma-9999
 2007041046 metadata/md5-cache/app-misc/radeontop-9999
 2007041046 metadata/md5-cache/app-misc/ranger-1.9.2
@@ -35246,11 +35879,13 @@
 2007291439 metadata/md5-cache/app-misc/gramps-5.1.2-r2
 2007302139 metadata/md5-cache/app-misc/elasticsearch-6.8.11
 2007302139 metadata/md5-cache/app-misc/elasticsearch-7.8.1
-2007310709 metadata/md5-cache/app-misc/Manifest.gz
 2007310239 metadata/md5-cache/app-misc/ddcutil-0.9.9
 2007310209 metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r1
-2007310439 metadata/md5-cache/app-misc/tmux-3.1b
 2007310709 metadata/md5-cache/app-misc/tmuxp-1.5.5
+2008021709 metadata/md5-cache/app-misc/Manifest.gz
+2008021509 metadata/md5-cache/app-misc/golly-3.3-r3
+2008011709 metadata/md5-cache/app-misc/pax-utils-1.2.6
+2008011239 metadata/md5-cache/app-misc/tmux-3.1b
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -35354,8 +35989,8 @@
 2007250041 metadata/md5-cache/app-office/texmacs-1.99.11
 2007250041 metadata/md5-cache/app-office/texmacs-1.99.6-r2
 2007250041 metadata/md5-cache/app-office/texmacs-1.99.9
-2007291139 metadata/md5-cache/app-office/Manifest.gz
-2007291139 metadata/md5-cache/app-office/lyx-2.3.5.2
+2008021509 metadata/md5-cache/app-office/Manifest.gz
+2008021509 metadata/md5-cache/app-office/lyx-2.3.5.2
 2004020339 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2004020339 metadata/md5-cache/app-officeext/ooofbtools-2.56
 2004020339 metadata/md5-cache/app-officeext/texmaths-0.48
@@ -35407,7 +36042,6 @@
 2004211009 metadata/md5-cache/app-portage/elt-patches-20170422
 2004211009 metadata/md5-cache/app-portage/elt-patches-20170815
 2004211009 metadata/md5-cache/app-portage/portage-utils-0.80
-2004230939 metadata/md5-cache/app-portage/cpuid2cpuflags-9
 2005070939 metadata/md5-cache/app-portage/euses-2.6.0
 2005172109 metadata/md5-cache/app-portage/portage-utils-0.87
 2005281239 metadata/md5-cache/app-portage/mgorny-dev-scripts-5
@@ -35428,15 +36062,12 @@
 2006141358 metadata/md5-cache/app-portage/ufed-0.96
 2006282339 metadata/md5-cache/app-portage/porticron-0.7.1
 2007021339 metadata/md5-cache/app-portage/portage-utils-0.88
-2007041046 metadata/md5-cache/app-portage/cpuid2cpuflags-1
 2007041046 metadata/md5-cache/app-portage/cpuid2cpuflags-9999
 2007041046 metadata/md5-cache/app-portage/diffmask-0.3.3-r4
 2007041046 metadata/md5-cache/app-portage/diffmask-9999
 2007041046 metadata/md5-cache/app-portage/distpatch-0.1.2-r2
 2007041046 metadata/md5-cache/app-portage/elicense-1.0.2
 2007041046 metadata/md5-cache/app-portage/elicense-9999
-2007041046 metadata/md5-cache/app-portage/elogviewer-2.9-r1
-2007041046 metadata/md5-cache/app-portage/elogviewer-3.0-r2
 2007041046 metadata/md5-cache/app-portage/esearch-1.3-r2
 2007041046 metadata/md5-cache/app-portage/esearch-9999
 2007041046 metadata/md5-cache/app-portage/etc-proposals-1.4.3-r3
@@ -35517,9 +36148,11 @@
 2007250041 metadata/md5-cache/app-portage/kuroo-9999
 2007250041 metadata/md5-cache/app-portage/pram-8
 2007301609 metadata/md5-cache/app-portage/portpeek-3.1.3
-2007310009 metadata/md5-cache/app-portage/Manifest.gz
-2007302309 metadata/md5-cache/app-portage/eix-0.34.4
 2007302309 metadata/md5-cache/app-portage/gemato-14.4
+2008021709 metadata/md5-cache/app-portage/Manifest.gz
+2008021509 metadata/md5-cache/app-portage/eix-0.34.4
+2008020239 metadata/md5-cache/app-portage/elogviewer-3.0-r2
+2008011139 metadata/md5-cache/app-portage/hackport-0.6.6
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1903190509 metadata/md5-cache/app-shells/posh-0.13.2
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
@@ -35571,7 +36204,6 @@
 2006141358 metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
 2006141358 metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
 2006141358 metadata/md5-cache/app-shells/posh-0.14
-2006141358 metadata/md5-cache/app-shells/posh-0.14.1
 2006141358 metadata/md5-cache/app-shells/quoter-3.0_p2-r1
 2006141358 metadata/md5-cache/app-shells/sash-3.8
 2006141358 metadata/md5-cache/app-shells/scsh-0.6.7-r2
@@ -35610,13 +36242,14 @@
 2007081709 metadata/md5-cache/app-shells/dash-0.5.11.1
 2007111039 metadata/md5-cache/app-shells/bash-5.0_p18
 2007110839 metadata/md5-cache/app-shells/fzy-1.0-r1
-2007250041 metadata/md5-cache/app-shells/fish-3.0.2
 2007250041 metadata/md5-cache/app-shells/fish-3.1.0
 2007250041 metadata/md5-cache/app-shells/fish-3.1.2
 2007250041 metadata/md5-cache/app-shells/fish-9999
-2007271309 metadata/md5-cache/app-shells/Manifest.gz
 2007271309 metadata/md5-cache/app-shells/bash-completion-2.11
 2007271309 metadata/md5-cache/app-shells/bash-completion-9999
+2008012239 metadata/md5-cache/app-shells/Manifest.gz
+2008012239 metadata/md5-cache/app-shells/fish-3.0.2
+2008011209 metadata/md5-cache/app-shells/posh-0.14.1
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 1910111840 metadata/md5-cache/app-text/dbacl-1.14
@@ -35813,7 +36446,6 @@
 2006141358 metadata/md5-cache/app-text/jabref-bin-4.3.1
 2006141358 metadata/md5-cache/app-text/jabref-bin-4.9999
 2006141358 metadata/md5-cache/app-text/jo-1.1
-2006141358 metadata/md5-cache/app-text/kchmviewer-7.7-r1
 2006141358 metadata/md5-cache/app-text/lcdf-typetools-2.106
 2006141358 metadata/md5-cache/app-text/lcdf-typetools-2.107
 2006141358 metadata/md5-cache/app-text/lcdf-typetools-2.108
@@ -35993,7 +36625,6 @@
 2007041046 metadata/md5-cache/app-text/pelican-9999
 2007041046 metadata/md5-cache/app-text/pinfo-99999
 2007041046 metadata/md5-cache/app-text/pytextile-3.0.3
-2007041046 metadata/md5-cache/app-text/q-text-as-data-2.0.10
 2007041046 metadata/md5-cache/app-text/recode-3.6_p20-r1
 2007041046 metadata/md5-cache/app-text/restview-2.9.2
 2007041046 metadata/md5-cache/app-text/rnc2rng-2.6.1
@@ -36016,7 +36647,6 @@
 2007041046 metadata/md5-cache/app-text/xchm-9999
 2007041046 metadata/md5-cache/app-text/xiphos-4.0.6a-r2
 2007041046 metadata/md5-cache/app-text/xlsx2csv-0.7.6
-2007041046 metadata/md5-cache/app-text/xmldiff-1.1.1
 2007041046 metadata/md5-cache/app-text/xournal-9999
 2007050309 metadata/md5-cache/app-text/zathura-0.4.3
 2007050309 metadata/md5-cache/app-text/zathura-0.4.4
@@ -36055,7 +36685,6 @@
 2007221209 metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
 2007230839 metadata/md5-cache/app-text/gocr-0.50
 2007240239 metadata/md5-cache/app-text/jabref-2.10-r4
-2007231609 metadata/md5-cache/app-text/po4a-0.47-r1
 2007231609 metadata/md5-cache/app-text/po4a-0.57
 2007231609 metadata/md5-cache/app-text/po4a-0.59.1
 2007231609 metadata/md5-cache/app-text/texlive-core-2020-r5
@@ -36081,7 +36710,6 @@
 2007250041 metadata/md5-cache/app-text/nuspell-3.1.0
 2007250041 metadata/md5-cache/app-text/nuspell-3.1.1
 2007250041 metadata/md5-cache/app-text/nuspell-3.1.2
-2007250041 metadata/md5-cache/app-text/podofo-0.9.6_p20190928
 2007250041 metadata/md5-cache/app-text/poppler-0.88.0-r1
 2007250041 metadata/md5-cache/app-text/poppler-0.89.0
 2007250041 metadata/md5-cache/app-text/poppler-0.90.0
@@ -36104,12 +36732,18 @@
 2007250041 metadata/md5-cache/app-text/xpdf-4.02-r4
 2007271709 metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
 2007272209 metadata/md5-cache/app-text/xiphos-4.2.1
-2007291739 metadata/md5-cache/app-text/sword-modules-1-r3
 2007292209 metadata/md5-cache/app-text/recode-3.7.6-r1
-2007300309 metadata/md5-cache/app-text/xmldiff-2.3
-2007311209 metadata/md5-cache/app-text/Manifest.gz
 2007311209 metadata/md5-cache/app-text/bibletime-2.11.2
 2007311109 metadata/md5-cache/app-text/calibre-4.22.0
+2008021709 metadata/md5-cache/app-text/Manifest.gz
+2008020209 metadata/md5-cache/app-text/kchmviewer-7.7-r1
+2008011139 metadata/md5-cache/app-text/pandoc-2.9.2.1
+2008011609 metadata/md5-cache/app-text/po4a-0.60
+2008011109 metadata/md5-cache/app-text/podofo-0.9.6_p20190928
+2008021509 metadata/md5-cache/app-text/q-text-as-data-2.0.10
+2007312239 metadata/md5-cache/app-text/sword-modules-2
+2008021709 metadata/md5-cache/app-text/texlive-core-2020-r6
+2008011239 metadata/md5-cache/app-text/xmldiff-2.3
 1911262256 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 1911262256 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 1911262256 metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -36684,23 +37318,18 @@
 2007041046 metadata/md5-cache/dev-ada/asis-2016-r1
 2007041046 metadata/md5-cache/dev-ada/asis-2019-r1
 2007041046 metadata/md5-cache/dev-ada/aunit-2019-r1
-2007041046 metadata/md5-cache/dev-ada/aunit-2020
 2007041046 metadata/md5-cache/dev-ada/aws-2018-r2
 2007041046 metadata/md5-cache/dev-ada/aws-2019-r1
-2007041046 metadata/md5-cache/dev-ada/aws-2020
 2007041046 metadata/md5-cache/dev-ada/gnat_util-2017-r2
 2007041046 metadata/md5-cache/dev-ada/gnat_util-2018-r2
 2007041046 metadata/md5-cache/dev-ada/gnat_util-2019-r1
 2007041046 metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
-2007041046 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
 2007041046 metadata/md5-cache/dev-ada/gnatcoll-core-2019-r1
-2007041046 metadata/md5-cache/dev-ada/gnatcoll-core-2020
 2007041046 metadata/md5-cache/dev-ada/gnatcoll-db-2019
 2007041046 metadata/md5-cache/dev-ada/gnatmem-2019-r1
 2007041046 metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
 2007041046 metadata/md5-cache/dev-ada/gprbuild-2017-r2
 2007041046 metadata/md5-cache/dev-ada/gprbuild-2019-r1
-2007041046 metadata/md5-cache/dev-ada/gprbuild-2020
 2007041046 metadata/md5-cache/dev-ada/gtkada-2017-r1
 2007041046 metadata/md5-cache/dev-ada/gtkada-2018-r2
 2007041046 metadata/md5-cache/dev-ada/gtkada-2019-r1
@@ -36711,11 +37340,16 @@
 2007041046 metadata/md5-cache/dev-ada/libadalang-2019-r1
 2007041046 metadata/md5-cache/dev-ada/libadalang-tools-2019-r1
 2007041046 metadata/md5-cache/dev-ada/libgpr-2019-r1
-2007041046 metadata/md5-cache/dev-ada/libgpr-2020
 2007041046 metadata/md5-cache/dev-ada/xmlada-2019-r1
-2007041046 metadata/md5-cache/dev-ada/xmlada-2020
-2007152209 metadata/md5-cache/dev-ada/Manifest.gz
 2007152209 metadata/md5-cache/dev-ada/gps-2019-r1
+2008020009 metadata/md5-cache/dev-ada/Manifest.gz
+2008020009 metadata/md5-cache/dev-ada/aunit-2020
+2008020009 metadata/md5-cache/dev-ada/aws-2020
+2008020009 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
+2008020009 metadata/md5-cache/dev-ada/gnatcoll-core-2020
+2008012339 metadata/md5-cache/dev-ada/gprbuild-2020
+2008020009 metadata/md5-cache/dev-ada/libgpr-2020
+2008012339 metadata/md5-cache/dev-ada/xmlada-2020
 1702282310 metadata/md5-cache/dev-cpp/metslib-0.5.3
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
 1702282310 metadata/md5-cache/dev-cpp/random123-1.09-r1
@@ -37075,11 +37709,11 @@
 2007250041 metadata/md5-cache/dev-db/tokumx-2.0.2-r2
 2007250041 metadata/md5-cache/dev-db/tora-3.2-r1
 2007250041 metadata/md5-cache/dev-db/tora-9999
-2007290739 metadata/md5-cache/dev-db/redis-5.0.9-r1
 2007290039 metadata/md5-cache/dev-db/sqlite-3.32.3
 2007292339 metadata/md5-cache/dev-db/mariadb-10.1.45-r1
-2007310009 metadata/md5-cache/dev-db/Manifest.gz
 2007310009 metadata/md5-cache/dev-db/sqlite-3.32.3-r1
+2008011209 metadata/md5-cache/dev-db/Manifest.gz
+2008011209 metadata/md5-cache/dev-db/redis-5.0.9-r1
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2006141358 metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
@@ -37801,7 +38435,6 @@
 2006141358 metadata/md5-cache/dev-haskell/doctest-0.9.12
 2006141358 metadata/md5-cache/dev-haskell/drift-2.4.2
 2006141358 metadata/md5-cache/dev-haskell/easy-file-0.2.1
-2006141358 metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
 2006141358 metadata/md5-cache/dev-haskell/edisonapi-1.3.1
 2006141358 metadata/md5-cache/dev-haskell/edisonapi-1.3.1-r1
 2006141358 metadata/md5-cache/dev-haskell/edisoncore-1.3.1.1
@@ -37857,7 +38490,6 @@
 2006141358 metadata/md5-cache/dev-haskell/extra-1.4.10
 2006141358 metadata/md5-cache/dev-haskell/extra-1.4.2
 2006141358 metadata/md5-cache/dev-haskell/extra-1.5.1
-2006141358 metadata/md5-cache/dev-haskell/fail-4.9.0.0
 2006141358 metadata/md5-cache/dev-haskell/failure-0.2.0.3
 2006141358 metadata/md5-cache/dev-haskell/fast-logger-2.4.6
 2006141358 metadata/md5-cache/dev-haskell/fast-logger-2.4.7
@@ -38023,7 +38655,6 @@
 2006141358 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.4-r1
 2006141358 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.7
 2006141358 metadata/md5-cache/dev-haskell/hdbc-sqlite3-2.3.3.1-r1
-2006141358 metadata/md5-cache/dev-haskell/hex-0.1.2
 2006141358 metadata/md5-cache/dev-haskell/hexpat-0.20.10
 2006141358 metadata/md5-cache/dev-haskell/hexpat-0.20.11
 2006141358 metadata/md5-cache/dev-haskell/hexpat-0.20.13
@@ -38118,7 +38749,6 @@
 2006141358 metadata/md5-cache/dev-haskell/http-4000.2.20
 2006141358 metadata/md5-cache/dev-haskell/http-4000.2.22
 2006141358 metadata/md5-cache/dev-haskell/http-4000.2.8
-2006141358 metadata/md5-cache/dev-haskell/http-4000.3.14
 2006141358 metadata/md5-cache/dev-haskell/http-4000.3.5
 2006141358 metadata/md5-cache/dev-haskell/http-api-data-0.3.3
 2006141358 metadata/md5-cache/dev-haskell/http-attoparsec-0.1.1-r2
@@ -38156,7 +38786,6 @@
 2006141358 metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
 2006141358 metadata/md5-cache/dev-haskell/hxt-9.3.1.15
 2006141358 metadata/md5-cache/dev-haskell/hxt-9.3.1.16
-2006141358 metadata/md5-cache/dev-haskell/hxt-9.3.1.18
 2006141358 metadata/md5-cache/dev-haskell/hxt-charproperties-9.1.1.1
 2006141358 metadata/md5-cache/dev-haskell/hxt-charproperties-9.2.0.1
 2006141358 metadata/md5-cache/dev-haskell/hxt-regex-xmlschema-9.1.0
@@ -38517,7 +39146,6 @@
 2006141358 metadata/md5-cache/dev-haskell/reflection-2.1.2
 2006141358 metadata/md5-cache/dev-haskell/reflection-2.1.4
 2006141358 metadata/md5-cache/dev-haskell/regex-applicative-0.3.3
-2006141358 metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
 2006141358 metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
 2006141358 metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
 2006141358 metadata/md5-cache/dev-haskell/regex-compat-tdfa-0.95.1.4
@@ -38636,7 +39264,6 @@
 2006141358 metadata/md5-cache/dev-haskell/statistics-0.13.3.0
 2006141358 metadata/md5-cache/dev-haskell/stm-2.4.2
 2006141358 metadata/md5-cache/dev-haskell/stm-2.4.4.1
-2006141358 metadata/md5-cache/dev-haskell/stm-2.5.0.0
 2006141358 metadata/md5-cache/dev-haskell/stm-chans-3.0.0.4
 2006141358 metadata/md5-cache/dev-haskell/stmonadtrans-0.3.3
 2006141358 metadata/md5-cache/dev-haskell/stmonadtrans-0.3.4
@@ -38988,9 +39615,312 @@
 2006141358 metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
 2006242309 metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
 2006242309 metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
-2007241509 metadata/md5-cache/dev-haskell/Manifest.gz
 2007241509 metadata/md5-cache/dev-haskell/cryptonite-0.21
 2007241509 metadata/md5-cache/dev-haskell/cryptonite-0.26-r1
+2008021609 metadata/md5-cache/dev-haskell/Manifest.gz
+2008011139 metadata/md5-cache/dev-haskell/adjunctions-4.4
+2008011139 metadata/md5-cache/dev-haskell/aeson-1.4.7.1
+2008011139 metadata/md5-cache/dev-haskell/aeson-compat-0.3.9-r2
+2008011139 metadata/md5-cache/dev-haskell/aeson-diff-1.1.0.8
+2008011139 metadata/md5-cache/dev-haskell/alex-3.2.5
+2008011139 metadata/md5-cache/dev-haskell/ansi-terminal-0.10.3
+2008011139 metadata/md5-cache/dev-haskell/async-2.2.2
+2008011139 metadata/md5-cache/dev-haskell/attoparsec-iso8601-1.0.1.0-r1
+2008011139 metadata/md5-cache/dev-haskell/authenticate-1.3.5
+2008011139 metadata/md5-cache/dev-haskell/authenticate-oauth-1.6.0.1
+2008011139 metadata/md5-cache/dev-haskell/aws-0.22-r1
+2008011139 metadata/md5-cache/dev-haskell/base-compat-0.11.1
+2008011139 metadata/md5-cache/dev-haskell/base-compat-batteries-0.11.1
+2008011139 metadata/md5-cache/dev-haskell/base-noprelude-4.13.0.0
+2008011139 metadata/md5-cache/dev-haskell/base-orphans-0.8.2
+2008011139 metadata/md5-cache/dev-haskell/base-prelude-1.3
+2008011139 metadata/md5-cache/dev-haskell/base64-bytestring-1.0.0.3
+2008011139 metadata/md5-cache/dev-haskell/bencode-0.6.1.1
+2008011139 metadata/md5-cache/dev-haskell/bifunctors-5.5.6
+2008011139 metadata/md5-cache/dev-haskell/binary-0.8.7.0
+2008011139 metadata/md5-cache/dev-haskell/blaze-builder-0.4.1.0
+2008011139 metadata/md5-cache/dev-haskell/blaze-html-0.9.1.2
+2008011139 metadata/md5-cache/dev-haskell/blaze-markup-0.8.2.4
+2008011139 metadata/md5-cache/dev-haskell/boundedchan-1.0.3.0
+2008011139 metadata/md5-cache/dev-haskell/bsb-http-chunked-0.0.0.4
+2008011139 metadata/md5-cache/dev-haskell/c2hs-0.28.6
+2008011139 metadata/md5-cache/dev-haskell/cabal-3.0.1.0
+2008011139 metadata/md5-cache/dev-haskell/cabal-install-3.0.0.0
+2008011139 metadata/md5-cache/dev-haskell/call-stack-0.1.0
+2008011139 metadata/md5-cache/dev-haskell/call-stack-0.2.0
+2008011139 metadata/md5-cache/dev-haskell/casa-client-0.0.1
+2008011139 metadata/md5-cache/dev-haskell/casa-types-0.0.1
+2008011139 metadata/md5-cache/dev-haskell/cereal-0.5.8.1
+2008011139 metadata/md5-cache/dev-haskell/charset-0.3.7.1-r1
+2008011139 metadata/md5-cache/dev-haskell/cipher-aes128-0.7.0.5-r1
+2008011139 metadata/md5-cache/dev-haskell/cmark-gfm-0.2.1
+2008011139 metadata/md5-cache/dev-haskell/comonad-5.0.6
+2008011139 metadata/md5-cache/dev-haskell/concurrent-output-1.10.11
+2008011139 metadata/md5-cache/dev-haskell/conduit-1.3.2
+2008011139 metadata/md5-cache/dev-haskell/conduit-combinators-1.3.0
+2008011139 metadata/md5-cache/dev-haskell/conduit-extra-1.3.4
+2008011139 metadata/md5-cache/dev-haskell/connection-0.3.1
+2008011139 metadata/md5-cache/dev-haskell/constraints-0.11.2
+2008011139 metadata/md5-cache/dev-haskell/contravariant-1.5.2
+2008011139 metadata/md5-cache/dev-haskell/contravariant-extras-0.3.5.1
+2008011139 metadata/md5-cache/dev-haskell/cryptohash-md5-0.11.100.1
+2008011139 metadata/md5-cache/dev-haskell/cryptohash-sha1-0.11.100.1
+2008011139 metadata/md5-cache/dev-haskell/cryptohash-sha256-0.11.101.0
+2008011139 metadata/md5-cache/dev-haskell/cryptonite-conduit-0.2.2
+2008011139 metadata/md5-cache/dev-haskell/dav-1.3.4
+2008011139 metadata/md5-cache/dev-haskell/dbus-1.2.16
+2008011139 metadata/md5-cache/dev-haskell/dec-0.0.3
+2008011139 metadata/md5-cache/dev-haskell/diff-0.4.0
+2008011139 metadata/md5-cache/dev-haskell/distributive-0.6.1
+2008011139 metadata/md5-cache/dev-haskell/dlist-0.8.0.7
+2008011139 metadata/md5-cache/dev-haskell/doclayout-0.3
+2008011139 metadata/md5-cache/dev-haskell/doctemplates-0.8.2
+2008011139 metadata/md5-cache/dev-haskell/doctest-0.16.3
+2008011139 metadata/md5-cache/dev-haskell/drbg-0.5.5
+2008011139 metadata/md5-cache/dev-haskell/echo-0.1.3
+2008011139 metadata/md5-cache/dev-haskell/ed25519-0.0.5.0
+2008011139 metadata/md5-cache/dev-haskell/edit-distance-vector-1.0.0.4
+2008011139 metadata/md5-cache/dev-haskell/either-5.0.1.1
+2008011139 metadata/md5-cache/dev-haskell/emojis-0.1
+2008011139 metadata/md5-cache/dev-haskell/entropy-0.4.1.6
+2008021409 metadata/md5-cache/dev-haskell/errorcall-eq-instance-0.3.0
+2008011139 metadata/md5-cache/dev-haskell/errors-2.3.0
+2008011139 metadata/md5-cache/dev-haskell/exceptions-0.10.4
+2008011139 metadata/md5-cache/dev-haskell/extra-1.7.4
+2008011139 metadata/md5-cache/dev-haskell/fail-4.9.0.0
+2008011139 metadata/md5-cache/dev-haskell/fast-logger-3.0.1
+2008011139 metadata/md5-cache/dev-haskell/feed-1.3.0.1
+2008011139 metadata/md5-cache/dev-haskell/fgl-5.7.0.2
+2008011139 metadata/md5-cache/dev-haskell/file-embed-0.0.11.2
+2008011139 metadata/md5-cache/dev-haskell/filelock-0.1.1.4
+2008011139 metadata/md5-cache/dev-haskell/filepath-bytestring-1.4.2.1.6
+2008011139 metadata/md5-cache/dev-haskell/foldl-1.4.7
+2008011139 metadata/md5-cache/dev-haskell/free-5.1.3
+2008011139 metadata/md5-cache/dev-haskell/fsnotify-0.3.0.1
+2008011139 metadata/md5-cache/dev-haskell/generic-deriving-1.13.1
+2008011139 metadata/md5-cache/dev-haskell/generics-sop-0.5.1.0
+2008011139 metadata/md5-cache/dev-haskell/genvalidity-0.10.0.2
+2008011139 metadata/md5-cache/dev-haskell/genvalidity-hspec-0.7.0.4
+2008011139 metadata/md5-cache/dev-haskell/genvalidity-property-0.5.0.1
+2008011139 metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.12-r1
+2008011139 metadata/md5-cache/dev-haskell/githash-0.1.3.3
+2008011139 metadata/md5-cache/dev-haskell/glob-0.9.3
+2008011139 metadata/md5-cache/dev-haskell/graphviz-2999.20.0.4
+2008011139 metadata/md5-cache/dev-haskell/hackage-security-0.5.3.0-r3
+2008011139 metadata/md5-cache/dev-haskell/haddock-2.23.1
+2008011139 metadata/md5-cache/dev-haskell/haddock-api-2.23.1
+2008011139 metadata/md5-cache/dev-haskell/haddock-library-1.8.0
+2008011139 metadata/md5-cache/dev-haskell/hakyll-4.13.4.0
+2008011139 metadata/md5-cache/dev-haskell/hans-3.0.1
+2008011139 metadata/md5-cache/dev-haskell/hashable-time-0.2.0.2-r1
+2008011139 metadata/md5-cache/dev-haskell/haskeline-0.7.5.0
+2008011139 metadata/md5-cache/dev-haskell/haskell-src-exts-1.21.1
+2008011139 metadata/md5-cache/dev-haskell/haskell-src-exts-util-0.2.5
+2008011139 metadata/md5-cache/dev-haskell/haskell-src-meta-0.8.5-r1
+2008011139 metadata/md5-cache/dev-haskell/heaps-0.3.6.1
+2008011139 metadata/md5-cache/dev-haskell/hedgehog-1.0.2-r1
+2008021539 metadata/md5-cache/dev-haskell/hex-0.1.2
+2008011139 metadata/md5-cache/dev-haskell/hi-file-parser-0.1.0.0
+2008011139 metadata/md5-cache/dev-haskell/hinotify-0.3.10
+2008011139 metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
+2008011139 metadata/md5-cache/dev-haskell/hpack-0.33.0
+2008011139 metadata/md5-cache/dev-haskell/hs-bibutils-6.8.0.0
+2008011139 metadata/md5-cache/dev-haskell/hslogger-1.3.1.0-r1
+2008011139 metadata/md5-cache/dev-haskell/hslua-1.0.3.1
+2008011139 metadata/md5-cache/dev-haskell/hslua-module-system-0.2.1
+2008011139 metadata/md5-cache/dev-haskell/hslua-module-text-0.2.1
+2008011139 metadata/md5-cache/dev-haskell/hspec-2.7.1
+2008011139 metadata/md5-cache/dev-haskell/hspec-contrib-0.5.1
+2008011139 metadata/md5-cache/dev-haskell/hspec-core-2.7.1
+2008011139 metadata/md5-cache/dev-haskell/hspec-discover-2.7.1
+2008011139 metadata/md5-cache/dev-haskell/hspec-expectations-0.8.2
+2008011139 metadata/md5-cache/dev-haskell/hspec-meta-2.6.0
+2008011139 metadata/md5-cache/dev-haskell/hsyaml-0.2.1.0
+2008011139 metadata/md5-cache/dev-haskell/hsyaml-aeson-0.2.0.0
+2008011139 metadata/md5-cache/dev-haskell/html-conduit-1.3.2.1
+2008011139 metadata/md5-cache/dev-haskell/http-4000.3.14
+2008011139 metadata/md5-cache/dev-haskell/http-api-data-0.4.1.1
+2008011139 metadata/md5-cache/dev-haskell/http-client-0.6.4.1
+2008011139 metadata/md5-cache/dev-haskell/http-client-tls-0.3.5.3
+2008011139 metadata/md5-cache/dev-haskell/http-conduit-2.3.7.3
+2008011139 metadata/md5-cache/dev-haskell/http-download-0.2.0.0
+2008011139 metadata/md5-cache/dev-haskell/http-types-0.12.3
+2008011139 metadata/md5-cache/dev-haskell/http2-2.0.3
+2008011139 metadata/md5-cache/dev-haskell/httpd-shed-0.4.1.1
+2008011139 metadata/md5-cache/dev-haskell/hunit-1.6.0.0
+2008021439 metadata/md5-cache/dev-haskell/hxt-9.3.1.18
+2008011139 metadata/md5-cache/dev-haskell/infer-license-0.2.0
+2008011139 metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3
+2008011139 metadata/md5-cache/dev-haskell/interpolate-0.2.0
+2008011139 metadata/md5-cache/dev-haskell/invariant-0.5.3
+2008011139 metadata/md5-cache/dev-haskell/ipynb-0.1
+2008011139 metadata/md5-cache/dev-haskell/iwlib-0.1.0
+2008011139 metadata/md5-cache/dev-haskell/jira-wiki-markup-1.1.4
+2008011139 metadata/md5-cache/dev-haskell/juicypixels-3.3.5
+2008011139 metadata/md5-cache/dev-haskell/kan-extensions-5.2
+2008011139 metadata/md5-cache/dev-haskell/keys-3.12.3
+2008011139 metadata/md5-cache/dev-haskell/language-c-0.8.3
+2008011139 metadata/md5-cache/dev-haskell/lens-4.19.1
+2008011139 metadata/md5-cache/dev-haskell/lens-aeson-1.1
+2008011139 metadata/md5-cache/dev-haskell/libmpd-0.9.1.0
+2008011139 metadata/md5-cache/dev-haskell/libyaml-0.1.2
+2008011139 metadata/md5-cache/dev-haskell/lifted-async-0.10.0.6
+2008011139 metadata/md5-cache/dev-haskell/linear-1.20.9
+2008021339 metadata/md5-cache/dev-haskell/listlike-4.6.3
+2008011139 metadata/md5-cache/dev-haskell/lrucache-1.2.0.1
+2008011139 metadata/md5-cache/dev-haskell/lukko-0.1.1.2
+2008011139 metadata/md5-cache/dev-haskell/megaparsec-8.0.0
+2008011139 metadata/md5-cache/dev-haskell/memotrie-0.6.10
+2008011139 metadata/md5-cache/dev-haskell/microlens-aeson-2.3.0.4
+2008011139 metadata/md5-cache/dev-haskell/microlens-mtl-0.2.0.1
+2008011139 metadata/md5-cache/dev-haskell/microlens-th-0.4.3.4
+2008011139 metadata/md5-cache/dev-haskell/mintty-0.1.2
+2008021409 metadata/md5-cache/dev-haskell/missingh-1.4.3.0
+2008011139 metadata/md5-cache/dev-haskell/mmorph-1.1.3
+2008011139 metadata/md5-cache/dev-haskell/monad-logger-0.3.32
+2008011139 metadata/md5-cache/dev-haskell/monadlib-3.10
+2008011139 metadata/md5-cache/dev-haskell/mono-traversable-1.0.15.1
+2008011139 metadata/md5-cache/dev-haskell/mtl-2.2.2
+2008011139 metadata/md5-cache/dev-haskell/mustache-2.3.1
+2008011139 metadata/md5-cache/dev-haskell/nats-1.1.2
+2008011139 metadata/md5-cache/dev-haskell/neat-interpolation-0.3.2.6
+2008011139 metadata/md5-cache/dev-haskell/netlink-1.1.1.0
+2008011139 metadata/md5-cache/dev-haskell/network-3.0.1.1
+2008011139 metadata/md5-cache/dev-haskell/network-bsd-2.8.1.0
+2008011139 metadata/md5-cache/dev-haskell/network-byte-order-0.1.4.0
+2008011139 metadata/md5-cache/dev-haskell/network-multicast-0.3.2
+2008011139 metadata/md5-cache/dev-haskell/network-uri-2.6.3.0
+2008011139 metadata/md5-cache/dev-haskell/newtype-generics-0.5.4
+2008011139 metadata/md5-cache/dev-haskell/opengl-3.0.3.0-r1
+2008011139 metadata/md5-cache/dev-haskell/openglraw-3.3.4.0
+2008011139 metadata/md5-cache/dev-haskell/optparse-applicative-0.15.1.0
+2008011139 metadata/md5-cache/dev-haskell/optparse-simple-0.1.1.2
+2008011139 metadata/md5-cache/dev-haskell/pandoc-citeproc-0.17.0.1
+2008011139 metadata/md5-cache/dev-haskell/pandoc-types-1.20
+2008011139 metadata/md5-cache/dev-haskell/pantry-0.4.0.1
+2008011139 metadata/md5-cache/dev-haskell/parallel-3.2.2.0
+2008011139 metadata/md5-cache/dev-haskell/parsec-3.1.14.0
+2008011139 metadata/md5-cache/dev-haskell/parsers-0.12.10
+2008011139 metadata/md5-cache/dev-haskell/path-0.7.0
+2008011139 metadata/md5-cache/dev-haskell/path-io-1.6.0-r1
+2008011139 metadata/md5-cache/dev-haskell/patience-0.1.1-r1
+2008011139 metadata/md5-cache/dev-haskell/persistent-2.10.5.2
+2008011139 metadata/md5-cache/dev-haskell/persistent-sqlite-2.10.6.2
+2008011139 metadata/md5-cache/dev-haskell/persistent-template-2.8.2.3
+2008011139 metadata/md5-cache/dev-haskell/persistent-test-2.0.3.0
+2008011139 metadata/md5-cache/dev-haskell/polyparse-1.13
+2008011139 metadata/md5-cache/dev-haskell/pretty-show-1.9.5
+2008011139 metadata/md5-cache/dev-haskell/prettyprinter-1.6.1
+2008011139 metadata/md5-cache/dev-haskell/prettyprinter-ansi-terminal-1.1.1.2
+2008011139 metadata/md5-cache/dev-haskell/primitive-0.7.1.0
+2008011139 metadata/md5-cache/dev-haskell/profunctors-5.5.1
+2008011139 metadata/md5-cache/dev-haskell/project-template-0.2.0.1
+2008011139 metadata/md5-cache/dev-haskell/psqueues-0.2.7.2
+2008011139 metadata/md5-cache/dev-haskell/quickcheck-2.13.2
+2008011139 metadata/md5-cache/dev-haskell/quickcheck-instances-0.3.22
+2008011139 metadata/md5-cache/dev-haskell/quickcheck-io-0.2.0
+2008011139 metadata/md5-cache/dev-haskell/rebase-1.4.1
+2008011139 metadata/md5-cache/dev-haskell/regex-applicative-text-0.1.0.1
+2008011139 metadata/md5-cache/dev-haskell/regex-base-0.94.0.0
+2008011139 metadata/md5-cache/dev-haskell/regex-compat-0.95.2.0
+2008011139 metadata/md5-cache/dev-haskell/regex-pcre-0.95.0.0
+2008011139 metadata/md5-cache/dev-haskell/regex-posix-0.96.0.0
+2008011139 metadata/md5-cache/dev-haskell/regex-tdfa-1.3.1.0
+2008011139 metadata/md5-cache/dev-haskell/rerebase-1.4.1
+2008011139 metadata/md5-cache/dev-haskell/resolv-0.1.2.0
+2008011139 metadata/md5-cache/dev-haskell/resourcet-1.2.4.2
+2008011139 metadata/md5-cache/dev-haskell/retry-0.8.1.1
+2008011139 metadata/md5-cache/dev-haskell/rio-0.1.17.0
+2008011139 metadata/md5-cache/dev-haskell/rio-orphans-0.1.1.0
+2008011139 metadata/md5-cache/dev-haskell/rio-prettyprint-0.1.0.0
+2008011139 metadata/md5-cache/dev-haskell/rsa-2.3.1
+2008011139 metadata/md5-cache/dev-haskell/sandi-0.5
+2008011139 metadata/md5-cache/dev-haskell/scientific-0.3.6.2
+2008011139 metadata/md5-cache/dev-haskell/selective-0.3
+2008011139 metadata/md5-cache/dev-haskell/semigroupoids-5.3.4
+2008011139 metadata/md5-cache/dev-haskell/semigroups-0.18.5
+2008011139 metadata/md5-cache/dev-haskell/shelly-1.9.0
+2008011139 metadata/md5-cache/dev-haskell/singleton-bool-0.1.5-r1
+2008011139 metadata/md5-cache/dev-haskell/skylighting-0.8.5
+2008011139 metadata/md5-cache/dev-haskell/skylighting-core-0.8.5
+2008011139 metadata/md5-cache/dev-haskell/socks-0.6.1
+2008011139 metadata/md5-cache/dev-haskell/sop-core-0.5.0.1
+2008011139 metadata/md5-cache/dev-haskell/split-0.2.3.4
+2008011139 metadata/md5-cache/dev-haskell/splitmix-0.0.4
+2008011139 metadata/md5-cache/dev-haskell/stack-2.3.1
+2008011139 metadata/md5-cache/dev-haskell/stack-bin-2.3.1
+2008011139 metadata/md5-cache/dev-haskell/stm-2.5.0.0
+2008011139 metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
+2008011139 metadata/md5-cache/dev-haskell/string-qq-0.0.4
+2008011139 metadata/md5-cache/dev-haskell/tagsoup-0.14.8
+2008012309 metadata/md5-cache/dev-haskell/tar-conduit-0.3.2-r1
+2008011139 metadata/md5-cache/dev-haskell/tasty-1.2.3
+2008011139 metadata/md5-cache/dev-haskell/tasty-expected-failure-0.11.1.2
+2008011139 metadata/md5-cache/dev-haskell/tasty-hedgehog-1.0.0.2
+2008011139 metadata/md5-cache/dev-haskell/tasty-hunit-0.10.0.2
+2008011139 metadata/md5-cache/dev-haskell/tasty-lua-0.2.0.1
+2008011139 metadata/md5-cache/dev-haskell/tasty-quickcheck-0.10.1.1
+2008011139 metadata/md5-cache/dev-haskell/template-haskell-compat-v0208-0.1.2.1
+2008011139 metadata/md5-cache/dev-haskell/temporary-1.3
+2008011139 metadata/md5-cache/dev-haskell/terminfo-0.4.1.4
+2008021609 metadata/md5-cache/dev-haskell/texmath-0.12.0.2
+2008011739 metadata/md5-cache/dev-haskell/text-1.2.4.0
+2008011139 metadata/md5-cache/dev-haskell/text-conversions-0.3.0
+2008011139 metadata/md5-cache/dev-haskell/text-metrics-0.3.0
+2008011139 metadata/md5-cache/dev-haskell/th-abstraction-0.3.2.0
+2008011139 metadata/md5-cache/dev-haskell/th-lift-0.8.1
+2008011139 metadata/md5-cache/dev-haskell/th-lift-instances-0.1.14
+2008011139 metadata/md5-cache/dev-haskell/time-compat-1.9.3
+2008011139 metadata/md5-cache/dev-haskell/time-manager-0.0.0
+2008011139 metadata/md5-cache/dev-haskell/tls-1.5.4
+2008011139 metadata/md5-cache/dev-haskell/tls-session-manager-0.0.4
+2008011139 metadata/md5-cache/dev-haskell/transformers-0.5.6.2
+2008011139 metadata/md5-cache/dev-haskell/transformers-base-0.4.5.2
+2008011139 metadata/md5-cache/dev-haskell/transformers-compat-0.6.5
+2008011139 metadata/md5-cache/dev-haskell/tree-diff-0.1
+2008011139 metadata/md5-cache/dev-haskell/trifecta-2.1
+2008011139 metadata/md5-cache/dev-haskell/type-equality-1
+2008011139 metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
+2008011139 metadata/md5-cache/dev-haskell/unicode-transforms-0.3.6
+2008011139 metadata/md5-cache/dev-haskell/unix-compat-0.5.2
+2008011139 metadata/md5-cache/dev-haskell/unix-time-0.4.7
+2008011139 metadata/md5-cache/dev-haskell/unliftio-0.2.12.1
+2008011139 metadata/md5-cache/dev-haskell/unliftio-core-0.1.2.0
+2008011139 metadata/md5-cache/dev-haskell/uuid-1.3.13-r1
+2008011139 metadata/md5-cache/dev-haskell/uuid-types-1.0.3-r1
+2008011139 metadata/md5-cache/dev-haskell/validity-0.9.0.3
+2008011139 metadata/md5-cache/dev-haskell/vector-0.12.1.2
+2008011139 metadata/md5-cache/dev-haskell/vector-algorithms-0.8.0.3
+2008011139 metadata/md5-cache/dev-haskell/vector-builder-0.3.8
+2008011139 metadata/md5-cache/dev-haskell/wai-3.2.2.1
+2008011139 metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.1
+2008011139 metadata/md5-cache/dev-haskell/wai-extra-3.0.29.1
+2008011139 metadata/md5-cache/dev-haskell/wai-logger-2.3.6
+2008011139 metadata/md5-cache/dev-haskell/warp-3.3.13
+2008011139 metadata/md5-cache/dev-haskell/warp-tls-3.2.12
+2008011139 metadata/md5-cache/dev-haskell/wcwidth-0.0.2
+2008011139 metadata/md5-cache/dev-haskell/weigh-0.0.16
+2008011139 metadata/md5-cache/dev-haskell/wl-pprint-annotated-0.1.0.1
+2008011139 metadata/md5-cache/dev-haskell/wl-pprint-text-1.2.0.1
+2008011139 metadata/md5-cache/dev-haskell/wreq-0.5.3.2
+2008011139 metadata/md5-cache/dev-haskell/x11-1.9.1
+2008011139 metadata/md5-cache/dev-haskell/x509-1.7.5
+2008011139 metadata/md5-cache/dev-haskell/x509-store-1.6.7
+2008011139 metadata/md5-cache/dev-haskell/x509-system-1.6.6
+2008011139 metadata/md5-cache/dev-haskell/x509-validation-1.6.11
+2008012239 metadata/md5-cache/dev-haskell/xhtml-3000.2.2.1
+2008011139 metadata/md5-cache/dev-haskell/xml-conduit-1.9.0.0
+2008011139 metadata/md5-cache/dev-haskell/xml-hamlet-0.5.0.1
+2008011139 metadata/md5-cache/dev-haskell/yaml-0.11.2.0
+2008011139 metadata/md5-cache/dev-haskell/yesod-1.6.0.2
+2008011139 metadata/md5-cache/dev-haskell/yesod-auth-1.6.9
+2008011139 metadata/md5-cache/dev-haskell/yesod-auth-hashdb-1.7.1.2
+2008011139 metadata/md5-cache/dev-haskell/yesod-core-1.6.17.2
+2008011139 metadata/md5-cache/dev-haskell/yesod-form-1.6.7
+2008011139 metadata/md5-cache/dev-haskell/yesod-persistent-1.6.0.4
+2008011139 metadata/md5-cache/dev-haskell/yesod-static-1.6.0.1
+2008011139 metadata/md5-cache/dev-haskell/yesod-test-1.6.10
+2008011139 metadata/md5-cache/dev-haskell/zip-archive-0.4.1
 1702282312 metadata/md5-cache/dev-java/java-apicheck-0_p20150907
 1901182109 metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.202
 1702282312 metadata/md5-cache/dev-java/offo-hyphenation-2.0
@@ -39725,9 +40655,10 @@
 2007250609 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.37
 2007271709 metadata/md5-cache/dev-java/openjdk-8.262_p10
 2007271709 metadata/md5-cache/dev-java/openjdk-bin-8.262_p10
-2007311239 metadata/md5-cache/dev-java/Manifest.gz
 2007311239 metadata/md5-cache/dev-java/openjdk-8.265_p01
 2007311239 metadata/md5-cache/dev-java/openjdk-bin-8.265_p01
+2008010139 metadata/md5-cache/dev-java/Manifest.gz
+2008010139 metadata/md5-cache/dev-java/openjdk-jre-bin-8.265_p01
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1702282312 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
@@ -39897,7 +40828,6 @@
 2006281209 metadata/md5-cache/dev-lang/duktape-2.5.0-r1
 2006270009 metadata/md5-cache/dev-lang/mujs-1.0.6
 2006270009 metadata/md5-cache/dev-lang/mujs-1.0.7
-2006272209 metadata/md5-cache/dev-lang/nim-1.2.4
 2006290009 metadata/md5-cache/dev-lang/logtalk-3.36.0
 2006291909 metadata/md5-cache/dev-lang/vala-0.40.23
 2006291909 metadata/md5-cache/dev-lang/vala-0.46.10
@@ -39944,10 +40874,6 @@
 2007041046 metadata/md5-cache/dev-lang/orc-0.4.28-r1
 2007041046 metadata/md5-cache/dev-lang/orc-0.4.29
 2007050309 metadata/md5-cache/dev-lang/orc-0.4.31
-2007041046 metadata/md5-cache/dev-lang/python-2.7.18
-2007041046 metadata/md5-cache/dev-lang/python-3.6.10-r2
-2007041046 metadata/md5-cache/dev-lang/python-3.7.7-r2
-2007041046 metadata/md5-cache/dev-lang/python-3.8.2-r2
 2007041046 metadata/md5-cache/dev-lang/python-3.9.0_beta3
 2007041046 metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
 2007041046 metadata/md5-cache/dev-lang/python-exec-9999
@@ -39984,7 +40910,6 @@
 2007091739 metadata/md5-cache/dev-lang/nqp-2020.06
 2007091739 metadata/md5-cache/dev-lang/rakudo-2020.06
 2007111909 metadata/md5-cache/dev-lang/erlang-23.0.2
-2007142139 metadata/md5-cache/dev-lang/python-3.8.4
 2007142139 metadata/md5-cache/dev-lang/python-3.9.0_beta4
 2007151109 metadata/md5-cache/dev-lang/perl-5.32.0
 2007152209 metadata/md5-cache/dev-lang/crystal-0.35.1
@@ -40002,7 +40927,6 @@
 2007191509 metadata/md5-cache/dev-lang/php-7.2.32
 2007191509 metadata/md5-cache/dev-lang/php-7.3.20
 2007191509 metadata/md5-cache/dev-lang/php-7.4.8-r1
-2007201009 metadata/md5-cache/dev-lang/python-3.7.8-r1
 2007191109 metadata/md5-cache/dev-lang/qu-prolog-10.4
 2007191639 metadata/md5-cache/dev-lang/tuprolog-3.0.1
 2007191639 metadata/md5-cache/dev-lang/tuprolog-3.1.0
@@ -40022,7 +40946,6 @@
 2007222309 metadata/md5-cache/dev-lang/python-3.8.4-r1
 2007231839 metadata/md5-cache/dev-lang/gnuprologjava-0.2.6-r1
 2007250041 metadata/md5-cache/dev-lang/gdl-0.9.6-r3
-2007241039 metadata/md5-cache/dev-lang/ghc-8.8.4
 2007251439 metadata/md5-cache/dev-lang/luajit-2.0.5-r2
 2007250739 metadata/md5-cache/dev-lang/mercury-20.01.2
 2007261709 metadata/md5-cache/dev-lang/mercury-extras-20.01.2
@@ -40044,15 +40967,17 @@
 2007282239 metadata/md5-cache/dev-lang/mozart-stdlib-2.0.1
 2007292009 metadata/md5-cache/dev-lang/ispc-1.13.0
 2007292009 metadata/md5-cache/dev-lang/ispc-9999
-2007311239 metadata/md5-cache/dev-lang/Manifest.gz
-2007310039 metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
-2007310039 metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
-2007310039 metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
-2007310039 metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
-2007310009 metadata/md5-cache/dev-lang/python-3.6.11-r1
-2007310009 metadata/md5-cache/dev-lang/python-3.8.3-r1
 2007311239 metadata/md5-cache/dev-lang/rust-1.45.1
 2007311239 metadata/md5-cache/dev-lang/rust-bin-1.45.1
+2008020609 metadata/md5-cache/dev-lang/Manifest.gz
+2008011139 metadata/md5-cache/dev-lang/ghc-8.8.4
+2008010009 metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
+2008010009 metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+2008010009 metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+2008010009 metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
+2008010209 metadata/md5-cache/dev-lang/nim-1.2.6
+2007312139 metadata/md5-cache/dev-lang/vala-0.46.12
+2007312139 metadata/md5-cache/dev-lang/vala-0.48.8
 1708300939 metadata/md5-cache/dev-libs/bcm2835-1.52
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
@@ -40446,7 +41371,6 @@
 2007041046 metadata/md5-cache/dev-libs/bemenu-9999
 2007041046 metadata/md5-cache/dev-libs/boehm-gc-8.0.4
 2007041046 metadata/md5-cache/dev-libs/boost-1.72.0-r1
-2007041046 metadata/md5-cache/dev-libs/boost-1.73.0
 2007041046 metadata/md5-cache/dev-libs/botan-2.14.0-r1
 2007041046 metadata/md5-cache/dev-libs/botan-2.9.0
 2007050309 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200110
@@ -40506,7 +41430,6 @@
 2007041046 metadata/md5-cache/dev-libs/json-c-0.12
 2007041046 metadata/md5-cache/dev-libs/json-c-0.13.1-r1
 2007050309 metadata/md5-cache/dev-libs/json-glib-1.4.4
-2007050309 metadata/md5-cache/dev-libs/jsoncpp-1.9.3
 2007050309 metadata/md5-cache/dev-libs/jsoncpp-1.9.3_pre20200412
 2007050309 metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
 2007041046 metadata/md5-cache/dev-libs/judy-1.0.5-r2
@@ -40521,7 +41444,6 @@
 2007041046 metadata/md5-cache/dev-libs/libbsd-0.10.0
 2007050339 metadata/md5-cache/dev-libs/libbulletml-0.0.6
 2007041046 metadata/md5-cache/dev-libs/libbytesize-2.2
-2007041046 metadata/md5-cache/dev-libs/libbytesize-2.3
 2007041046 metadata/md5-cache/dev-libs/libcdio-2.0.0-r1
 2007041046 metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
 2007041046 metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
@@ -40887,10 +41809,6 @@
 2007250041 metadata/md5-cache/dev-libs/libfmt-7.0.1
 2007250041 metadata/md5-cache/dev-libs/libfmt-9999
 2007250041 metadata/md5-cache/dev-libs/libgaminggear-0.15.1
-2007250041 metadata/md5-cache/dev-libs/libgit2-0.28.4
-2007260739 metadata/md5-cache/dev-libs/libgit2-0.28.5
-2007250041 metadata/md5-cache/dev-libs/libgit2-1.0.0-r1
-2007260739 metadata/md5-cache/dev-libs/libgit2-1.0.1
 2007250041 metadata/md5-cache/dev-libs/libgpuarray-0.6.0
 2007250041 metadata/md5-cache/dev-libs/libgpuarray-0.6.7
 2007250041 metadata/md5-cache/dev-libs/libical-3.0.8
@@ -40903,7 +41821,6 @@
 2007250041 metadata/md5-cache/dev-libs/libplatform-9999
 2007250041 metadata/md5-cache/dev-libs/libqtxdg-3.3.1
 2007250041 metadata/md5-cache/dev-libs/libqtxdg-3.4.0
-2007250041 metadata/md5-cache/dev-libs/libqtxdg-3.5.0
 2007262139 metadata/md5-cache/dev-libs/librdkafka-1.4.4
 2007262139 metadata/md5-cache/dev-libs/librdkafka-1.5.0
 2007250041 metadata/md5-cache/dev-libs/libsavitar-3.4.1
@@ -40944,7 +41861,6 @@
 2007250041 metadata/md5-cache/dev-libs/openobex-1.7.2-r2
 2007250041 metadata/md5-cache/dev-libs/pegtl-2.8.3
 2007250041 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.0
-2007250041 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.0
 2007250041 metadata/md5-cache/dev-libs/poco-1.9.0-r2
 2007250041 metadata/md5-cache/dev-libs/processor-trace-1.6.1
 2007250041 metadata/md5-cache/dev-libs/processor-trace-1.6.2
@@ -41041,9 +41957,20 @@
 2007300009 metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
 2007300009 metadata/md5-cache/dev-libs/libxslt-1.1.34
 2007301709 metadata/md5-cache/dev-libs/rocclr-3.5.0
-2007310439 metadata/md5-cache/dev-libs/Manifest.gz
 2007310439 metadata/md5-cache/dev-libs/libgusb-0.3.5
 2007310009 metadata/md5-cache/dev-libs/libinput-1.15.6
+2008021839 metadata/md5-cache/dev-libs/Manifest.gz
+2008021339 metadata/md5-cache/dev-libs/boost-1.73.0
+2008011239 metadata/md5-cache/dev-libs/jsoncpp-1.9.3
+2008021609 metadata/md5-cache/dev-libs/libbytesize-2.3
+2007311439 metadata/md5-cache/dev-libs/libbytesize-2.4
+2008021839 metadata/md5-cache/dev-libs/libdnet-1.14_pre20200717
+2008021839 metadata/md5-cache/dev-libs/libdnet-9999
+2008011209 metadata/md5-cache/dev-libs/libgit2-0.28.5
+2008011209 metadata/md5-cache/dev-libs/libgit2-1.0.1
+2007311939 metadata/md5-cache/dev-libs/libqtxdg-3.5.0
+2007311809 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
+2007312139 metadata/md5-cache/dev-libs/vala-common-0.48.8
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2006141358 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2006141358 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -41108,7 +42035,6 @@
 2006141358 metadata/md5-cache/dev-lua/lanes-3.10.0
 2006141358 metadata/md5-cache/dev-lua/lgi-0.9.0
 2006141358 metadata/md5-cache/dev-lua/lgi-0.9.0-r1
-2006141358 metadata/md5-cache/dev-lua/lgi-0.9.2
 2006141358 metadata/md5-cache/dev-lua/lpeg-1.0.1
 2006141358 metadata/md5-cache/dev-lua/lpeg-1.0.2
 2006141358 metadata/md5-cache/dev-lua/lua-argparse-0.6.0-r1
@@ -41159,12 +42085,13 @@
 2007091109 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
 2007091109 metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r5
 2007201209 metadata/md5-cache/dev-lua/mpack-1.0.4
-2007250041 metadata/md5-cache/dev-lua/Manifest.gz
 2007250041 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.6
 2007250041 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.7
 2007250041 metadata/md5-cache/dev-lua/lua-zlib-1.1
 2007250041 metadata/md5-cache/dev-lua/luv-1.32.0.0
 2007250041 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r1
+2008021509 metadata/md5-cache/dev-lua/Manifest.gz
+2008021509 metadata/md5-cache/dev-lua/lgi-0.9.2
 1704021208 metadata/md5-cache/dev-ml/async_extra-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1704021208 metadata/md5-cache/dev-ml/async_rpc_kernel-0.9.0
@@ -41442,7 +42369,6 @@
 1910170740 metadata/md5-cache/dev-perl/Cisco-IPPhone-0.50.0-r2
 1910170740 metadata/md5-cache/dev-perl/Cisco-Reconfig-0.912.0
 1910170740 metadata/md5-cache/dev-perl/Class-DBI-mysql-1.0.0-r2
-1910170740 metadata/md5-cache/dev-perl/Compress-LZF-3.800.0
 1910170740 metadata/md5-cache/dev-perl/Config-Crontab-1.450.0
 1910170740 metadata/md5-cache/dev-perl/Config-General-2.630.0
 1910170740 metadata/md5-cache/dev-perl/Convert-Binary-C-0.780.0-r1
@@ -41619,7 +42545,6 @@
 1912110241 metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
 1912110241 metadata/md5-cache/dev-perl/CPAN-DistnameInfo-0.120.0-r2
 1912110241 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
-1912110241 metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
 1912110241 metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
 1912110241 metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.250.0
 1912110241 metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
@@ -41636,9 +42561,7 @@
 1912110241 metadata/md5-cache/dev-perl/Config-Grammar-1.120.0
 1912110241 metadata/md5-cache/dev-perl/Config-INI-0.25.0
 1912110241 metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
-1912110241 metadata/md5-cache/dev-perl/Config-MVP-2.200.10
 1912110241 metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.463
-1912110241 metadata/md5-cache/dev-perl/Context-Preserve-0.20.0
 1912110241 metadata/md5-cache/dev-perl/Contextual-Return-0.4.14
 1912110241 metadata/md5-cache/dev-perl/Convert-Color-0.110.0
 1912110241 metadata/md5-cache/dev-perl/Crypt-CipherSaber-1.10.0-r1
@@ -42477,7 +43400,6 @@
 2005031809 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromBuild-0.170.880
 2005031809 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease-0.6.0
 2005031809 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-GithubMeta-0.580.0
-2005032039 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0
 2005032039 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-ModuleBuildTiny-0.15.0
 2005031809 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-NameFromDirectory-0.40.0
 2005032039 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Prereqs-FromCPANfile-0.80.0
@@ -42725,8 +43647,6 @@
 2006290109 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0
 2006290109 metadata/md5-cache/dev-perl/Color-Library-0.21.0-r1
 2006290109 metadata/md5-cache/dev-perl/Config-ApacheFormat-1.200.0-r1
-2006290109 metadata/md5-cache/dev-perl/Config-Auto-0.440.0
-2006290109 metadata/md5-cache/dev-perl/Config-JSON-1.520.200
 2006290109 metadata/md5-cache/dev-perl/Config-Properties-1.800.0
 2006290109 metadata/md5-cache/dev-perl/Config-Simple-4.590.0-r1
 2006290109 metadata/md5-cache/dev-perl/Config-Tiny-2.230.0
@@ -43533,8 +44453,18 @@
 2007310909 metadata/md5-cache/dev-perl/Digest-Perl-MD5-1.900.0-r1
 2007310909 metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r2
 2007311139 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
-2007311209 metadata/md5-cache/dev-perl/Manifest.gz
 2007311209 metadata/md5-cache/dev-perl/Software-License-0.103.14
+2007311309 metadata/md5-cache/dev-perl/Dist-Zilla-6.15.0
+2007311409 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Config-Git-0.920.0-r1
+2007311509 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease-0.7.0
+2008010139 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Git-2.46.0
+2008011339 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-LicenseFromModule-0.70.0
+2008011439 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome-0.480.0
+2008011539 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-Meta-Contributors-0.3.0-r1
+2008011839 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OSPrereqs-0.11.0
+2008011939 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-OurPkgVersion-0.210.0
+2008011939 metadata/md5-cache/dev-perl/Manifest.gz
+2008010139 metadata/md5-cache/dev-perl/Types-Path-Tiny-0.6.0
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -43931,7 +44861,6 @@
 2004211009 metadata/md5-cache/dev-python/python-docs-2.7.17
 2004211009 metadata/md5-cache/dev-python/python-docs-3.6.10
 2005091439 metadata/md5-cache/dev-python/nltk-data-20200312-r1
-2006141358 metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
 2007041046 metadata/md5-cache/dev-python/3to2-1.1.1-r1
 2007041046 metadata/md5-cache/dev-python/APScheduler-3.6.3
 2007041046 metadata/md5-cache/dev-python/Babel-2.8.0-r1
@@ -43941,11 +44870,6 @@
 2007041046 metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
 2007041046 metadata/md5-cache/dev-python/PyECLib-1.6.0
 2007041046 metadata/md5-cache/dev-python/PyPDF2-1.26.0
-2007041046 metadata/md5-cache/dev-python/PyQt5-5.14.2
-2007041046 metadata/md5-cache/dev-python/PyQt5-5.15.0
-2007041046 metadata/md5-cache/dev-python/PyQt5-sip-4.19.22
-2007041046 metadata/md5-cache/dev-python/PyQt5-sip-4.19.23
-2007041046 metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
 2007041046 metadata/md5-cache/dev-python/PySensors-0.0.4
 2007041046 metadata/md5-cache/dev-python/PySocks-1.7.1
 2007041046 metadata/md5-cache/dev-python/PyUtilib-5.7.2
@@ -43965,10 +44889,8 @@
 2007041046 metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
 2007041046 metadata/md5-cache/dev-python/aiorpcX-0.18.4
 2007041046 metadata/md5-cache/dev-python/aiosmtpd-1.2
-2007041046 metadata/md5-cache/dev-python/alabaster-0.7.12
 2007041046 metadata/md5-cache/dev-python/alembic-1.4.2
 2007041046 metadata/md5-cache/dev-python/algopy-0.5.3
-2007041046 metadata/md5-cache/dev-python/amodem-1.15.0
 2007041046 metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
 2007041046 metadata/md5-cache/dev-python/ansicolor-9999
 2007041046 metadata/md5-cache/dev-python/ansimarkup-1.4.0
@@ -43990,8 +44912,6 @@
 2007041046 metadata/md5-cache/dev-python/authheaders-0.13.0
 2007041046 metadata/md5-cache/dev-python/authres-1.2.0
 2007041046 metadata/md5-cache/dev-python/automaton-1.12.1
-2007041046 metadata/md5-cache/dev-python/autopep8-1.4.4
-2007041046 metadata/md5-cache/dev-python/autopep8-9999
 2007041046 metadata/md5-cache/dev-python/awesome-slugify-1.6.5
 2007041046 metadata/md5-cache/dev-python/awscli-1.18.70
 2007041046 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
@@ -44001,13 +44921,9 @@
 2007041046 metadata/md5-cache/dev-python/backports-csv-1.0.7
 2007041046 metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1
 2007041839 metadata/md5-cache/dev-python/backports-lzma-0.0.13
-2007041046 metadata/md5-cache/dev-python/backports-os-0.1.1
 2007041046 metadata/md5-cache/dev-python/backports-tempfile-1.0
-2007041046 metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
-2007041046 metadata/md5-cache/dev-python/backports-weakref-1.0_p1
 2007041046 metadata/md5-cache/dev-python/bandit-1.5.1-r1
 2007041046 metadata/md5-cache/dev-python/bandit-1.6.2
-2007041046 metadata/md5-cache/dev-python/bareos-19.2.7
 2007041046 metadata/md5-cache/dev-python/bashate-0.6.0
 2007041046 metadata/md5-cache/dev-python/basho-erlastic-2.1.1
 2007041046 metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
@@ -44030,13 +44946,11 @@
 2007041046 metadata/md5-cache/dev-python/bpython-0.19
 2007041046 metadata/md5-cache/dev-python/brython-3.7.3
 2007041046 metadata/md5-cache/dev-python/brython-3.7.4
-2007041046 metadata/md5-cache/dev-python/bsddb3-6.2.7
 2007041046 metadata/md5-cache/dev-python/cached-property-1.5.1
 2007041046 metadata/md5-cache/dev-python/cachelib-0.1
 2007041046 metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
 2007041046 metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
 2007041046 metadata/md5-cache/dev-python/cairocffi-1.1.0
-2007041046 metadata/md5-cache/dev-python/cangjie-1.3
 2007041046 metadata/md5-cache/dev-python/capturer-2.4
 2007041046 metadata/md5-cache/dev-python/carbon-1.1.5
 2007041046 metadata/md5-cache/dev-python/case-1.5.3
@@ -44050,7 +44964,6 @@
 2007041046 metadata/md5-cache/dev-python/cgroup-utils-0.8
 2007041046 metadata/md5-cache/dev-python/chai-1.1.2
 2007041046 metadata/md5-cache/dev-python/chainmap-1.0.3
-2007041046 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
 2007041046 metadata/md5-cache/dev-python/chardet-3.0.4
 2007041046 metadata/md5-cache/dev-python/cheetah-2.4.4-r1
 2007041046 metadata/md5-cache/dev-python/cheetah3-3.2.4
@@ -44102,7 +45015,6 @@
 2007041046 metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
 2007041046 metadata/md5-cache/dev-python/cursive-0.2.2
 2007041046 metadata/md5-cache/dev-python/curtsies-0.3.0-r2
-2007041046 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
 2007041046 metadata/md5-cache/dev-python/cx_Freeze-6.1
 2007041046 metadata/md5-cache/dev-python/cycler-0.10.0
 2007041046 metadata/md5-cache/dev-python/cycler-0.10.0-r1
@@ -44116,8 +45028,6 @@
 2007041046 metadata/md5-cache/dev-python/debtcollector-1.21.0
 2007041046 metadata/md5-cache/dev-python/decorator-4.4.2
 2007041046 metadata/md5-cache/dev-python/defcon-0.6.0-r1
-2007041046 metadata/md5-cache/dev-python/defusedxml-0.6.0
-2007041046 metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
 2007041046 metadata/md5-cache/dev-python/deprecation-2.0.7
 2007041046 metadata/md5-cache/dev-python/diff-cover-2.3.0
 2007041046 metadata/md5-cache/dev-python/diff-match-patch-20181111
@@ -44136,7 +45046,6 @@
 2007041046 metadata/md5-cache/dev-python/django-mptt-0.11.0
 2007041046 metadata/md5-cache/dev-python/django-pglocks-1.0.4
 2007041046 metadata/md5-cache/dev-python/django-prometheus-2.0.0
-2007041046 metadata/md5-cache/dev-python/django-redis-4.10.0
 2007041046 metadata/md5-cache/dev-python/django-rq-2.3.0
 2007041046 metadata/md5-cache/dev-python/django-sortedm2m-2.0.0
 2007041046 metadata/md5-cache/dev-python/django-tables2-2.2.1
@@ -44154,7 +45063,6 @@
 2007041046 metadata/md5-cache/dev-python/docker-py-4.2.2
 2007041046 metadata/md5-cache/dev-python/docker-pycreds-0.4.0
 2007041046 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
-2007041046 metadata/md5-cache/dev-python/docopt-0.6.2-r3
 2007041046 metadata/md5-cache/dev-python/docutils-glep-1.2
 2007041046 metadata/md5-cache/dev-python/docutils-glep-9999
 2007041046 metadata/md5-cache/dev-python/dogpile-core-0.4.1
@@ -44172,7 +45080,6 @@
 2007041046 metadata/md5-cache/dev-python/elementtree-1.2.6-r3
 2007041046 metadata/md5-cache/dev-python/emcee-2.2.1
 2007041046 metadata/md5-cache/dev-python/emoji-0.5.4
-2007041046 metadata/md5-cache/dev-python/empy-3.3.3
 2007041046 metadata/md5-cache/dev-python/enum34-1.1.6-r1
 2007041046 metadata/md5-cache/dev-python/enzyme-0.4.1-r2
 2007041046 metadata/md5-cache/dev-python/enzyme-9999
@@ -44192,7 +45099,6 @@
 2007041046 metadata/md5-cache/dev-python/feedparser-5.2.1
 2007041046 metadata/md5-cache/dev-python/feedparser-6.0.0_beta1
 2007041046 metadata/md5-cache/dev-python/fido2-0.7.3
-2007041046 metadata/md5-cache/dev-python/fields-5.0.0-r2
 2007041046 metadata/md5-cache/dev-python/filetype-1.0.5
 2007041046 metadata/md5-cache/dev-python/fitsio-0.9.11
 2007041046 metadata/md5-cache/dev-python/fixtures-3.0.0
@@ -44218,7 +45124,6 @@
 2007041046 metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
 2007041046 metadata/md5-cache/dev-python/flask-script-2.0.6
 2007041046 metadata/md5-cache/dev-python/flask-security-3.0.0
-2007041046 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
 2007041046 metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
 2007041046 metadata/md5-cache/dev-python/fleep-1.0.1
 2007041046 metadata/md5-cache/dev-python/fleep-9999
@@ -44239,7 +45144,6 @@
 2007041046 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2007041046 metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
 2007041046 metadata/md5-cache/dev-python/functools32-3.2.3
-2007041046 metadata/md5-cache/dev-python/funcy-1.10.1
 2007041046 metadata/md5-cache/dev-python/fuse-python-1.0.0
 2007041046 metadata/md5-cache/dev-python/fusepy-3.0.1
 2007041046 metadata/md5-cache/dev-python/future-0.18.2
@@ -44251,9 +45155,7 @@
 2007041046 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
 2007041046 metadata/md5-cache/dev-python/genson-1.1.0
 2007041046 metadata/md5-cache/dev-python/genty-1.3.2
-2007041046 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
 2007041046 metadata/md5-cache/dev-python/gevent-1.4.0
-2007041046 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
 2007041046 metadata/md5-cache/dev-python/girder-client-2.3.0
 2007041046 metadata/md5-cache/dev-python/git-review-1.28.0
 2007041046 metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -44279,15 +45181,12 @@
 2007041046 metadata/md5-cache/dev-python/grpcio-testing-1.28.1
 2007041046 metadata/md5-cache/dev-python/grpcio-tools-1.28.1
 2007041046 metadata/md5-cache/dev-python/gsd-1.5.3-r1
-2007041046 metadata/md5-cache/dev-python/gst-python-1.14.1-r1
-2007050309 metadata/md5-cache/dev-python/gst-python-1.16.2
 2007041046 metadata/md5-cache/dev-python/guessit-3.1.1
 2007041046 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
 2007041046 metadata/md5-cache/dev-python/h11-0.9.0
 2007041046 metadata/md5-cache/dev-python/h5py-2.10.0-r1
 2007041046 metadata/md5-cache/dev-python/hacking-2.0.0
 2007041046 metadata/md5-cache/dev-python/helpdev-0.6.10
-2007041046 metadata/md5-cache/dev-python/hgdistver-0.25
 2007041046 metadata/md5-cache/dev-python/hiredis-1.0.1
 2007041046 metadata/md5-cache/dev-python/hpack-3.0.0
 2007041046 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
@@ -44308,7 +45207,6 @@
 2007041046 metadata/md5-cache/dev-python/ifaddr-0.1.6
 2007041046 metadata/md5-cache/dev-python/ijson-2.5.1
 2007041046 metadata/md5-cache/dev-python/imageio-2.6.1
-2007041046 metadata/md5-cache/dev-python/imagesize-1.1.0
 2007041046 metadata/md5-cache/dev-python/imapclient-2.1.0
 2007041046 metadata/md5-cache/dev-python/iminuit-1.3.8
 2007041046 metadata/md5-cache/dev-python/immutables-0.11
@@ -44344,7 +45242,6 @@
 2007041046 metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
 2007041046 metadata/md5-cache/dev-python/jaraco-packaging-6.2-r1
 2007041046 metadata/md5-cache/dev-python/jaraco-packaging-8.1.0
-2007041046 metadata/md5-cache/dev-python/jedi-0.14.1
 2007041046 metadata/md5-cache/dev-python/jedi-0.15.2
 2007041046 metadata/md5-cache/dev-python/jellyfish-0.8.2
 2007041046 metadata/md5-cache/dev-python/jikanpy-3.4.2
@@ -44354,13 +45251,11 @@
 2007041046 metadata/md5-cache/dev-python/joblib-0.14.1
 2007041046 metadata/md5-cache/dev-python/joblib-0.15.1
 2007041046 metadata/md5-cache/dev-python/joblib-0.16.0
-2007041046 metadata/md5-cache/dev-python/josepy-1.3.0
 2007041046 metadata/md5-cache/dev-python/jplephem-2.6
 2007041046 metadata/md5-cache/dev-python/jsmin-2.2.2
 2007041046 metadata/md5-cache/dev-python/json-rpc-1.13.0
 2007041046 metadata/md5-cache/dev-python/jsonext-0.4.2
 2007041046 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
-2007041046 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
 2007041046 metadata/md5-cache/dev-python/jsonref-0.1
 2007041046 metadata/md5-cache/dev-python/jsonrpclib-9999
 2007041046 metadata/md5-cache/dev-python/jsonxs-0.6
@@ -44399,7 +45294,6 @@
 2007041046 metadata/md5-cache/dev-python/lmfit-1.0.1
 2007041046 metadata/md5-cache/dev-python/locket-0.2.0
 2007041046 metadata/md5-cache/dev-python/locket-0.2.0-r1
-2007041046 metadata/md5-cache/dev-python/lockfile-0.12.2-r2
 2007041046 metadata/md5-cache/dev-python/logbook-1.5.3
 2007041046 metadata/md5-cache/dev-python/logfury-0.1.2-r1
 2007041046 metadata/md5-cache/dev-python/loguru-0.5.1
@@ -44420,8 +45314,6 @@
 2007041046 metadata/md5-cache/dev-python/markups-3.0.0
 2007041046 metadata/md5-cache/dev-python/markupsafe-1.1.1
 2007041046 metadata/md5-cache/dev-python/marshmallow-3.5.1
-2007041046 metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
-2007041046 metadata/md5-cache/dev-python/matplotlib-2.2.4
 2007041046 metadata/md5-cache/dev-python/matterhook-0.1-r1
 2007041046 metadata/md5-cache/dev-python/mccabe-0.6.1-r1
 2007041046 metadata/md5-cache/dev-python/mdx_gh_links-0.2
@@ -44454,7 +45346,6 @@
 2007041046 metadata/md5-cache/dev-python/mox-0.5.3-r1
 2007041046 metadata/md5-cache/dev-python/mox3-0.24.0
 2007041046 metadata/md5-cache/dev-python/mpi4py-3.0.2
-2007041046 metadata/md5-cache/dev-python/mpmath-1.1.0
 2007041046 metadata/md5-cache/dev-python/multidict-4.5.2
 2007041046 metadata/md5-cache/dev-python/munkres-1.1.2
 2007041046 metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -44465,7 +45356,6 @@
 2007041046 metadata/md5-cache/dev-python/mysql-python-1.2.5-r3
 2007041046 metadata/md5-cache/dev-python/nagiosplugin-1.3.2-r1
 2007041046 metadata/md5-cache/dev-python/namespace-jaraco-2
-2007041046 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
 2007041046 metadata/md5-cache/dev-python/namespace-zope-1
 2007041046 metadata/md5-cache/dev-python/natgrid-0.2.1-r3
 2007041046 metadata/md5-cache/dev-python/natsort-7.0.1
@@ -44491,14 +45381,12 @@
 2007041046 metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
 2007041046 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
 2007041046 metadata/md5-cache/dev-python/nose-parameterized-0.5.0
-2007041046 metadata/md5-cache/dev-python/nose-show-skipped-0.1
 2007041046 metadata/md5-cache/dev-python/nose2-0.9.1-r1
 2007041046 metadata/md5-cache/dev-python/nose_fixes-1.3
 2007041046 metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r3
 2007041046 metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
 2007041046 metadata/md5-cache/dev-python/notebook-5.0.0
 2007041046 metadata/md5-cache/dev-python/notify-python-0.1.1-r3
-2007041046 metadata/md5-cache/dev-python/notify2-0.3.1-r1
 2007041046 metadata/md5-cache/dev-python/nototools-0_pre20200207
 2007041046 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2007041046 metadata/md5-cache/dev-python/ntplib-0.3.3
@@ -44557,7 +45445,6 @@
 2007041046 metadata/md5-cache/dev-python/ovs-2.13.0
 2007041046 metadata/md5-cache/dev-python/ovsdbapp-0.17.2
 2007041046 metadata/md5-cache/dev-python/ovsdbapp-1.1.0
-2007041046 metadata/md5-cache/dev-python/owslib-0.17.1-r1
 2007041046 metadata/md5-cache/dev-python/pafy-0.5.5
 2007041046 metadata/md5-cache/dev-python/pafy-9999
 2007041046 metadata/md5-cache/dev-python/paho-mqtt-1.5.0
@@ -44579,13 +45466,10 @@
 2007041046 metadata/md5-cache/dev-python/pcapy-0.11.2
 2007041046 metadata/md5-cache/dev-python/pdfrw-0.4
 2007041046 metadata/md5-cache/dev-python/pecan-1.3.3-r2
-2007041046 metadata/md5-cache/dev-python/peewee-3.1.0
 2007041046 metadata/md5-cache/dev-python/pelican-minify-0.9
-2007041046 metadata/md5-cache/dev-python/pep8-1.7.1
 2007041046 metadata/md5-cache/dev-python/pew-1.1.1
 2007041046 metadata/md5-cache/dev-python/pexpect-4.6.0
 2007041046 metadata/md5-cache/dev-python/pgspecial-1.11.9
-2007041046 metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
 2007041046 metadata/md5-cache/dev-python/pickleshare-0.7.5
 2007041046 metadata/md5-cache/dev-python/pid-2.2.5
 2007041046 metadata/md5-cache/dev-python/piexif-1.1.3
@@ -44602,20 +45486,16 @@
 2007041046 metadata/md5-cache/dev-python/ply-3.11
 2007041046 metadata/md5-cache/dev-python/plyr-1.0.6
 2007041046 metadata/md5-cache/dev-python/plyvel-1.2.0
-2007041046 metadata/md5-cache/dev-python/pmw-1.3.3-r3
 2007041046 metadata/md5-cache/dev-python/pmw-2.0.1-r2
 2007041046 metadata/md5-cache/dev-python/pocketlint-0.20
 2007041046 metadata/md5-cache/dev-python/pockets-0.5.1
 2007041046 metadata/md5-cache/dev-python/pockets-0.9.1
 2007041046 metadata/md5-cache/dev-python/podcastparser-0.6.4
-2007041046 metadata/md5-cache/dev-python/polib-1.1.0-r1
 2007041046 metadata/md5-cache/dev-python/polygon-3.0.7
 2007041046 metadata/md5-cache/dev-python/poyo-0.5.0
 2007041046 metadata/md5-cache/dev-python/precis-i18n-1.0.1
 2007041046 metadata/md5-cache/dev-python/pretend-1.0.9
-2007041046 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
 2007041046 metadata/md5-cache/dev-python/priority-1.3.0
-2007041046 metadata/md5-cache/dev-python/process-tests-2.0.2
 2007041046 metadata/md5-cache/dev-python/progress-1.3
 2007041046 metadata/md5-cache/dev-python/progressbar-2.5
 2007041046 metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -44649,7 +45529,6 @@
 2007041046 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
 2007041046 metadata/md5-cache/dev-python/pyamg-3.2.1-r1
 2007041046 metadata/md5-cache/dev-python/pyasn1-0.4.8
-2007041046 metadata/md5-cache/dev-python/pyatspi-2.36.0
 2007041046 metadata/md5-cache/dev-python/pyaudio-0.2.11
 2007041046 metadata/md5-cache/dev-python/pyaudio-0.2.11-r1
 2007041046 metadata/md5-cache/dev-python/pybind11-2.4.3
@@ -44659,13 +45538,11 @@
 2007041046 metadata/md5-cache/dev-python/pycairo-1.18.2
 2007041046 metadata/md5-cache/dev-python/pycapnp-0.6.4
 2007041046 metadata/md5-cache/dev-python/pycdio-2.1.0
-2007041046 metadata/md5-cache/dev-python/pychm-0.8.6
 2007041046 metadata/md5-cache/dev-python/pychromecast-4.1.0
 2007041046 metadata/md5-cache/dev-python/pychroot-0.10.1
 2007041046 metadata/md5-cache/dev-python/pychroot-9999
 2007041046 metadata/md5-cache/dev-python/pyclipper-1.1.0
 2007041046 metadata/md5-cache/dev-python/pyclipper-1.1.0_p3-r1
-2007041046 metadata/md5-cache/dev-python/pycodestyle-2.5.0-r1
 2007041046 metadata/md5-cache/dev-python/pycollada-0.7.1
 2007041046 metadata/md5-cache/dev-python/pycountry-19.8.18
 2007041046 metadata/md5-cache/dev-python/pycparser-2.20
@@ -44677,18 +45554,14 @@
 2007041046 metadata/md5-cache/dev-python/pycxx-7.1.2-r2
 2007041046 metadata/md5-cache/dev-python/pydecomp-0.3
 2007041046 metadata/md5-cache/dev-python/pydecomp-9999
-2007041046 metadata/md5-cache/dev-python/pydiff-0.2-r1
 2007041046 metadata/md5-cache/dev-python/pydispatcher-2.1.2
 2007041046 metadata/md5-cache/dev-python/pydns-3.2.1
-2007041046 metadata/md5-cache/dev-python/pydocstyle-5.0.2
 2007041046 metadata/md5-cache/dev-python/pydot-1.4.1
 2007041046 metadata/md5-cache/dev-python/pydotplus-2.0.2
 2007041046 metadata/md5-cache/dev-python/pyds9-1.8.1
-2007041046 metadata/md5-cache/dev-python/pyenchant-2.0.0
 2007041046 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
 2007041046 metadata/md5-cache/dev-python/pyflakes-2.1.1
 2007041046 metadata/md5-cache/dev-python/pyflann-1.9.1
-2007041046 metadata/md5-cache/dev-python/pyfltk-1.3.3
 2007041046 metadata/md5-cache/dev-python/pyformance-0.4-r1
 2007041046 metadata/md5-cache/dev-python/pygal-2.4.0-r1
 2007041046 metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
@@ -44700,7 +45573,6 @@
 2007041046 metadata/md5-cache/dev-python/pygments-2.5.2
 2007041046 metadata/md5-cache/dev-python/pygments-2.6.1
 2007041046 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
-2007041046 metadata/md5-cache/dev-python/pygpgme-0.3-r2
 2007041046 metadata/md5-cache/dev-python/pygpu-0.6.7
 2007041046 metadata/md5-cache/dev-python/pygsl-2.1.1
 2007041046 metadata/md5-cache/dev-python/pygtk-2.24.0-r5
@@ -44713,7 +45585,6 @@
 2007041046 metadata/md5-cache/dev-python/pykka-2.0.2
 2007041046 metadata/md5-cache/dev-python/pykwalify-9999
 2007041046 metadata/md5-cache/dev-python/pylama-7.7.1
-2007041046 metadata/md5-cache/dev-python/pylast-1.9.0
 2007041046 metadata/md5-cache/dev-python/pylast-3.2.1
 2007041046 metadata/md5-cache/dev-python/pylibacl-0.5.3
 2007041046 metadata/md5-cache/dev-python/pylibacl-0.5.4_p20191217
@@ -44729,7 +45600,6 @@
 2007041046 metadata/md5-cache/dev-python/pymountboot-0.2.2
 2007041046 metadata/md5-cache/dev-python/pymountboot-9999
 2007041046 metadata/md5-cache/dev-python/pympler-0.6
-2007041046 metadata/md5-cache/dev-python/pymssql-2.1.3
 2007041046 metadata/md5-cache/dev-python/pymysql-0.9.3
 2007041046 metadata/md5-cache/dev-python/pynacl-1.2.1
 2007041046 metadata/md5-cache/dev-python/pynacl-1.3.0
@@ -44742,7 +45612,6 @@
 2007041046 metadata/md5-cache/dev-python/pyopencl-2019.1.2
 2007041046 metadata/md5-cache/dev-python/pyopengl-3.1.0
 2007041046 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0-r1
-2007041046 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
 2007041046 metadata/md5-cache/dev-python/pyopenssl-19.1.0
 2007041046 metadata/md5-cache/dev-python/pyotherside-1.5.9
 2007041239 metadata/md5-cache/dev-python/pyotp-2.3.0
@@ -44752,7 +45621,6 @@
 2007041046 metadata/md5-cache/dev-python/pypax-9999
 2007041046 metadata/md5-cache/dev-python/pypcap-1.2.3
 2007041046 metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
-2007041046 metadata/md5-cache/dev-python/pyperclip-1.5.27
 2007041046 metadata/md5-cache/dev-python/pyperclip-1.7.0
 2007041046 metadata/md5-cache/dev-python/pyphen-0.9.5
 2007041046 metadata/md5-cache/dev-python/pypowervm-1.1.20
@@ -44760,11 +45628,9 @@
 2007041239 metadata/md5-cache/dev-python/pyproj-2.4.2-r1
 2007041046 metadata/md5-cache/dev-python/pypugjs-5.9.4-r1
 2007041046 metadata/md5-cache/dev-python/pypy-7.3.0
-2007041046 metadata/md5-cache/dev-python/pypy-7.3.1-r1
 2007041046 metadata/md5-cache/dev-python/pypy-exe-7.3.0
 2007041046 metadata/md5-cache/dev-python/pypy-exe-7.3.1
 2007041046 metadata/md5-cache/dev-python/pypy3-7.3.0
-2007041046 metadata/md5-cache/dev-python/pypy3-7.3.1-r1
 2007041046 metadata/md5-cache/dev-python/pypy3-exe-7.3.0
 2007041046 metadata/md5-cache/dev-python/pypy3-exe-7.3.1
 2007041046 metadata/md5-cache/dev-python/pyqt-distutils-0.3.0
@@ -44777,7 +45643,6 @@
 2007041046 metadata/md5-cache/dev-python/pyrsistent-0.15.6
 2007041046 metadata/md5-cache/dev-python/pysaml2-4.6.5-r1
 2007041046 metadata/md5-cache/dev-python/pyscard-1.9.9
-2007041046 metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
 2007041046 metadata/md5-cache/dev-python/pyserial-3.4
 2007041046 metadata/md5-cache/dev-python/pysmi-0.3.4
 2007041046 metadata/md5-cache/dev-python/pysnmp-4.4.12-r1
@@ -44792,11 +45657,6 @@
 2007041046 metadata/md5-cache/dev-python/pysvn-1.9.11
 2007041046 metadata/md5-cache/dev-python/pytables-3.4.4
 2007041046 metadata/md5-cache/dev-python/pyte-0.8.0-r1
-2007041046 metadata/md5-cache/dev-python/pytest-3.10.1
-2007041046 metadata/md5-cache/dev-python/pytest-4.5.0
-2007041046 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
-2007041046 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
-2007041046 metadata/md5-cache/dev-python/pytest-cov-2.8.1
 2007041046 metadata/md5-cache/dev-python/pytest-describe-1.0.0
 2007041046 metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0-r1
 2007041046 metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -44807,7 +45667,6 @@
 2007041046 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
 2007041046 metadata/md5-cache/dev-python/pytest-mock-1.11.2
 2007041046 metadata/md5-cache/dev-python/pytest-mock-2.0.0
-2007041046 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
 2007041046 metadata/md5-cache/dev-python/pytest-pylint-0.14.1
 2007041046 metadata/md5-cache/dev-python/pytest-qt-3.3.0
 2007041046 metadata/md5-cache/dev-python/pytest-salt-2020.1.27
@@ -44834,26 +45693,19 @@
 2007041046 metadata/md5-cache/dev-python/python-debian-0.1.36
 2007041046 metadata/md5-cache/dev-python/python-designateclient-4.0.0
 2007041046 metadata/md5-cache/dev-python/python-discid-1.2.0
-2007041046 metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1
-2007041046 metadata/md5-cache/dev-python/python-distutils-extra-2.45
 2007041046 metadata/md5-cache/dev-python/python-dotenv-0.13.0
-2007041046 metadata/md5-cache/dev-python/python-editor-1.0.4
 2007041046 metadata/md5-cache/dev-python/python-efl-1.23.0
 2007041046 metadata/md5-cache/dev-python/python-engineio-3.12.1
 2007041046 metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
 2007041046 metadata/md5-cache/dev-python/python-ethtool-0.14
 2007041046 metadata/md5-cache/dev-python/python-evdev-1.3.0
 2007041046 metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
-2007041046 metadata/md5-cache/dev-python/python-gammu-2.11
-2007041046 metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
 2007041046 metadata/md5-cache/dev-python/python-glanceclient-2.16.0
 2007041046 metadata/md5-cache/dev-python/python-glanceclient-2.17.1
 2007041046 metadata/md5-cache/dev-python/python-heatclient-1.17.0
 2007041046 metadata/md5-cache/dev-python/python-iptables-0.13.0
 2007041046 metadata/md5-cache/dev-python/python-ironicclient-4.1.0
 2007041046 metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.4
-2007041046 metadata/md5-cache/dev-python/python-ldap-3.2.0
-2007041046 metadata/md5-cache/dev-python/python-ldap-9999
 2007041046 metadata/md5-cache/dev-python/python-levenshtein-0.12.0
 2007041046 metadata/md5-cache/dev-python/python-lhafile-0.2.2
 2007041046 metadata/md5-cache/dev-python/python-libevdev-0.8
@@ -44879,7 +45731,6 @@
 2007041046 metadata/md5-cache/dev-python/python-saharaclient-2.2.1
 2007041046 metadata/md5-cache/dev-python/python-senlinclient-1.2.0
 2007041046 metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r1
-2007041046 metadata/md5-cache/dev-python/python-slip-0.6.5
 2007041046 metadata/md5-cache/dev-python/python-slugify-1.2.6
 2007041046 metadata/md5-cache/dev-python/python-slugify-4.0.1
 2007041046 metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
@@ -44891,7 +45742,6 @@
 2007041046 metadata/md5-cache/dev-python/python-utils-2.3.0
 2007041046 metadata/md5-cache/dev-python/python-varlink-30.3.0
 2007041046 metadata/md5-cache/dev-python/python-vitrageclient-4.0.1
-2007041046 metadata/md5-cache/dev-python/python-xlib-0.27
 2007041046 metadata/md5-cache/dev-python/python-xmlsec-1.3.8
 2007041046 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
 2007041046 metadata/md5-cache/dev-python/python-zaqarclient-1.13.1
@@ -44901,13 +45751,11 @@
 2007041046 metadata/md5-cache/dev-python/python3-saml-1.9.0
 2007041046 metadata/md5-cache/dev-python/pythonutils-0.4.0-r1
 2007041046 metadata/md5-cache/dev-python/pythonz-bd-1.11.4
-2007041046 metadata/md5-cache/dev-python/pytoml-0.1.20
 2007041046 metadata/md5-cache/dev-python/pytools-2020.1
 2007041046 metadata/md5-cache/dev-python/pyu2f-0.1.4-r1
 2007041046 metadata/md5-cache/dev-python/pyudev-0.22.0
 2007041046 metadata/md5-cache/dev-python/pyusb-1.0.2
 2007041046 metadata/md5-cache/dev-python/pyvorbis-1.4-r4
-2007041046 metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
 2007041046 metadata/md5-cache/dev-python/pywinrm-0.4.1
 2007041046 metadata/md5-cache/dev-python/pyx-0.15
 2007041046 metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
@@ -44918,17 +45766,13 @@
 2007041046 metadata/md5-cache/dev-python/pyzbar-0.1.8
 2007041046 metadata/md5-cache/dev-python/pyzmq-19.0.0
 2007041046 metadata/md5-cache/dev-python/qrcode-6.1
-2007041046 metadata/md5-cache/dev-python/qscintilla-python-2.11.4
-2007041046 metadata/md5-cache/dev-python/qscintilla-python-2.11.5
 2007041046 metadata/md5-cache/dev-python/qtawesome-0.7.2
-2007041046 metadata/md5-cache/dev-python/qtconsole-4.3.1
 2007041046 metadata/md5-cache/dev-python/quex-0.65.4
 2007041046 metadata/md5-cache/dev-python/radon-4.1.0
 2007041046 metadata/md5-cache/dev-python/raet-0.6.8-r1
 2007041046 metadata/md5-cache/dev-python/random2-1.0.1-r1
 2007041046 metadata/md5-cache/dev-python/rarfile-3.0
 2007041046 metadata/md5-cache/dev-python/ratelimit-1.4.1
-2007041046 metadata/md5-cache/dev-python/rebulk-2.0.1
 2007041046 metadata/md5-cache/dev-python/recommonmark-0.6.0
 2007041046 metadata/md5-cache/dev-python/redis-py-3.3.11
 2007041046 metadata/md5-cache/dev-python/redlock-py-1.0.8
@@ -44936,7 +45780,6 @@
 2007041046 metadata/md5-cache/dev-python/reflink-0.2.1-r1
 2007041046 metadata/md5-cache/dev-python/regex-2020.2.20
 2007041046 metadata/md5-cache/dev-python/rencode-1.0.5-r1
-2007041046 metadata/md5-cache/dev-python/reno-2.7.0
 2007041046 metadata/md5-cache/dev-python/reportlab-3.5.42
 2007041046 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
 2007041046 metadata/md5-cache/dev-python/requests-cache-0.4.12
@@ -44951,10 +45794,6 @@
 2007041046 metadata/md5-cache/dev-python/responses-0.10.15
 2007041046 metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
 2007041046 metadata/md5-cache/dev-python/retrying-1.3.3
-2007041046 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
-2007041046 metadata/md5-cache/dev-python/rfc3986-1.2.0
-2007041046 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
-2007041046 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
 2007041046 metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
 2007041046 metadata/md5-cache/dev-python/robotframework-3.0.4
 2007041046 metadata/md5-cache/dev-python/roman-3.2
@@ -44973,7 +45812,6 @@
 2007041046 metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
 2007041046 metadata/md5-cache/dev-python/rtslib-fb-2.1.69
 2007041046 metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r1
-2007041046 metadata/md5-cache/dev-python/ryu-4.26-r1
 2007041046 metadata/md5-cache/dev-python/s3fs-0.1.5
 2007041046 metadata/md5-cache/dev-python/s3transfer-0.3.1
 2007041046 metadata/md5-cache/dev-python/s3transfer-0.3.3
@@ -45005,10 +45843,7 @@
 2007041046 metadata/md5-cache/dev-python/simplesoapy-9999
 2007041046 metadata/md5-cache/dev-python/simplespectral-1.0.0
 2007041046 metadata/md5-cache/dev-python/simplespectral-9999
-2007041046 metadata/md5-cache/dev-python/simpy-3.0.13
 2007041046 metadata/md5-cache/dev-python/singledispatch-3.4.0.3
-2007041046 metadata/md5-cache/dev-python/sip-4.19.22
-2007041046 metadata/md5-cache/dev-python/sip-4.19.23
 2007041046 metadata/md5-cache/dev-python/six-1.14.0
 2007041046 metadata/md5-cache/dev-python/slackclient-2.5.0
 2007041046 metadata/md5-cache/dev-python/sleekxmpp-1.3.1-r1
@@ -45020,23 +45855,19 @@
 2007041046 metadata/md5-cache/dev-python/snakeoil-9999
 2007041046 metadata/md5-cache/dev-python/snaketrace-0.1.1
 2007041046 metadata/md5-cache/dev-python/snapshottest-0.5.1
-2007041046 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
 2007041046 metadata/md5-cache/dev-python/socketio-client-0.7.2
 2007041046 metadata/md5-cache/dev-python/socketio-client-nexus-0.7.6
 2007041046 metadata/md5-cache/dev-python/sortedcollections-0.5.3
 2007041046 metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
 2007041046 metadata/md5-cache/dev-python/speaklater-1.3-r1
 2007041046 metadata/md5-cache/dev-python/speg-0.3
-2007041046 metadata/md5-cache/dev-python/sphinx-2.0.1-r1
 2007041046 metadata/md5-cache/dev-python/sphinx-2.4.4
 2007041046 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
-2007041046 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
 2007041046 metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
 2007041046 metadata/md5-cache/dev-python/sphinx-gallery-0.3.1-r1
 2007041046 metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
 2007041046 metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
 2007041046 metadata/md5-cache/dev-python/sphinx-prompt-1.2.0
-2007041046 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
 2007041046 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
 2007041046 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
 2007041046 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
@@ -45069,7 +45900,6 @@
 2007041046 metadata/md5-cache/dev-python/spyder-terminal-0.3.2
 2007041046 metadata/md5-cache/dev-python/spyder-unittest-0.4.1
 2007041046 metadata/md5-cache/dev-python/spyder-vim-0_pre20200514
-2007041046 metadata/md5-cache/dev-python/sqlalchemy-1.3.11
 2007041046 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
 2007041046 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
 2007041046 metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
@@ -45084,10 +45914,8 @@
 2007041046 metadata/md5-cache/dev-python/statsmodels-9999
 2007041046 metadata/md5-cache/dev-python/stestr-2.1.0-r1
 2007041046 metadata/md5-cache/dev-python/stevedore-2.0.1
-2007041046 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
 2007041046 metadata/md5-cache/dev-python/stripe-2.46.0
 2007041046 metadata/md5-cache/dev-python/subprocess32-3.5.4
-2007041046 metadata/md5-cache/dev-python/subvertpy-0.10.1
 2007041046 metadata/md5-cache/dev-python/suds-0.6-r1
 2007041046 metadata/md5-cache/dev-python/svg-path-3.0
 2007041046 metadata/md5-cache/dev-python/svgwrite-1.4
@@ -45102,7 +45930,6 @@
 2007041046 metadata/md5-cache/dev-python/taskflow-4.1.0
 2007041046 metadata/md5-cache/dev-python/tblib-1.6.0
 2007041046 metadata/md5-cache/dev-python/tempita-0.5.3-r2
-2007041046 metadata/md5-cache/dev-python/tenacity-6.1.0
 2007041046 metadata/md5-cache/dev-python/terminado-0.8.3
 2007041046 metadata/md5-cache/dev-python/test_server-0.0.31
 2007041046 metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -45117,7 +45944,6 @@
 2007041046 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
 2007041046 metadata/md5-cache/dev-python/thrift-0.11.0
 2007041046 metadata/md5-cache/dev-python/tikzplotlib-0.9.1
-2007041046 metadata/md5-cache/dev-python/tinycss-0.4
 2007041046 metadata/md5-cache/dev-python/tinycss2-1.0.2
 2007041046 metadata/md5-cache/dev-python/tinyrpc-1.0.1
 2007041046 metadata/md5-cache/dev-python/tld-0.12.2
@@ -45146,7 +45972,6 @@
 2007041046 metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
 2007041046 metadata/md5-cache/dev-python/ubelt-0.8.8
 2007041046 metadata/md5-cache/dev-python/uncertainties-3.1.4
-2007041046 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
 2007041046 metadata/md5-cache/dev-python/unidecode-0.04.21
 2007041046 metadata/md5-cache/dev-python/unidecode-1.1.1
 2007041046 metadata/md5-cache/dev-python/unittest2-1.1.0
@@ -45154,10 +45979,8 @@
 2007041046 metadata/md5-cache/dev-python/urlgrabber-3.10.1-r1
 2007041046 metadata/md5-cache/dev-python/urllib3-1.24.2
 2007041046 metadata/md5-cache/dev-python/urllib3-1.25.8
-2007041046 metadata/md5-cache/dev-python/urwid-2.1.0
 2007041046 metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1
 2007041046 metadata/md5-cache/dev-python/utidylib-0.6
-2007041046 metadata/md5-cache/dev-python/vcversioner-2.16.0.0
 2007041046 metadata/md5-cache/dev-python/vdf-3.3
 2007041046 metadata/md5-cache/dev-python/vdirsyncer-0.16.8
 2007041046 metadata/md5-cache/dev-python/verboselogs-1.7
@@ -45168,14 +45991,12 @@
 2007041046 metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4-r1
 2007041046 metadata/md5-cache/dev-python/visitor-0.1.3
 2007041046 metadata/md5-cache/dev-python/vobject-0.9.6.1-r1
-2007041046 metadata/md5-cache/dev-python/voluptuous-0.11.5
 2007041046 metadata/md5-cache/dev-python/vpython-7.4.6
 2007041046 metadata/md5-cache/dev-python/warlock-1.3.3
 2007041046 metadata/md5-cache/dev-python/watchdog-0.10.3
 2007041046 metadata/md5-cache/dev-python/watchdog-0.8.3-r2
 2007041046 metadata/md5-cache/dev-python/weasyprint-51
 2007041046 metadata/md5-cache/dev-python/webassets-2.0
-2007041046 metadata/md5-cache/dev-python/webcolors-1.10
 2007041046 metadata/md5-cache/dev-python/webcolors-1.11.1
 2007041046 metadata/md5-cache/dev-python/websocket-client-0.57.0
 2007041046 metadata/md5-cache/dev-python/websockets-8.1
@@ -45188,7 +46009,6 @@
 2007041046 metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
 2007041046 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
 2007041046 metadata/md5-cache/dev-python/ws4py-9999
-2007041046 metadata/md5-cache/dev-python/wsproto-0.15.0
 2007041046 metadata/md5-cache/dev-python/wurlitzer-2.0.0
 2007041046 metadata/md5-cache/dev-python/www-authenticate-0.9.2
 2007041046 metadata/md5-cache/dev-python/wxpython-3.0.2.0
@@ -45197,7 +46017,6 @@
 2007041046 metadata/md5-cache/dev-python/xarray-0.12.1
 2007041046 metadata/md5-cache/dev-python/xcffib-0.9.0
 2007041046 metadata/md5-cache/dev-python/xdoctest-0.11.0
-2007041046 metadata/md5-cache/dev-python/xlrd-1.2.0
 2007041046 metadata/md5-cache/dev-python/xlsxwriter-1.2.9
 2007041046 metadata/md5-cache/dev-python/xlutils-2.0.0-r1
 2007041046 metadata/md5-cache/dev-python/xlwt-1.3.0
@@ -45217,15 +46036,9 @@
 2007041046 metadata/md5-cache/dev-python/zipp-1.0.0
 2007041046 metadata/md5-cache/dev-python/zipp-2.0.1
 2007041046 metadata/md5-cache/dev-python/zipp-3.1.0
-2007041046 metadata/md5-cache/dev-python/zope-component-4.4.1
-2007041046 metadata/md5-cache/dev-python/zope-configuration-4.3.1
 2007041046 metadata/md5-cache/dev-python/zope-deprecation-4.4.0
 2007041046 metadata/md5-cache/dev-python/zope-event-4.4
-2007041046 metadata/md5-cache/dev-python/zope-exceptions-4.3
-2007041046 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
 2007041046 metadata/md5-cache/dev-python/zope-interface-4.7.1
-2007041046 metadata/md5-cache/dev-python/zope-schema-4.9.3
-2007041046 metadata/md5-cache/dev-python/zope-testrunner-5.1
 2007041046 metadata/md5-cache/dev-python/zstandard-0.12.0
 2007041046 metadata/md5-cache/dev-python/zstandard-0.13.0
 2007041046 metadata/md5-cache/dev-python/zstandard-0.8.1
@@ -45242,7 +46055,6 @@
 2007061739 metadata/md5-cache/dev-python/s3fs-0.4.2
 2007070939 metadata/md5-cache/dev-python/sphinx-3.1.2
 2007061739 metadata/md5-cache/dev-python/statsmodels-0.11.1
-2007061509 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
 2007081609 metadata/md5-cache/dev-python/GitPython-3.1.3
 2007081609 metadata/md5-cache/dev-python/PyContracts-1.8.14
 2007081609 metadata/md5-cache/dev-python/PyGithub-1.51
@@ -45285,7 +46097,6 @@
 2007090839 metadata/md5-cache/dev-python/flask-restful-0.3.8
 2007090839 metadata/md5-cache/dev-python/flask-wtf-0.14.3
 2007071839 metadata/md5-cache/dev-python/fsspec-0.7.4
-2007091209 metadata/md5-cache/dev-python/funcy-1.14
 2007091209 metadata/md5-cache/dev-python/gast-0.3.3
 2007091309 metadata/md5-cache/dev-python/genshi-0.7.3-r1
 2007091309 metadata/md5-cache/dev-python/gevent-20.6.2
@@ -45302,14 +46113,12 @@
 2007091539 metadata/md5-cache/dev-python/mako-1.1.3
 2007091539 metadata/md5-cache/dev-python/minidb-2.0.4
 2007091609 metadata/md5-cache/dev-python/nbsphinx-0.4.1
-2007091609 metadata/md5-cache/dev-python/nose-1.3.7-r5
 2007091209 metadata/md5-cache/dev-python/nose-random-1.0.0
 2007091609 metadata/md5-cache/dev-python/packaging-20.4
 2007091209 metadata/md5-cache/dev-python/parameterized-0.7.4
 2007091639 metadata/md5-cache/dev-python/path-py-14.0.1
 2007091639 metadata/md5-cache/dev-python/pbr-5.4.5
 2007091209 metadata/md5-cache/dev-python/pillow-7.1.2
-2007091209 metadata/md5-cache/dev-python/pipfile-0.0.2
 2007091639 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8
 2007090839 metadata/md5-cache/dev-python/pycodestyle-2.6.0
 2007091709 metadata/md5-cache/dev-python/pyelftools-0.26
@@ -45319,7 +46128,6 @@
 2007091709 metadata/md5-cache/dev-python/pyparsing-2.4.7
 2007092039 metadata/md5-cache/dev-python/pyparted-3.11.6
 2007091709 metadata/md5-cache/dev-python/pyro-4.80
-2007081139 metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1
 2007080039 metadata/md5-cache/dev-python/python-docs-2.7.18
 2007080039 metadata/md5-cache/dev-python/python-docs-3.6.11
 2007080039 metadata/md5-cache/dev-python/python-docs-3.7.8
@@ -45333,7 +46141,6 @@
 2007091209 metadata/md5-cache/dev-python/wand-0.6.2
 2007091209 metadata/md5-cache/dev-python/watchdog-0.10.2
 2007091209 metadata/md5-cache/dev-python/xlsxwriter-1.2.8
-2007120609 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
 2007111509 metadata/md5-cache/dev-python/blosc-1.9.1-r1
 2007120509 metadata/md5-cache/dev-python/breathe-4.14.1
 2007120239 metadata/md5-cache/dev-python/coverage-4.5.4
@@ -45346,15 +46153,11 @@
 2007120109 metadata/md5-cache/dev-python/hypothesis-4.57.1
 2007120109 metadata/md5-cache/dev-python/hypothesis-5.19.0
 2007120609 metadata/md5-cache/dev-python/importlib_metadata-1.7.0-r1
-2007120139 metadata/md5-cache/dev-python/jsonschema-3.2.0
 2007111009 metadata/md5-cache/dev-python/lxml-4.5.2
-2007120139 metadata/md5-cache/dev-python/monotonic-1.5-r1
 2007111809 metadata/md5-cache/dev-python/pikepdf-1.17.0
 2007120139 metadata/md5-cache/dev-python/pluggy-0.13.1
 2007120139 metadata/md5-cache/dev-python/pycryptodome-3.9.7
 2007120609 metadata/md5-cache/dev-python/pyfakefs-4.0.2
-2007110609 metadata/md5-cache/dev-python/pygraphviz-1.5
-2007120609 metadata/md5-cache/dev-python/pytest-4.6.11
 2007120109 metadata/md5-cache/dev-python/pytest-5.4.3
 2007111009 metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
 2007111009 metadata/md5-cache/dev-python/pytest-django-3.9.0
@@ -45364,7 +46167,6 @@
 2007120209 metadata/md5-cache/dev-python/pytest-xdist-1.33.0
 2007111109 metadata/md5-cache/dev-python/python-augeas-1.1.0
 2007111139 metadata/md5-cache/dev-python/python-gnupg-0.4.6
-2007111139 metadata/md5-cache/dev-python/python-magic-0.4.18
 2007111139 metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r1
 2007111139 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
 2007111139 metadata/md5-cache/dev-python/pytz-2020.1
@@ -45389,7 +46191,6 @@
 2007111239 metadata/md5-cache/dev-python/toml-0.10.1
 2007111239 metadata/md5-cache/dev-python/typing-3.7.4.2
 2007111239 metadata/md5-cache/dev-python/tzlocal-2.1
-2007111309 metadata/md5-cache/dev-python/u-msgpack-2.6.0
 2007120239 metadata/md5-cache/dev-python/unittest-mixins-1.6
 2007111309 metadata/md5-cache/dev-python/vdf-3.2-r1
 2007111839 metadata/md5-cache/dev-python/wrapt-1.12.1
@@ -45406,13 +46207,11 @@
 2007122339 metadata/md5-cache/dev-python/setuptools-49.2.0
 2007131039 metadata/md5-cache/dev-python/texttable-1.6.2-r1
 2007140309 metadata/md5-cache/dev-python/boto-2.49.0-r2
-2007140239 metadata/md5-cache/dev-python/cheroot-8.3.0
 2007132009 metadata/md5-cache/dev-python/entrypoints-0.3-r1
 2007132009 metadata/md5-cache/dev-python/flake8-3.8.1
 2007132139 metadata/md5-cache/dev-python/gevent-20.6.0
 2007132139 metadata/md5-cache/dev-python/http-parser-0.9.0
 2007140239 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
-2007140239 metadata/md5-cache/dev-python/jaraco-text-3.2.0
 2007140239 metadata/md5-cache/dev-python/namespace-repoze-1
 2007140239 metadata/md5-cache/dev-python/objgraph-3.4.1
 2007132009 metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -45438,7 +46237,6 @@
 2007141909 metadata/md5-cache/dev-python/passlib-1.7.2
 2007141939 metadata/md5-cache/dev-python/pyftpdlib-1.5.6
 2007142009 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
-2007141939 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
 2007141909 metadata/md5-cache/dev-python/towncrier-19.2.0
 2007150809 metadata/md5-cache/dev-python/tox-3.17.0
 2007141509 metadata/md5-cache/dev-python/typing-3.7.4.3
@@ -45472,36 +46270,24 @@
 2007152339 metadata/md5-cache/dev-python/httpbin-0.7.0
 2007160739 metadata/md5-cache/dev-python/httplib2-0.18.1
 2007152339 metadata/md5-cache/dev-python/itsdangerous-1.1.0
-2007152209 metadata/md5-cache/dev-python/lit-11.0.0.9999
-2007152209 metadata/md5-cache/dev-python/lit-12.0.0.9999
-2007152209 metadata/md5-cache/dev-python/lit-9.0.1
 2007152209 metadata/md5-cache/dev-python/llvmlite-0.32.1
 2007152209 metadata/md5-cache/dev-python/llvmlite-0.33.0
 2007152339 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
 2007170509 metadata/md5-cache/dev-python/dogpile-cache-0.9.1
 2007170439 metadata/md5-cache/dev-python/geventhttpclient-1.4.4
-2007170739 metadata/md5-cache/dev-python/helpdev-0.7.1
 2007170739 metadata/md5-cache/dev-python/jedi-0.17.1-r1
 2007170739 metadata/md5-cache/dev-python/libsass-0.20.0
 2007162209 metadata/md5-cache/dev-python/m2crypto-0.36.0
 2007161609 metadata/md5-cache/dev-python/multidict-4.7.6
-2007170509 metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
 2007170509 metadata/md5-cache/dev-python/os-service-types-1.7.0
 2007161609 metadata/md5-cache/dev-python/pathspec-0.8.0
-2007170739 metadata/md5-cache/dev-python/pep8-1.7.1-r1
 2007162209 metadata/md5-cache/dev-python/psutil-5.7.2
 2007170309 metadata/md5-cache/dev-python/pycairo-1.19.1
-2007170739 metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
 2007170439 metadata/md5-cache/dev-python/pyre2-1.0.7
 2007170609 metadata/md5-cache/dev-python/pyrsistent-0.16.0
-2007170739 metadata/md5-cache/dev-python/pytest-cache-1.0-r3
-2007170739 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
-2007170909 metadata/md5-cache/dev-python/pytest-timeout-1.4.2
 2007170439 metadata/md5-cache/dev-python/python-fastimport-0.9.8
-2007170739 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
 2007170739 metadata/md5-cache/dev-python/qtsass-0.3.0
 2007170639 metadata/md5-cache/dev-python/regex-2020.4.4
-2007170509 metadata/md5-cache/dev-python/reno-2.11.3
 2007170509 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
 2007170739 metadata/md5-cache/dev-python/rope-0.17.0
 2007162239 metadata/md5-cache/dev-python/selenium-3.141.0-r1
@@ -45509,13 +46295,11 @@
 2007162109 metadata/md5-cache/dev-python/six-1.15.0
 2007170739 metadata/md5-cache/dev-python/spyder-4.1.4
 2007170739 metadata/md5-cache/dev-python/spyder-kernels-1.9.2
-2007170609 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
 2007170509 metadata/md5-cache/dev-python/stevedore-3.1.0
 2007170509 metadata/md5-cache/dev-python/subunit-1.4.0
 2007170909 metadata/md5-cache/dev-python/tox-3.17.1
 2007170739 metadata/md5-cache/dev-python/ujson-1.35-r1
 2007161609 metadata/md5-cache/dev-python/vcrpy-4.0.2
-2007162309 metadata/md5-cache/dev-python/wstools-0.4.8
 2007170739 metadata/md5-cache/dev-python/wurlitzer-2.0.1
 2007161609 metadata/md5-cache/dev-python/yarl-1.4.2
 2007171109 metadata/md5-cache/dev-python/arpeggio-1.9.2
@@ -45537,7 +46321,6 @@
 2007172339 metadata/md5-cache/dev-python/css-parser-1.0.4-r1
 2007180509 metadata/md5-cache/dev-python/flatbuffers-1.12
 2007190139 metadata/md5-cache/dev-python/keystoneauth-4.0.1
-2007181809 metadata/md5-cache/dev-python/lit-10.0.0
 2007171409 metadata/md5-cache/dev-python/lxml-4.5.1
 2007190139 metadata/md5-cache/dev-python/openstacksdk-0.46.0
 2007190139 metadata/md5-cache/dev-python/osc-lib-2.0.0
@@ -45584,7 +46367,6 @@
 2007191409 metadata/md5-cache/dev-python/quantities-0.12.4
 2007191709 metadata/md5-cache/dev-python/rsa-4.2
 2007192139 metadata/md5-cache/dev-python/stevedore-3.2.0
-2007191709 metadata/md5-cache/dev-python/sure-1.4.11
 2007192139 metadata/md5-cache/dev-python/tempora-4.0.0
 2007201209 metadata/md5-cache/dev-python/aiohttp-socks-0.5.2
 2007202039 metadata/md5-cache/dev-python/argon2-cffi-20.1.0
@@ -45618,7 +46400,6 @@
 2007212239 metadata/md5-cache/dev-python/clang-python-10.0.1
 2007211609 metadata/md5-cache/dev-python/cryptography-3.0
 2007212309 metadata/md5-cache/dev-python/libvirt-python-6.5.0
-2007212239 metadata/md5-cache/dev-python/lit-10.0.1
 2007220139 metadata/md5-cache/dev-python/parso-0.7.0
 2007212039 metadata/md5-cache/dev-python/pyfakefs-3.7.2
 2007211609 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
@@ -45631,7 +46412,6 @@
 2007230439 metadata/md5-cache/dev-python/pyclipper-1.2.0
 2007231839 metadata/md5-cache/dev-python/ament_package-0.9.2
 2007231839 metadata/md5-cache/dev-python/catkin_pkg-0.4.22
-2007240239 metadata/md5-cache/dev-python/cheroot-8.4.0
 2007231309 metadata/md5-cache/dev-python/django-sortedm2m-3.0.1
 2007232139 metadata/md5-cache/dev-python/django-sortedm2m-3.0.2
 2007231309 metadata/md5-cache/dev-python/hypothesis-5.20.3
@@ -45654,7 +46434,6 @@
 2007262109 metadata/md5-cache/dev-python/boto3-1.14.28-r1
 2007241739 metadata/md5-cache/dev-python/botocore-1.17.27
 2007262109 metadata/md5-cache/dev-python/botocore-1.17.28-r1
-2007270909 metadata/md5-cache/dev-python/cheroot-8.4.1
 2007251109 metadata/md5-cache/dev-python/coverage-5.2.1
 2007251138 metadata/md5-cache/dev-python/distlib-0.3.1
 2007251109 metadata/md5-cache/dev-python/graphviz-0.13
@@ -45676,13 +46455,10 @@
 2007251138 metadata/md5-cache/dev-python/paste-3.4.3
 2007251138 metadata/md5-cache/dev-python/pastedeploy-2.1.0
 2007270909 metadata/md5-cache/dev-python/phonenumbers-8.12.7
-2007241739 metadata/md5-cache/dev-python/process-tests-2.1.1
 2007260139 metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
 2007250041 metadata/md5-cache/dev-python/pybind11-2.5.0
 2007251138 metadata/md5-cache/dev-python/pyblake2-1.1.2
 2007260409 metadata/md5-cache/dev-python/pygame-1.9.6-r1
-2007250041 metadata/md5-cache/dev-python/pyilmbase-2.5.2
-2007270539 metadata/md5-cache/dev-python/pyopengl-3.1.5
 2007261939 metadata/md5-cache/dev-python/pypam-0.5.0-r5
 2007251138 metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
 2007251138 metadata/md5-cache/dev-python/pypiserver-1.3.2
@@ -45727,12 +46503,10 @@
 2007280609 metadata/md5-cache/dev-python/cheroot-8.4.2
 2007272339 metadata/md5-cache/dev-python/docutils-0.16
 2007271309 metadata/md5-cache/dev-python/html5lib-1.0.1-r2
-2007271309 metadata/md5-cache/dev-python/html5lib-1.1
 2007272339 metadata/md5-cache/dev-python/jinja-2.11.2
 2007280009 metadata/md5-cache/dev-python/jupyter-1.0.0-r2
 2007271309 metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
 2007280609 metadata/md5-cache/dev-python/path-py-15.0.0
-2007272339 metadata/md5-cache/dev-python/paver-1.3.4-r1
 2007271639 metadata/md5-cache/dev-python/pipenv-2020.6.2
 2007272339 metadata/md5-cache/dev-python/psycopg-2.7.7
 2007272339 metadata/md5-cache/dev-python/psycopg-2.8.4
@@ -45744,39 +46518,28 @@
 2007271539 metadata/md5-cache/dev-python/rospkg-9999
 2007271309 metadata/md5-cache/dev-python/rst-linker-1.11
 2007272339 metadata/md5-cache/dev-python/sarge-0.1.5
-2007271309 metadata/md5-cache/dev-python/sphinx-1.7.5-r2
 2007271309 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
-2007271309 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
 2007271839 metadata/md5-cache/dev-python/tubes-0.2.0-r1
 2007271309 metadata/md5-cache/dev-python/webencodings-0.5.1-r1
 2007272339 metadata/md5-cache/dev-python/werkzeug-1.0.1
 2007281609 metadata/md5-cache/dev-python/flask-security-3.4.4
 2007281609 metadata/md5-cache/dev-python/hypothesis-5.23.3
 2007282039 metadata/md5-cache/dev-python/jaraco-classes-3.1.0
-2007282039 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
 2007282039 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
-2007282039 metadata/md5-cache/dev-python/jeepney-0.4.3
-2007282039 metadata/md5-cache/dev-python/keyring-21.2.1
-2007282039 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2007282039 metadata/md5-cache/dev-python/portend-2.6
-2007282039 metadata/md5-cache/dev-python/pyproject2setuppy-7
 2007281909 metadata/md5-cache/dev-python/pytest-forked-1.2.0
 2007281609 metadata/md5-cache/dev-python/pytest-forked-1.3.0
 2007282239 metadata/md5-cache/dev-python/python-language-server-0.31.10
 2007282239 metadata/md5-cache/dev-python/python-language-server-0.32.0
 2007282239 metadata/md5-cache/dev-python/python-language-server-0.34.1
-2007282039 metadata/md5-cache/dev-python/secretstorage-3.1.2
 2007282039 metadata/md5-cache/dev-python/tempora-3.0.0
-2007282039 metadata/md5-cache/dev-python/testpath-0.4.4-r1
 2007281609 metadata/md5-cache/dev-python/tox-3.18.1
 2007291439 metadata/md5-cache/dev-python/PyICU-2.4.3
 2007291439 metadata/md5-cache/dev-python/PyICU-2.5
 2007291339 metadata/md5-cache/dev-python/clang-python-11.0.0_rc1
-2007291339 metadata/md5-cache/dev-python/lit-11.0.0_rc1
 2007282339 metadata/md5-cache/dev-python/ordered-set-4.0.1
 2007291109 metadata/md5-cache/dev-python/pandas-1.1.0
 2007291109 metadata/md5-cache/dev-python/pip-20.2
-2007290809 metadata/md5-cache/dev-python/pyatspi-2.34.0
 2007290809 metadata/md5-cache/dev-python/pygobject-3.34.0
 2007291439 metadata/md5-cache/dev-python/pyopencl-2020.2
 2007291809 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
@@ -45785,15 +46548,12 @@
 2007291109 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.2.0
 2007291539 metadata/md5-cache/dev-python/vcstools-0.1.42
 2007292039 metadata/md5-cache/dev-python/certifi-9999
-2007300739 metadata/md5-cache/dev-python/cheroot-8.3.0-r1
 2007292039 metadata/md5-cache/dev-python/cliff-3.3.0
 2007292039 metadata/md5-cache/dev-python/elementpath-1.4.6
 2007292039 metadata/md5-cache/dev-python/jmespath-0.10.0
 2007292039 metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
 2007300309 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
 2007300309 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
-2007292139 metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
-2007300739 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
 2007300709 metadata/md5-cache/dev-python/sortedcontainers-2.2.2
 2007292039 metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.1.2
 2007300439 metadata/md5-cache/dev-python/tqdm-4.47.0
@@ -45817,8 +46577,6 @@
 2007300909 metadata/md5-cache/dev-python/terminaltables-3.1.0
 2007300909 metadata/md5-cache/dev-python/terminaltables-9999
 2007300939 metadata/md5-cache/dev-python/xlsxwriter-1.3.0
-2007311009 metadata/md5-cache/dev-python/Manifest.gz
-2007310809 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
 2007310039 metadata/md5-cache/dev-python/PyRSS2Gen-1.1
 2007310709 metadata/md5-cache/dev-python/alagitpull-0.0.23
 2007302309 metadata/md5-cache/dev-python/asgiref-3.2.10
@@ -45836,12 +46594,10 @@
 2007302309 metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.3
 2007302309 metadata/md5-cache/dev-python/humanize-2.4.1
 2007310209 metadata/md5-cache/dev-python/hypothesis-5.16.0
-2007310309 metadata/md5-cache/dev-python/hypothesis-5.16.3
 2007302309 metadata/md5-cache/dev-python/icalendar-4.0.6
 2007302309 metadata/md5-cache/dev-python/idna-2.10
 2007310239 metadata/md5-cache/dev-python/ijson-3.1_p0
 2007302309 metadata/md5-cache/dev-python/immutables-0.14
-2007310239 metadata/md5-cache/dev-python/iniconfig-1.0.0
 2007310409 metadata/md5-cache/dev-python/ipykernel-5.3.0
 2007310409 metadata/md5-cache/dev-python/ipyparallel-6.3.0
 2007310409 metadata/md5-cache/dev-python/ipython-7.16.1
@@ -45855,16 +46611,13 @@
 2007310709 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
 2007310609 metadata/md5-cache/dev-python/kiwisolver-1.2.0
 2007310709 metadata/md5-cache/dev-python/libtmux-0.8.2-r2
-2007302309 metadata/md5-cache/dev-python/m2crypto-0.35.2
 2007310609 metadata/md5-cache/dev-python/matplotlib-3.2.2
-2007310339 metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r1
 2007310239 metadata/md5-cache/dev-python/more-itertools-8.4.0
 2007310409 metadata/md5-cache/dev-python/nbconvert-5.6.1
 2007310409 metadata/md5-cache/dev-python/nbformat-5.0.7
 2007310239 metadata/md5-cache/dev-python/networkx-2.4-r1
 2007310409 metadata/md5-cache/dev-python/notebook-6.0.3
 2007310009 metadata/md5-cache/dev-python/numpy-1.18.5
-2007310539 metadata/md5-cache/dev-python/numpy-1.19.0
 2007302309 metadata/md5-cache/dev-python/pandas-1.0.5
 2007310409 metadata/md5-cache/dev-python/pandocfilters-1.4.2-r2
 2007310409 metadata/md5-cache/dev-python/pebble-4.5.3
@@ -45872,29 +46625,207 @@
 2007310309 metadata/md5-cache/dev-python/pretty-yaml-20.4.0
 2007310409 metadata/md5-cache/dev-python/prometheus_client-0.8.0
 2007302339 metadata/md5-cache/dev-python/prompt_toolkit-3.0.5
-2007310609 metadata/md5-cache/dev-python/psycopg-2.8.5
-2007310439 metadata/md5-cache/dev-python/pycryptodome-3.9.8
 2007302309 metadata/md5-cache/dev-python/pykerberos-1.3.0
 2007310439 metadata/md5-cache/dev-python/pylint-2.5.3
 2007310939 metadata/md5-cache/dev-python/pymongo-3.11.0
-2007310039 metadata/md5-cache/dev-python/pynacl-1.4.0
-2007310239 metadata/md5-cache/dev-python/pytest-6.0.1
 2007310509 metadata/md5-cache/dev-python/pytest-asyncio-0.14.0
 2007310539 metadata/md5-cache/dev-python/pytest-services-2.1.0
 2007310109 metadata/md5-cache/dev-python/python-nbxmpp-1.0.0
 2007310539 metadata/md5-cache/dev-python/pyzmq-19.0.1_p20200608
-2007310409 metadata/md5-cache/dev-python/qtconsole-4.7.4
 2007302339 metadata/md5-cache/dev-python/rdflib-5.0.0
 2007310209 metadata/md5-cache/dev-python/requests-2.24.0
-2007310439 metadata/md5-cache/dev-python/rfc3986-1.4.0
 2007302339 metadata/md5-cache/dev-python/semantic_version-2.8.5
 2007310009 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
 2007310409 metadata/md5-cache/dev-python/traitlets-4.3.3
-2007310439 metadata/md5-cache/dev-python/twine-3.2.0
 2007302339 metadata/md5-cache/dev-python/wcwidth-0.2.5
 2007310409 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
 2007310939 metadata/md5-cache/dev-python/wtforms-2.3.3
 2007310609 metadata/md5-cache/dev-python/zstandard-0.14.0
+2008021739 metadata/md5-cache/dev-python/Manifest.gz
+2008020239 metadata/md5-cache/dev-python/PyQt5-5.14.2-r1
+2008020239 metadata/md5-cache/dev-python/PyQt5-5.15.0-r1
+2008020239 metadata/md5-cache/dev-python/PyQt5-sip-4.19.22-r1
+2008020239 metadata/md5-cache/dev-python/PyQt5-sip-4.19.23-r1
+2008020239 metadata/md5-cache/dev-python/PyQtWebEngine-5.14.0
+2008020239 metadata/md5-cache/dev-python/PyQtWebEngine-5.15.1_pre2006110847
+2008020009 metadata/md5-cache/dev-python/alabaster-0.7.12
+2008020709 metadata/md5-cache/dev-python/amodem-1.15.1
+2008012239 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
+2008020039 metadata/md5-cache/dev-python/autopep8-1.4.4
+2008020039 metadata/md5-cache/dev-python/autopep8-9999
+2008020109 metadata/md5-cache/dev-python/backports-os-0.1.1
+2008020109 metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
+2008020109 metadata/md5-cache/dev-python/backports-weakref-1.0_p1
+2008020109 metadata/md5-cache/dev-python/bareos-19.2.8
+2007311639 metadata/md5-cache/dev-python/blessed-1.17.9
+2008020039 metadata/md5-cache/dev-python/bsddb3-6.2.7
+2008011539 metadata/md5-cache/dev-python/cangjie-1.3-r1
+2008020109 metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+2008010139 metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
+2008011209 metadata/md5-cache/dev-python/cheroot-8.3.0-r1
+2008020009 metadata/md5-cache/dev-python/ctypesgen-1.0.2
+2008010139 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
+2008011339 metadata/md5-cache/dev-python/dask-2.22.0
+2008020209 metadata/md5-cache/dev-python/defusedxml-0.6.0
+2008020209 metadata/md5-cache/dev-python/defusedxml-0.7.0_rc1
+2008020739 metadata/md5-cache/dev-python/django-redis-4.10.0
+2008020209 metadata/md5-cache/dev-python/docopt-0.6.2-r3
+2008021739 metadata/md5-cache/dev-python/dulwich-0.20.5
+2008020209 metadata/md5-cache/dev-python/empy-3.3.3
+2008020109 metadata/md5-cache/dev-python/fields-5.0.0-r2
+2008020139 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+2008011339 metadata/md5-cache/dev-python/fsspec-0.8.0
+2008021139 metadata/md5-cache/dev-python/funcy-1.10.1
+2008021139 metadata/md5-cache/dev-python/funcy-1.14
+2008021139 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+2008021139 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+2008020039 metadata/md5-cache/dev-python/gst-python-1.14.1-r1
+2008020039 metadata/md5-cache/dev-python/gst-python-1.16.2
+2007312309 metadata/md5-cache/dev-python/helpdev-0.7.1
+2008021139 metadata/md5-cache/dev-python/hgdistver-0.25
+2008021509 metadata/md5-cache/dev-python/html5lib-1.1
+2008011209 metadata/md5-cache/dev-python/hypothesis-5.16.3
+2008011339 metadata/md5-cache/dev-python/hypothesis-5.23.8
+2008021139 metadata/md5-cache/dev-python/imagesize-1.1.0
+2008021539 metadata/md5-cache/dev-python/iniconfig-1.0.0
+2008011339 metadata/md5-cache/dev-python/ipython-7.17.0
+2008011209 metadata/md5-cache/dev-python/jaraco-envs-2.0.0
+2008021409 metadata/md5-cache/dev-python/jaraco-text-3.2.0
+2008011209 metadata/md5-cache/dev-python/jeepney-0.4.3
+2008021139 metadata/md5-cache/dev-python/josepy-1.3.0
+2008021139 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+2008020009 metadata/md5-cache/dev-python/jsonschema-3.2.0
+2008011209 metadata/md5-cache/dev-python/keyring-21.2.1
+2008021139 metadata/md5-cache/dev-python/lit-10.0.0
+2008021139 metadata/md5-cache/dev-python/lit-10.0.1
+2008021139 metadata/md5-cache/dev-python/lit-11.0.0.9999
+2008021139 metadata/md5-cache/dev-python/lit-11.0.0_rc1
+2008021139 metadata/md5-cache/dev-python/lit-12.0.0.9999
+2008021139 metadata/md5-cache/dev-python/lit-9.0.1
+2008021139 metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+2008011239 metadata/md5-cache/dev-python/m2crypto-0.35.2
+2008020239 metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+2008020239 metadata/md5-cache/dev-python/matplotlib-2.2.4
+2008020239 metadata/md5-cache/dev-python/matplotlib-python2-2.2.5-r2
+2008021009 metadata/md5-cache/dev-python/mongomock-3.20.0
+2008021139 metadata/md5-cache/dev-python/monotonic-1.5-r1
+2008021009 metadata/md5-cache/dev-python/mpmath-1.1.0
+2008011209 metadata/md5-cache/dev-python/munch-2.5.0-r1
+2008020139 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
+2008020009 metadata/md5-cache/dev-python/nose-1.3.7-r5
+2008021209 metadata/md5-cache/dev-python/nose-show-skipped-0.1
+2008011339 metadata/md5-cache/dev-python/notebook-6.1.0
+2008021209 metadata/md5-cache/dev-python/notify2-0.3.1-r1
+2008011209 metadata/md5-cache/dev-python/numpy-1.19.0
+2008021139 metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+2008020039 metadata/md5-cache/dev-python/owslib-0.17.1-r1
+2008021209 metadata/md5-cache/dev-python/paver-1.3.4-r1
+2008021239 metadata/md5-cache/dev-python/pep8-1.7.1
+2008021209 metadata/md5-cache/dev-python/picklemagic-0.0_pre20160415
+2008021209 metadata/md5-cache/dev-python/pipfile-0.0.2
+2008021209 metadata/md5-cache/dev-python/polib-1.1.0-r1
+2008021209 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+2008021209 metadata/md5-cache/dev-python/process-tests-2.0.2
+2008021209 metadata/md5-cache/dev-python/process-tests-2.1.1
+2008011209 metadata/md5-cache/dev-python/psycopg-2.8.5
+2008021209 metadata/md5-cache/dev-python/pyatspi-2.34.0
+2008021209 metadata/md5-cache/dev-python/pyatspi-2.36.0
+2008021209 metadata/md5-cache/dev-python/pychm-0.8.6
+2008021509 metadata/md5-cache/dev-python/pycryptodome-3.9.8
+2008021209 metadata/md5-cache/dev-python/pydiff-0.2-r1
+2008021239 metadata/md5-cache/dev-python/pydocstyle-5.0.2
+2008021209 metadata/md5-cache/dev-python/pyenchant-2.0.0
+2008021239 metadata/md5-cache/dev-python/pyfltk-1.3.3
+2008021239 metadata/md5-cache/dev-python/pygpgme-0.3-r2
+2008010139 metadata/md5-cache/dev-python/pygraphviz-1.5
+2008010709 metadata/md5-cache/dev-python/pygresql-5.2
+2008021409 metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
+2008021239 metadata/md5-cache/dev-python/pymssql-2.1.3
+2008021509 metadata/md5-cache/dev-python/pynacl-1.4.0
+2008021009 metadata/md5-cache/dev-python/pyopengl-3.1.5
+2008021139 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
+2008011209 metadata/md5-cache/dev-python/pyproject2setuppy-7
+2008021239 metadata/md5-cache/dev-python/pypy-7.3.1-r2
+2008021239 metadata/md5-cache/dev-python/pypy3-7.3.1-r2
+2008021239 metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+2008010139 metadata/md5-cache/dev-python/pytest-3.10.1
+2008010139 metadata/md5-cache/dev-python/pytest-4.5.0
+2008010139 metadata/md5-cache/dev-python/pytest-4.6.11
+2008021539 metadata/md5-cache/dev-python/pytest-6.0.1
+2008021239 metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+2008021239 metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+2008020109 metadata/md5-cache/dev-python/pytest-cov-2.8.1
+2008011339 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+2008021239 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
+2008021239 metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
+2008020139 metadata/md5-cache/dev-python/pytest-timeout-1.4.1-r1
+2008020139 metadata/md5-cache/dev-python/pytest-timeout-1.4.2
+2007312339 metadata/md5-cache/dev-python/pytest-xdist-1.34.0
+2008021239 metadata/md5-cache/dev-python/python-distutils-extra-2.44-r1
+2008021239 metadata/md5-cache/dev-python/python-distutils-extra-2.45
+2008021239 metadata/md5-cache/dev-python/python-editor-1.0.4
+2008021239 metadata/md5-cache/dev-python/python-gammu-2.11
+2008021239 metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+2008021239 metadata/md5-cache/dev-python/python-ldap-3.2.0
+2008021239 metadata/md5-cache/dev-python/python-ldap-9999
+2008021239 metadata/md5-cache/dev-python/python-magic-0.4.18
+2008021239 metadata/md5-cache/dev-python/python-slip-0.6.5
+2008021239 metadata/md5-cache/dev-python/python-xlib-0.27
+2008021239 metadata/md5-cache/dev-python/pytoml-0.1.20
+2008021239 metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
+2007312309 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+2008020239 metadata/md5-cache/dev-python/qscintilla-python-2.11.4
+2008020239 metadata/md5-cache/dev-python/qscintilla-python-2.11.5
+2008010139 metadata/md5-cache/dev-python/qtconsole-4.3.1
+2008010139 metadata/md5-cache/dev-python/qtconsole-4.7.4
+2008021009 metadata/md5-cache/dev-python/rebulk-2.0.1
+2008021139 metadata/md5-cache/dev-python/reno-2.11.3
+2008021139 metadata/md5-cache/dev-python/reno-2.7.0
+2008011209 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
+2008021239 metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+2008021239 metadata/md5-cache/dev-python/rfc3986-1.2.0
+2008021239 metadata/md5-cache/dev-python/rfc3986-1.4.0
+2008021239 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+2008021239 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+2008010139 metadata/md5-cache/dev-python/ryu-4.26-r1
+2008011209 metadata/md5-cache/dev-python/secretstorage-3.1.2
+2008010139 metadata/md5-cache/dev-python/simpy-3.0.13
+2008020239 metadata/md5-cache/dev-python/sip-4.19.22-r1
+2008020239 metadata/md5-cache/dev-python/sip-4.19.23-r1
+2008021239 metadata/md5-cache/dev-python/snowballstemmer-2.0.0
+2008010139 metadata/md5-cache/dev-python/sphinx-1.7.5-r2
+2008010139 metadata/md5-cache/dev-python/sphinx-2.0.1-r1
+2008020139 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
+2008020139 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+2008021239 metadata/md5-cache/dev-python/sqlalchemy-1.3.11
+2008021239 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+2008021239 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+2008021239 metadata/md5-cache/dev-python/subvertpy-0.10.1
+2008021239 metadata/md5-cache/dev-python/sure-1.4.11
+2008020039 metadata/md5-cache/dev-python/tenacity-6.1.0-r1
+2008021239 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+2008011209 metadata/md5-cache/dev-python/testpath-0.4.4-r1
+2008020209 metadata/md5-cache/dev-python/tinycss-0.4
+2008011209 metadata/md5-cache/dev-python/twine-3.2.0
+2008011339 metadata/md5-cache/dev-python/u-msgpack-2.6.0
+2008011339 metadata/md5-cache/dev-python/u-msgpack-2.7.0
+2008021509 metadata/md5-cache/dev-python/ujson-3.1.0
+2008021239 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+2008021239 metadata/md5-cache/dev-python/urwid-2.1.0
+2008011339 metadata/md5-cache/dev-python/vcrpy-4.1.0
+2008021239 metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+2008011339 metadata/md5-cache/dev-python/virtualenv-20.0.29
+2008021239 metadata/md5-cache/dev-python/voluptuous-0.11.5
+2008020739 metadata/md5-cache/dev-python/wsproto-0.15.0
+2008021239 metadata/md5-cache/dev-python/wstools-0.4.8
+2008010139 metadata/md5-cache/dev-python/xlrd-1.2.0
+2008011339 metadata/md5-cache/dev-python/yarl-1.5.1
+2008021239 metadata/md5-cache/dev-python/zope-component-4.4.1
+2008021239 metadata/md5-cache/dev-python/zope-configuration-4.3.1
+2008021239 metadata/md5-cache/dev-python/zope-exceptions-4.3
+2008021239 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
+2008021239 metadata/md5-cache/dev-python/zope-schema-4.9.3
+2008021239 metadata/md5-cache/dev-python/zope-testrunner-5.1
 2005201639 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2006141358 metadata/md5-cache/dev-qt/assistant-5.14.2
 2006141358 metadata/md5-cache/dev-qt/assistant-5.15.0
@@ -46122,10 +47053,6 @@
 2007291709 metadata/md5-cache/dev-ros/collada_urdf-9999
 2007291709 metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
 2007291709 metadata/md5-cache/dev-ros/combined_robot_hw-9999
-2007291709 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
-2007291709 metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
-2007291709 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
-2007291709 metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
 2007291709 metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
 2007291709 metadata/md5-cache/dev-ros/compressed_image_transport-9999
 2007291709 metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -46134,12 +47061,8 @@
 2007291709 metadata/md5-cache/dev-ros/control_toolbox-9999
 2007291709 metadata/md5-cache/dev-ros/controller_interface-0.19.1
 2007291709 metadata/md5-cache/dev-ros/controller_interface-9999
-2007291709 metadata/md5-cache/dev-ros/controller_manager-0.19.1
-2007291709 metadata/md5-cache/dev-ros/controller_manager-9999
 2007291709 metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
 2007291709 metadata/md5-cache/dev-ros/controller_manager_msgs-9999
-2007291709 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
-2007291709 metadata/md5-cache/dev-ros/controller_manager_tests-9999
 2007291709 metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
 2007291709 metadata/md5-cache/dev-ros/convex_decomposition-9999
 2007291709 metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
@@ -46150,8 +47073,6 @@
 2007291709 metadata/md5-cache/dev-ros/cv_bridge-9999
 2007291709 metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
 2007291709 metadata/md5-cache/dev-ros/depth_image_proc-9999
-2007291709 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
-2007291709 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
 2007291709 metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.4
 2007291709 metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
 2007291709 metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
@@ -46166,8 +47087,6 @@
 2007291709 metadata/md5-cache/dev-ros/driver_base-9999
 2007291709 metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
 2007291709 metadata/md5-cache/dev-ros/dwa_local_planner-9999
-2007291709 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
-2007291709 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
 2007291709 metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
 2007291709 metadata/md5-cache/dev-ros/eigen_conversions-9999
 2007291709 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
@@ -46244,16 +47163,12 @@
 2007291709 metadata/md5-cache/dev-ros/image_cb_detector-9999
 2007291709 metadata/md5-cache/dev-ros/image_geometry-1.15.0
 2007291709 metadata/md5-cache/dev-ros/image_geometry-9999
-2007291709 metadata/md5-cache/dev-ros/image_proc-1.15.2
-2007291709 metadata/md5-cache/dev-ros/image_proc-9999
 2007291709 metadata/md5-cache/dev-ros/image_publisher-1.15.2
 2007291709 metadata/md5-cache/dev-ros/image_publisher-9999
 2007291709 metadata/md5-cache/dev-ros/image_rotate-1.15.2
 2007291709 metadata/md5-cache/dev-ros/image_rotate-9999
 2007291709 metadata/md5-cache/dev-ros/image_transport-1.12.0
 2007291709 metadata/md5-cache/dev-ros/image_transport-9999
-2007291709 metadata/md5-cache/dev-ros/image_view-1.15.2
-2007291709 metadata/md5-cache/dev-ros/image_view-9999
 2007291709 metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
 2007291709 metadata/md5-cache/dev-ros/imu_complementary_filter-9999
 2007291709 metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -46280,14 +47195,8 @@
 2007291709 metadata/md5-cache/dev-ros/kdl_conversions-9999
 2007291709 metadata/md5-cache/dev-ros/kdl_parser-1.14.0
 2007291709 metadata/md5-cache/dev-ros/kdl_parser-9999
-2007291739 metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
-2007291739 metadata/md5-cache/dev-ros/kdl_parser_py-9999
 2007291709 metadata/md5-cache/dev-ros/laser_assembler-1.7.8
 2007291709 metadata/md5-cache/dev-ros/laser_assembler-9999
-2007291709 metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
-2007291709 metadata/md5-cache/dev-ros/laser_cb_detector-9999
-2007291709 metadata/md5-cache/dev-ros/laser_filters-1.8.11
-2007291709 metadata/md5-cache/dev-ros/laser_filters-9999
 2007291709 metadata/md5-cache/dev-ros/laser_geometry-1.6.5
 2007291709 metadata/md5-cache/dev-ros/laser_geometry-9999
 2007291709 metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -46305,8 +47214,6 @@
 2007291709 metadata/md5-cache/dev-ros/mavros-9999
 2007291709 metadata/md5-cache/dev-ros/mavros_extras-1.2.0
 2007291709 metadata/md5-cache/dev-ros/mavros_extras-9999
-2007291709 metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
-2007291709 metadata/md5-cache/dev-ros/mavros_msgs-9999
 2007291709 metadata/md5-cache/dev-ros/media_export-0.3.0
 2007291709 metadata/md5-cache/dev-ros/media_export-9999
 2007291709 metadata/md5-cache/dev-ros/message_filters-1.15.7
@@ -46352,8 +47259,6 @@
 2007291709 metadata/md5-cache/dev-ros/octomap_msgs-9999
 2007291709 metadata/md5-cache/dev-ros/octomap_ros-0.4.1
 2007291709 metadata/md5-cache/dev-ros/octomap_ros-9999
-2007291709 metadata/md5-cache/dev-ros/opencv_apps-2.0.1
-2007291709 metadata/md5-cache/dev-ros/opencv_apps-9999
 2007291709 metadata/md5-cache/dev-ros/opencv_tests-1.15.0
 2007291709 metadata/md5-cache/dev-ros/opencv_tests-9999
 2007291709 metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -46375,8 +47280,6 @@
 2007291709 metadata/md5-cache/dev-ros/polled_camera-9999
 2007291709 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
 2007291709 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
-2007291709 metadata/md5-cache/dev-ros/pr2_description-1.12.4
-2007291709 metadata/md5-cache/dev-ros/pr2_description-9999
 2007291709 metadata/md5-cache/dev-ros/pr2_machine-1.12.4
 2007291709 metadata/md5-cache/dev-ros/pr2_machine-9999
 2007291709 metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -46419,9 +47322,6 @@
 2007291709 metadata/md5-cache/dev-ros/rosbag-9999
 2007291709 metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
 2007291709 metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
-2007291709 metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
-2007291709 metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
-2007291709 metadata/md5-cache/dev-ros/rosbag_storage-9999
 2007291709 metadata/md5-cache/dev-ros/rosbash-1.15.5
 2007291709 metadata/md5-cache/dev-ros/rosbash-1.15.6
 2007291709 metadata/md5-cache/dev-ros/rosbash-9999
@@ -46466,7 +47366,6 @@
 2007291709 metadata/md5-cache/dev-ros/roslang-1.15.5
 2007291709 metadata/md5-cache/dev-ros/roslang-1.15.6
 2007291709 metadata/md5-cache/dev-ros/roslang-9999
-2007291709 metadata/md5-cache/dev-ros/roslaunch-1.15.7
 2007291709 metadata/md5-cache/dev-ros/roslaunch-1.15.8
 2007291709 metadata/md5-cache/dev-ros/roslaunch-9999
 2007291709 metadata/md5-cache/dev-ros/roslib-1.15.6
@@ -46484,9 +47383,6 @@
 2007291709 metadata/md5-cache/dev-ros/rosmsg-1.15.7
 2007291709 metadata/md5-cache/dev-ros/rosmsg-1.15.8
 2007291709 metadata/md5-cache/dev-ros/rosmsg-9999
-2007291709 metadata/md5-cache/dev-ros/rosnode-1.15.7
-2007291709 metadata/md5-cache/dev-ros/rosnode-1.15.8
-2007291709 metadata/md5-cache/dev-ros/rosnode-9999
 2007291709 metadata/md5-cache/dev-ros/rosout-1.15.7
 2007291709 metadata/md5-cache/dev-ros/rosout-1.15.8
 2007291709 metadata/md5-cache/dev-ros/rosout-9999
@@ -46498,8 +47394,6 @@
 2007291709 metadata/md5-cache/dev-ros/rospy-1.15.7
 2007291709 metadata/md5-cache/dev-ros/rospy-1.15.8
 2007291709 metadata/md5-cache/dev-ros/rospy-9999
-2007291809 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
-2007291809 metadata/md5-cache/dev-ros/rospy_tutorials-9999
 2007291709 metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
 2007291709 metadata/md5-cache/dev-ros/rosserial_arduino-9999
 2007291709 metadata/md5-cache/dev-ros/rosserial_client-0.8.0
@@ -46645,9 +47539,7 @@
 2007291709 metadata/md5-cache/dev-ros/test_rosbag-1.15.7
 2007291709 metadata/md5-cache/dev-ros/test_rosbag-1.15.8
 2007291709 metadata/md5-cache/dev-ros/test_rosbag-9999
-2007291709 metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
 2007291709 metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
-2007291709 metadata/md5-cache/dev-ros/test_rosbag_storage-9999
 2007291709 metadata/md5-cache/dev-ros/test_roscpp-1.15.7
 2007291709 metadata/md5-cache/dev-ros/test_roscpp-1.15.8
 2007291709 metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -46748,10 +47640,6 @@
 2007291709 metadata/md5-cache/dev-ros/voxel_grid-9999
 2007291709 metadata/md5-cache/dev-ros/xacro-1.14.1
 2007291709 metadata/md5-cache/dev-ros/xacro-9999
-2007291709 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
-2007291709 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
-2007291709 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
-2007291709 metadata/md5-cache/dev-ros/xmlrpcpp-9999
 2007292139 metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
 2007292139 metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
 2007292139 metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
@@ -46771,7 +47659,6 @@
 2007292139 metadata/md5-cache/dev-ros/pluginlib-9999
 2007292139 metadata/md5-cache/dev-ros/roslz4-1.15.8
 2007292139 metadata/md5-cache/dev-ros/roslz4-9999
-2007301809 metadata/md5-cache/dev-ros/Manifest.gz
 2007301609 metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
 2007301609 metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
 2007301639 metadata/md5-cache/dev-ros/pcl_ros-1.7.1
@@ -46790,6 +47677,44 @@
 2007301809 metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
 2007301809 metadata/md5-cache/dev-ros/urg_node-0.1.13
 2007301809 metadata/md5-cache/dev-ros/urg_node-9999
+2007311639 metadata/md5-cache/dev-ros/Manifest.gz
+2007311339 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
+2007311339 metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+2007311339 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+2007311339 metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+2007311339 metadata/md5-cache/dev-ros/controller_manager-0.19.1
+2007311339 metadata/md5-cache/dev-ros/controller_manager-9999
+2007311339 metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+2007311339 metadata/md5-cache/dev-ros/controller_manager_tests-9999
+2007311339 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+2007311339 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+2007311339 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
+2007311339 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+2007311339 metadata/md5-cache/dev-ros/image_proc-1.15.2
+2007311339 metadata/md5-cache/dev-ros/image_proc-9999
+2007311339 metadata/md5-cache/dev-ros/image_view-1.15.2-r1
+2007311339 metadata/md5-cache/dev-ros/image_view-9999
+2007311409 metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
+2007311409 metadata/md5-cache/dev-ros/kdl_parser_py-9999
+2007311409 metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+2007311409 metadata/md5-cache/dev-ros/laser_cb_detector-9999
+2007311409 metadata/md5-cache/dev-ros/laser_filters-1.8.11
+2007311409 metadata/md5-cache/dev-ros/laser_filters-9999
+2007311339 metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+2007311339 metadata/md5-cache/dev-ros/mavros_msgs-9999
+2007311409 metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+2007311409 metadata/md5-cache/dev-ros/opencv_apps-9999
+2007311639 metadata/md5-cache/dev-ros/pr2_description-1.12.4
+2007311639 metadata/md5-cache/dev-ros/pr2_description-9999
+2007311339 metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
+2007311339 metadata/md5-cache/dev-ros/rosbag_storage-9999
+2007311639 metadata/md5-cache/dev-ros/rosnode-1.15.8
+2007311639 metadata/md5-cache/dev-ros/rosnode-9999
+2007311639 metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+2007311639 metadata/md5-cache/dev-ros/rospy_tutorials-9999
+2007311339 metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+2007311339 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+2007311339 metadata/md5-cache/dev-ros/xmlrpcpp-9999
 2006141358 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
 2006141358 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.6.0
 2006141358 metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -47393,20 +48318,14 @@
 2007062109 metadata/md5-cache/dev-ruby/nokogumbo-2.0.1
 2007062109 metadata/md5-cache/dev-ruby/nokogumbo-2.0.2
 2007062109 metadata/md5-cache/dev-ruby/notify-0.5.2-r1
-2007062109 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
 2007062109 metadata/md5-cache/dev-ruby/oauth-0.5.4
 2007062109 metadata/md5-cache/dev-ruby/oauth2-1.4.3
 2007062109 metadata/md5-cache/dev-ruby/octokit-4.17.0
 2007062109 metadata/md5-cache/dev-ruby/octokit-4.18.0
-2007062109 metadata/md5-cache/dev-ruby/omniauth-1.9.0
 2007062109 metadata/md5-cache/dev-ruby/omniauth-1.9.1
 2007062109 metadata/md5-cache/dev-ruby/open4-1.3.4
 2007062109 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
-2007062109 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
-2007062109 metadata/md5-cache/dev-ruby/optimist-3.0.0
 2007062109 metadata/md5-cache/dev-ruby/optimist-3.0.1
-2007062109 metadata/md5-cache/dev-ruby/optionable-0.2.0
-2007062109 metadata/md5-cache/dev-ruby/org-ruby-0.9.12
 2007062109 metadata/md5-cache/dev-ruby/origin-2.3.1
 2007062109 metadata/md5-cache/dev-ruby/ox-2.10.1
 2007062109 metadata/md5-cache/dev-ruby/ox-2.11.0
@@ -47415,13 +48334,10 @@
 2007062109 metadata/md5-cache/dev-ruby/ox-2.13.1
 2007062109 metadata/md5-cache/dev-ruby/ox-2.13.2
 2007062109 metadata/md5-cache/dev-ruby/packetfu-1.1.13
-2007062109 metadata/md5-cache/dev-ruby/paint-2.1.0
-2007062109 metadata/md5-cache/dev-ruby/paint-2.1.1
 2007062109 metadata/md5-cache/dev-ruby/paint-2.2.0
 2007062109 metadata/md5-cache/dev-ruby/parallel-1.18.0
 2007062109 metadata/md5-cache/dev-ruby/parallel-1.19.1
 2007062109 metadata/md5-cache/dev-ruby/parallel-1.19.2
-2007062109 metadata/md5-cache/dev-ruby/paramesan-0.1.1
 2007062109 metadata/md5-cache/dev-ruby/parser-2.6.5.0
 2007062109 metadata/md5-cache/dev-ruby/parser-2.7.1.0
 2007062109 metadata/md5-cache/dev-ruby/parser-2.7.1.1
@@ -47440,14 +48356,12 @@
 2007062109 metadata/md5-cache/dev-ruby/patron-0.13.1-r1
 2007062109 metadata/md5-cache/dev-ruby/patron-0.13.3
 2007062109 metadata/md5-cache/dev-ruby/pcaprub-0.12.4
-2007062109 metadata/md5-cache/dev-ruby/pcaprub-0.13.0
 2007062109 metadata/md5-cache/dev-ruby/pdf-core-0.7.0
 2007062109 metadata/md5-cache/dev-ruby/pdf-core-0.8.1
 2007062109 metadata/md5-cache/dev-ruby/pdf-inspector-1.3.0
 2007062109 metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
 2007062109 metadata/md5-cache/dev-ruby/pdf-reader-2.3.0
 2007062109 metadata/md5-cache/dev-ruby/pdf-reader-2.4.0
-2007062109 metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
 2007062109 metadata/md5-cache/dev-ruby/pg-0.21.0
 2007062109 metadata/md5-cache/dev-ruby/pg-1.2.2
 2007062109 metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
@@ -48054,12 +48968,19 @@
 2007301109 metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7
 2007301109 metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.4.3
 2007301109 metadata/md5-cache/dev-ruby/ruby-wnck3-3.4.3
-2007310939 metadata/md5-cache/dev-ruby/Manifest.gz
 2007310809 metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6
 2007310809 metadata/md5-cache/dev-ruby/ffaker-2.16.0
 2007310809 metadata/md5-cache/dev-ruby/histogram-0.2.4.1
 2007310939 metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
 2007310939 metadata/md5-cache/dev-ruby/prawn-table-0.2.2-r1
+2008011209 metadata/md5-cache/dev-ruby/Manifest.gz
+2008011209 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+2008011209 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
+2008011209 metadata/md5-cache/dev-ruby/optionable-0.2.0
+2008011209 metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+2008011209 metadata/md5-cache/dev-ruby/paramesan-0.1.1
+2008011209 metadata/md5-cache/dev-ruby/pcaprub-0.13.0
+2008011209 metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -48187,7 +49108,6 @@
 2005041739 metadata/md5-cache/dev-tex/biber-2.14
 2005041739 metadata/md5-cache/dev-tex/biblatex-3.14
 2005311939 metadata/md5-cache/dev-tex/bibtexu-3.71_p20200406
-2006141358 metadata/md5-cache/dev-tex/bibtex2html-1.98
 2006141358 metadata/md5-cache/dev-tex/catdvi-0.14-r2
 2006141358 metadata/md5-cache/dev-tex/chktex-1.7.6
 2006141358 metadata/md5-cache/dev-tex/csindex-2.11c-r2
@@ -48215,7 +49135,6 @@
 2006241539 metadata/md5-cache/dev-tex/glossaries-4.46
 2006261239 metadata/md5-cache/dev-tex/xmltex-1.9-r3
 2006280009 metadata/md5-cache/dev-tex/latex2html-2015
-2006280009 metadata/md5-cache/dev-tex/latex2html-2017.2-r2
 2006290109 metadata/md5-cache/dev-tex/html2latex-1.1-r1
 2007020939 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r11
 2007031439 metadata/md5-cache/dev-tex/cjk-latex-4.8.4-r1
@@ -48225,8 +49144,9 @@
 2007041046 metadata/md5-cache/dev-tex/pythontex-0.17
 2007041046 metadata/md5-cache/dev-tex/rubber-1.4
 2007041046 metadata/md5-cache/dev-tex/rubber-1.5.1
-2007301239 metadata/md5-cache/dev-tex/Manifest.gz
 2007301239 metadata/md5-cache/dev-tex/latexdiff-1.3.1.1
+2008021609 metadata/md5-cache/dev-tex/Manifest.gz
+2008021609 metadata/md5-cache/dev-tex/latex2html-2017.2-r2
 2006261239 metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
 2006261239 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
 2006261239 metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -48477,7 +49397,6 @@
 2006141358 metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
 2006141358 metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
 2006141358 metadata/md5-cache/dev-util/cargo-license-0.3.0
-2006141358 metadata/md5-cache/dev-util/cargo-tree-0.29.0-r1
 2006141358 metadata/md5-cache/dev-util/cccc-3.1.5-r1
 2006141358 metadata/md5-cache/dev-util/checkstyle-7.2
 2006141358 metadata/md5-cache/dev-util/codeblocks-17.12-r302
@@ -48495,7 +49414,6 @@
 2006141358 metadata/md5-cache/dev-util/debhelper-13.1
 2006141358 metadata/md5-cache/dev-util/debhelper-9.20160814
 2006141358 metadata/md5-cache/dev-util/debugedit-4.15.0
-2006141358 metadata/md5-cache/dev-util/debugedit-4.15.1
 2006141358 metadata/md5-cache/dev-util/dialog-1.3.20170131
 2006141358 metadata/md5-cache/dev-util/diffball-1.0.1-r2
 2006141358 metadata/md5-cache/dev-util/dirdiff-2.1-r3
@@ -48515,7 +49433,6 @@
 2006141358 metadata/md5-cache/dev-util/github-cli-0.9.0-r1
 2006141358 metadata/md5-cache/dev-util/global-6.3.1
 2006141358 metadata/md5-cache/dev-util/global-6.5.7
-2006141358 metadata/md5-cache/dev-util/global-6.6.4
 2006141358 metadata/md5-cache/dev-util/gnome-devel-docs-3.32.1
 2006141358 metadata/md5-cache/dev-util/gob-2.0.20
 2006141358 metadata/md5-cache/dev-util/gource-0.51
@@ -48947,7 +49864,6 @@
 2007250041 metadata/md5-cache/dev-util/clazy-1.7
 2007250041 metadata/md5-cache/dev-util/cmake-3.13.5
 2007250041 metadata/md5-cache/dev-util/cmake-3.16.5
-2007250041 metadata/md5-cache/dev-util/cmake-3.17.2
 2007250041 metadata/md5-cache/dev-util/cmake-3.17.3
 2007250041 metadata/md5-cache/dev-util/cmake-3.18.0
 2007250041 metadata/md5-cache/dev-util/cmake-fedora-2.7.1
@@ -48955,13 +49871,6 @@
 2007250041 metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110
 2007250909 metadata/md5-cache/dev-util/cutter-1.11.0
 2007250041 metadata/md5-cache/dev-util/cvise-1.1.0
-2007242339 metadata/md5-cache/dev-util/diffoscope-153
-2007250041 metadata/md5-cache/dev-util/dwarves-1.12
-2007250041 metadata/md5-cache/dev-util/dwarves-1.13
-2007250041 metadata/md5-cache/dev-util/dwarves-1.15
-2007250041 metadata/md5-cache/dev-util/dwarves-1.16
-2007250041 metadata/md5-cache/dev-util/dwarves-1.16-r1
-2007250041 metadata/md5-cache/dev-util/dwarves-1.17
 2007250041 metadata/md5-cache/dev-util/dwarves-9999
 2007250041 metadata/md5-cache/dev-util/edb-debugger-1.2.0
 2007250041 metadata/md5-cache/dev-util/edb-debugger-9999
@@ -48990,13 +49899,11 @@
 2007250041 metadata/md5-cache/dev-util/kdstatemachineeditor-9999
 2007250041 metadata/md5-cache/dev-util/kernelshark-1.0
 2007250041 metadata/md5-cache/dev-util/kernelshark-9999
-2007250041 metadata/md5-cache/dev-util/lldb-10.0.0
 2007250041 metadata/md5-cache/dev-util/lldb-10.0.1
 2007250041 metadata/md5-cache/dev-util/lldb-11.0.0.9999
 2007250041 metadata/md5-cache/dev-util/lldb-12.0.0.9999
 2007250041 metadata/md5-cache/dev-util/lldb-9.0.1-r1
 2007250041 metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
-2007250041 metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
 2007250041 metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
 2007250041 metadata/md5-cache/dev-util/min-cscope-16.1.0
 2007250339 metadata/md5-cache/dev-util/promu-0.5.0
@@ -49051,7 +49958,6 @@
 2007280339 metadata/md5-cache/dev-util/trace-cmd-2.9.1
 2007272109 metadata/md5-cache/dev-util/vulkan-headers-1.2.143
 2007272109 metadata/md5-cache/dev-util/vulkan-tools-1.2.141
-2007282039 metadata/md5-cache/dev-util/ccache-3.7.10
 2007291339 metadata/md5-cache/dev-util/lldb-11.0.0_rc1
 2007291539 metadata/md5-cache/dev-util/rosdep-0.19.0
 2007291539 metadata/md5-cache/dev-util/rosdep-9999
@@ -49064,7 +49970,16 @@
 2007291539 metadata/md5-cache/dev-util/wstool-9999
 2007301809 metadata/md5-cache/dev-util/catkin-0.8.8
 2007301809 metadata/md5-cache/dev-util/catkin-9999
-2007310139 metadata/md5-cache/dev-util/Manifest.gz
+2008021739 metadata/md5-cache/dev-util/Manifest.gz
+2008011209 metadata/md5-cache/dev-util/ccache-3.7.10
+2007311439 metadata/md5-cache/dev-util/cmake-3.17.4
+2007311439 metadata/md5-cache/dev-util/cmake-3.18.1
+2008021509 metadata/md5-cache/dev-util/debugedit-4.15.1
+2008010209 metadata/md5-cache/dev-util/diffoscope-154
+2008011709 metadata/md5-cache/dev-util/dwarves-1.17
+2008011209 metadata/md5-cache/dev-util/global-6.6.4
+2008010139 metadata/md5-cache/dev-util/lldb-10.0.0
+2007311939 metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -49165,11 +50080,9 @@
 2007041046 metadata/md5-cache/dev-vcs/gitstats-0_pre20151223
 2007041046 metadata/md5-cache/dev-vcs/gitstats-9999
 2007041046 metadata/md5-cache/dev-vcs/gti-9999
-2007041046 metadata/md5-cache/dev-vcs/hg-evolve-10.0.0
 2007041046 metadata/md5-cache/dev-vcs/hg-git-0.8.13
 2007041046 metadata/md5-cache/dev-vcs/hg-git-0.8.8
 2007041046 metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1
-2007041046 metadata/md5-cache/dev-vcs/mercurial-5.4.1
 2007041046 metadata/md5-cache/dev-vcs/mercurial-9999
 2007041046 metadata/md5-cache/dev-vcs/mr-1.99999999
 2007041046 metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
@@ -49208,8 +50121,12 @@
 2007261139 metadata/md5-cache/dev-vcs/mercurial-5.3.2
 2007250041 metadata/md5-cache/dev-vcs/qgit-2.9
 2007272139 metadata/md5-cache/dev-vcs/git-2.28.0
-2007302239 metadata/md5-cache/dev-vcs/Manifest.gz
 2007302239 metadata/md5-cache/dev-vcs/tkcvs-9.3.2
+2008021909 metadata/md5-cache/dev-vcs/Manifest.gz
+2008011139 metadata/md5-cache/dev-vcs/darcs-2.14.4
+2008011139 metadata/md5-cache/dev-vcs/git-annex-8.20200617
+2008021909 metadata/md5-cache/dev-vcs/hg-evolve-10.0.1
+2008021339 metadata/md5-cache/dev-vcs/mercurial-5.4.2
 1707090139 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1702282322 metadata/md5-cache/games-action/tuxkart-0.4.0-r1
@@ -49471,7 +50388,6 @@
 2006141358 metadata/md5-cache/games-board/spider-1.2_p4-r2
 2006141358 metadata/md5-cache/games-board/stockfish-10
 2006141358 metadata/md5-cache/games-board/stockfish-11
-2006141358 metadata/md5-cache/games-board/teg-0.11.2-r1
 2006141358 metadata/md5-cache/games-board/tetzle-2.1.3
 2006141358 metadata/md5-cache/games-board/xboard-4.9.1
 2006141358 metadata/md5-cache/games-board/xfreecell-1.0.5b-r1
@@ -49500,9 +50416,9 @@
 2007050309 metadata/md5-cache/games-board/tali-3.36.4
 2007052339 metadata/md5-cache/games-board/xmahjongg-3.7-r1
 2007130339 metadata/md5-cache/games-board/chessx-1.5.4
-2007250041 metadata/md5-cache/games-board/Manifest.gz
 2007250041 metadata/md5-cache/games-board/cockatrice-20190304-r1
 2007250041 metadata/md5-cache/games-board/gambit-1.0.4
+2008020209 metadata/md5-cache/games-board/Manifest.gz
 1911021809 metadata/md5-cache/games-emulation/desmume-0.9.11-r2
 1911110109 metadata/md5-cache/games-emulation/emutos-0.9.12
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
@@ -49559,7 +50475,6 @@
 2007041046 metadata/md5-cache/games-emulation/libretro-nestopia-9999
 2007041046 metadata/md5-cache/games-emulation/libretro-snes9x-9999
 2007041046 metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
-2007041046 metadata/md5-cache/games-emulation/m64py-0.2.4
 2007050309 metadata/md5-cache/games-emulation/snes9x-1.59.2
 2007050309 metadata/md5-cache/games-emulation/snes9x-1.60
 2007121009 metadata/md5-cache/games-emulation/m64py-0.2.5
@@ -49585,8 +50500,9 @@
 2007252338 metadata/md5-cache/games-emulation/vbam-2.1.4
 2007252338 metadata/md5-cache/games-emulation/vbam-9999
 2007250041 metadata/md5-cache/games-emulation/yabause-0.9.15
-2007301109 metadata/md5-cache/games-emulation/Manifest.gz
 2007301109 metadata/md5-cache/games-emulation/zsnes-1.51-r9
+2008020139 metadata/md5-cache/games-emulation/Manifest.gz
+2008020139 metadata/md5-cache/games-emulation/m64py-0.2.4
 1804222308 metadata/md5-cache/games-engines/love-0.7.2-r2
 1804222308 metadata/md5-cache/games-engines/love-0.8.0-r1
 1807210042 metadata/md5-cache/games-engines/love-0.8.0-r2
@@ -50179,8 +51095,9 @@
 2007271039 metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
 2007290809 metadata/md5-cache/gnome-base/dconf-0.34.0
 2007290809 metadata/md5-cache/gnome-base/gnome-keyring-3.34.0
-2007302309 metadata/md5-cache/gnome-base/Manifest.gz
-2007302309 metadata/md5-cache/gnome-base/libglade-2.6.4-r3
+2008020109 metadata/md5-cache/gnome-base/Manifest.gz
+2008012239 metadata/md5-cache/gnome-base/libglade-2.6.4-r3
+2008020109 metadata/md5-cache/gnome-base/librsvg-2.48.8
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.34.2
@@ -50262,12 +51179,14 @@
 2007192139 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.36.2
 2007192139 metadata/md5-cache/gnome-extra/gnome-user-docs-3.36.2
 2007212209 metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
-2007261509 metadata/md5-cache/gnome-extra/Manifest.gz
 2007250041 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3
 2007250041 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
 2007250041 metadata/md5-cache/gnome-extra/evolution-data-server-3.36.4
 2007250041 metadata/md5-cache/gnome-extra/evolution-ews-3.36.4
 2007261509 metadata/md5-cache/gnome-extra/gnome-boxes-3.36.5
+2008021439 metadata/md5-cache/gnome-extra/Manifest.gz
+2008021439 metadata/md5-cache/gnome-extra/yelp-3.36.0
+2008021439 metadata/md5-cache/gnome-extra/yelp-xsl-3.36.0
 2006141358 metadata/md5-cache/gnustep-apps/aclock-0.4.0
 2006141358 metadata/md5-cache/gnustep-apps/addresses-0.4.8
 2006141358 metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -50676,7 +51595,6 @@
 2007250041 metadata/md5-cache/kde-apps/umbrello-19.12.3
 2007250041 metadata/md5-cache/kde-apps/yakuake-19.12.3
 2007250041 metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.3
-2007301039 metadata/md5-cache/kde-apps/Manifest.gz
 2007301039 metadata/md5-cache/kde-apps/akonadi-20.04.3
 2007301039 metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
 2007301039 metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
@@ -50910,6 +51828,10 @@
 2007301039 metadata/md5-cache/kde-apps/umbrello-20.04.3
 2007301039 metadata/md5-cache/kde-apps/yakuake-20.04.3
 2007301039 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
+2008020209 metadata/md5-cache/kde-apps/Manifest.gz
+2008020209 metadata/md5-cache/kde-apps/ark-20.04.3-r1
+2008020209 metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
+2008020209 metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
 2007111909 metadata/md5-cache/kde-frameworks/kapidox-5.72.0
 2007250041 metadata/md5-cache/kde-frameworks/Manifest.gz
@@ -51082,8 +52004,6 @@
 2007250041 metadata/md5-cache/kde-misc/basket-2.49b
 2007250041 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2007250041 metadata/md5-cache/kde-misc/kdeconnect-1.4
-2007250041 metadata/md5-cache/kde-misc/kdiff3-1.8.2-r1
-2007250041 metadata/md5-cache/kde-misc/kdiff3-1.8.3
 2007250041 metadata/md5-cache/kde-misc/kdirstat-3.2.1
 2007250041 metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
 2007250041 metadata/md5-cache/kde-misc/kio-fuse-4.95.0
@@ -51104,16 +52024,15 @@
 2007250041 metadata/md5-cache/kde-misc/plasma-pass-1.1.0
 2007250041 metadata/md5-cache/kde-misc/playbar2-2.5-r1
 2007250041 metadata/md5-cache/kde-misc/rsibreak-0.12.13
-2007250041 metadata/md5-cache/kde-misc/skanlite-2.1.0.1-r1
 2007250041 metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
 2007250041 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
 2007250041 metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
 2007280139 metadata/md5-cache/kde-misc/tellico-3.3.1
-2007301039 metadata/md5-cache/kde-misc/Manifest.gz
 2007301039 metadata/md5-cache/kde-misc/kdeconnect-20.04.3
 2007301039 metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
 2007301039 metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
 2007301039 metadata/md5-cache/kde-misc/skanlite-2.2.0
+2008011109 metadata/md5-cache/kde-misc/Manifest.gz
 2006150109 metadata/md5-cache/kde-plasma/breeze-grub-5.18.5
 2007060209 metadata/md5-cache/kde-plasma/plasma-meta-5.18.5
 2007250041 metadata/md5-cache/kde-plasma/bluedevil-5.18.5
@@ -51164,7 +52083,6 @@
 2007250041 metadata/md5-cache/kde-plasma/user-manager-5.18.5
 2007250041 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
 2007250041 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
-2007281909 metadata/md5-cache/kde-plasma/Manifest.gz
 2007281909 metadata/md5-cache/kde-plasma/bluedevil-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/breeze-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/breeze-grub-5.19.4
@@ -51182,7 +52100,6 @@
 2007281909 metadata/md5-cache/kde-plasma/kinfocenter-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/kmenuedit-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/kscreen-5.19.4
-2007281909 metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/ksshaskpass-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/ksysguard-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/kwallet-pam-5.19.4
@@ -51208,12 +52125,14 @@
 2007281909 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.4
-2007281909 metadata/md5-cache/kde-plasma/powerdevil-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/sddm-kcm-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/systemsettings-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/user-manager-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.4
 2007281909 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.4
+2008020209 metadata/md5-cache/kde-plasma/Manifest.gz
+2008020209 metadata/md5-cache/kde-plasma/kscreenlocker-5.19.4-r1
+2008020209 metadata/md5-cache/kde-plasma/powerdevil-5.19.4
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3
 1808310239 metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
 1804072008 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.1
@@ -51245,42 +52164,42 @@
 2006141358 metadata/md5-cache/lxde-base/lxterminal-0.3.1
 2006141358 metadata/md5-cache/lxde-base/lxterminal-0.3.2
 2005210239 metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
-2005210239 metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
-2007250041 metadata/md5-cache/lxqt-base/Manifest.gz
 2007250041 metadata/md5-cache/lxqt-base/liblxqt-0.14.1
 2007250041 metadata/md5-cache/lxqt-base/liblxqt-0.15.0
-2007250041 metadata/md5-cache/lxqt-base/liblxqt-0.15.1
 2007250041 metadata/md5-cache/lxqt-base/libsysstat-0.4.2
-2007250041 metadata/md5-cache/lxqt-base/libsysstat-0.4.3
 2007250041 metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-config-0.14.1-r1
 2007250041 metadata/md5-cache/lxqt-base/lxqt-config-0.15.0
-2007250041 metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
 2007250041 metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
 2007250041 metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.3
-2007250041 metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
 2007250041 metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.0-r1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
 2007250041 metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
 2007250041 metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
-2007250041 metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/Manifest.gz
+2007311939 metadata/md5-cache/lxqt-base/liblxqt-0.15.1
+2007311939 metadata/md5-cache/lxqt-base/libsysstat-0.4.3
+2007311939 metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
+2007311939 metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-meta-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
+2007311939 metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
+2007311939 metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
+2007311939 metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
 1905201439 metadata/md5-cache/mail-client/bower-0.10
 1910211739 metadata/md5-cache/mail-client/bower-0.11
 1912031639 metadata/md5-cache/mail-client/clawsker-1.3.1
@@ -51446,7 +52365,6 @@
 2004062109 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2004081839 metadata/md5-cache/mate-base/mate-common-1.24.1
 2005081846 metadata/md5-cache/mate-base/mate-common-1.22.2
-2006141358 metadata/md5-cache/mate-base/Manifest.gz
 2006141358 metadata/md5-cache/mate-base/caja-1.22.3-r1
 2006141358 metadata/md5-cache/mate-base/caja-1.24.0
 2006141358 metadata/md5-cache/mate-base/libmatekbd-1.22.0
@@ -51461,10 +52379,11 @@
 2006141358 metadata/md5-cache/mate-base/mate-menus-1.24.0-r2
 2006141358 metadata/md5-cache/mate-base/mate-panel-1.22.2-r1
 2006141358 metadata/md5-cache/mate-base/mate-panel-1.24.0-r1
-2006141358 metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r2
-2006141358 metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r2
 2006141358 metadata/md5-cache/mate-base/mate-settings-daemon-1.22.1
 2006141358 metadata/md5-cache/mate-base/mate-settings-daemon-1.24.0
+2008021039 metadata/md5-cache/mate-base/Manifest.gz
+2008021039 metadata/md5-cache/mate-base/mate-session-manager-1.22.3-r3
+2008021039 metadata/md5-cache/mate-base/mate-session-manager-1.24.0-r3
 2006141358 metadata/md5-cache/mate-extra/caja-extensions-1.22.1
 2006141358 metadata/md5-cache/mate-extra/caja-extensions-1.24.0
 2006141358 metadata/md5-cache/mate-extra/caja-extensions-1.24.0-r1
@@ -51478,9 +52397,6 @@
 2006141358 metadata/md5-cache/mate-extra/mate-netbook-1.24.0
 2006141358 metadata/md5-cache/mate-extra/mate-polkit-1.22.0-r1
 2006141358 metadata/md5-cache/mate-extra/mate-polkit-1.24.0
-2006141358 metadata/md5-cache/mate-extra/mate-power-manager-1.22.1
-2006141358 metadata/md5-cache/mate-extra/mate-power-manager-1.22.2
-2006141358 metadata/md5-cache/mate-extra/mate-power-manager-1.24.1
 2006141358 metadata/md5-cache/mate-extra/mate-screensaver-1.22.2
 2006141358 metadata/md5-cache/mate-extra/mate-screensaver-1.24.0
 2006141358 metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.1
@@ -51498,9 +52414,12 @@
 2007041046 metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
 2007041046 metadata/md5-cache/mate-extra/caja-dropbox-1.24.0
 2007041046 metadata/md5-cache/mate-extra/caja-hide-0.9.0
-2007250041 metadata/md5-cache/mate-extra/Manifest.gz
 2007250041 metadata/md5-cache/mate-extra/caja-admin-0.0.1
 2007250041 metadata/md5-cache/mate-extra/caja-admin-0.0.2
+2008021039 metadata/md5-cache/mate-extra/Manifest.gz
+2008021039 metadata/md5-cache/mate-extra/mate-power-manager-1.22.1-r1
+2008021039 metadata/md5-cache/mate-extra/mate-power-manager-1.22.2-r1
+2008021039 metadata/md5-cache/mate-extra/mate-power-manager-1.24.1-r1
 1812141339 metadata/md5-cache/media-fonts/solarize-0_pre20140818
 2003300109 metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
 2004032241 metadata/md5-cache/media-fonts/konfont-0.1
@@ -51763,8 +52682,8 @@
 2007230439 metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
 2007241539 metadata/md5-cache/media-fonts/jetbrains-mono-2.001
 2007250041 metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
-2007310809 metadata/md5-cache/media-fonts/Manifest.gz
-2007310809 metadata/md5-cache/media-fonts/noto-20200521
+2008011239 metadata/md5-cache/media-fonts/Manifest.gz
+2008011239 metadata/md5-cache/media-fonts/noto-20200521
 1908162118 metadata/md5-cache/media-gfx/cellwriter-1.3.6
 1909210939 metadata/md5-cache/media-gfx/ephoto-1.5
 1804080138 metadata/md5-cache/media-gfx/figurine-1.0.5-r1
@@ -51961,7 +52880,6 @@
 2007041046 metadata/md5-cache/media-gfx/asymptote-2.62
 2007041046 metadata/md5-cache/media-gfx/asymptote-2.65
 2007041046 metadata/md5-cache/media-gfx/birdfont-2.18.3
-2007041046 metadata/md5-cache/media-gfx/cairosvg-1.0.22
 2007041046 metadata/md5-cache/media-gfx/cairosvg-2.4.2
 2007041046 metadata/md5-cache/media-gfx/cptutils-1.72
 2007041046 metadata/md5-cache/media-gfx/cropgui-0.4.1
@@ -52002,7 +52920,6 @@
 2007041046 metadata/md5-cache/media-gfx/scrot-9999
 2007041046 metadata/md5-cache/media-gfx/sigal-1.3.0
 2007050309 metadata/md5-cache/media-gfx/simple-scan-3.34.6
-2007041046 metadata/md5-cache/media-gfx/slic3r-9999
 2007041046 metadata/md5-cache/media-gfx/sxiv-9999
 2007041046 metadata/md5-cache/media-gfx/termtosvg-0.7.0
 2007041046 metadata/md5-cache/media-gfx/termtosvg-0.8.0
@@ -52062,7 +52979,6 @@
 2007250041 metadata/md5-cache/media-gfx/darktable-3.0.2-r1
 2007250041 metadata/md5-cache/media-gfx/darktable-9999
 2007250041 metadata/md5-cache/media-gfx/digikam-6.4.0-r1
-2007250041 metadata/md5-cache/media-gfx/digikam-7.0.0_rc
 2007250041 metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
 2007250041 metadata/md5-cache/media-gfx/exiv2-0.27.3
 2007250041 metadata/md5-cache/media-gfx/fdm-materials-3.4.1
@@ -52093,7 +53009,6 @@
 2007250041 metadata/md5-cache/media-gfx/kxstitch-2.2.0
 2007250041 metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
 2007250041 metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
-2007250041 metadata/md5-cache/media-gfx/lximage-qt-0.15.0
 2007250041 metadata/md5-cache/media-gfx/maim-5.6.3
 2007250041 metadata/md5-cache/media-gfx/maim-9999
 2007250041 metadata/md5-cache/media-gfx/nomacs-3.14.2
@@ -52122,9 +53037,14 @@
 2007292339 metadata/md5-cache/media-gfx/graphviz-2.42.3
 2007292339 metadata/md5-cache/media-gfx/graphviz-2.44.0
 2007292339 metadata/md5-cache/media-gfx/graphviz-2.44.1
-2007301139 metadata/md5-cache/media-gfx/Manifest.gz
 2007301139 metadata/md5-cache/media-gfx/graphicsmagick-1.3.35-r1
 2007301139 metadata/md5-cache/media-gfx/graphicsmagick-9999
+2008021509 metadata/md5-cache/media-gfx/Manifest.gz
+2008020209 metadata/md5-cache/media-gfx/digikam-7.0.0
+2008021509 metadata/md5-cache/media-gfx/eog-3.36.3
+2007312039 metadata/md5-cache/media-gfx/gthumb-3.10.0
+2007311939 metadata/md5-cache/media-gfx/lximage-qt-0.15.0
+2008011409 metadata/md5-cache/media-gfx/slic3r-9999
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1806121239 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
 1805290208 metadata/md5-cache/media-libs/lastfmlib-0.4.0
@@ -52308,8 +53228,6 @@
 2006300609 metadata/md5-cache/media-libs/exiftool-12.01
 2007041046 metadata/md5-cache/media-libs/a52dec-0.7.4-r7
 2007041046 metadata/md5-cache/media-libs/aalib-1.4_rc5-r9
-2007041046 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
-2007041046 metadata/md5-cache/media-libs/alsa-lib-1.2.3.1
 2007041046 metadata/md5-cache/media-libs/alsa-oss-1.1.8
 2007041046 metadata/md5-cache/media-libs/aribb24-1.0.3-r1
 2007041046 metadata/md5-cache/media-libs/aribb24-1.0.3-r2
@@ -52388,7 +53306,6 @@
 2007041046 metadata/md5-cache/media-libs/libaacplus-2.0.2-r3
 2007041046 metadata/md5-cache/media-libs/libaacs-0.10.0
 2007041046 metadata/md5-cache/media-libs/libaacs-0.9.0
-2007041046 metadata/md5-cache/media-libs/libao-1.2.2
 2007041046 metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
 2007041046 metadata/md5-cache/media-libs/libbdplus-0.1.2
 2007041046 metadata/md5-cache/media-libs/libbdplus-9999
@@ -52437,7 +53354,6 @@
 2007041046 metadata/md5-cache/media-libs/libiptcdata-1.0.5
 2007050339 metadata/md5-cache/media-libs/libjsw-1.5.8
 2007041046 metadata/md5-cache/media-libs/libkate-0.4.1-r4
-2007041046 metadata/md5-cache/media-libs/libmad-0.15.1b-r9
 2007041046 metadata/md5-cache/media-libs/libmetalink-0.1.3-r1
 2007041046 metadata/md5-cache/media-libs/libmms-0.6.4
 2007041046 metadata/md5-cache/media-libs/libmng-2.0.3
@@ -52488,7 +53404,6 @@
 2007041046 metadata/md5-cache/media-libs/libv4l-1.18.1
 2007041046 metadata/md5-cache/media-libs/libv4l-1.6.2
 2007041046 metadata/md5-cache/media-libs/libvisio-9999
-2007041046 metadata/md5-cache/media-libs/libvisual-0.4.0-r3
 2007041046 metadata/md5-cache/media-libs/libvorbis-1.3.6-r1
 2007041046 metadata/md5-cache/media-libs/libvpx-1.7.0-r1
 2007041046 metadata/md5-cache/media-libs/libvpx-1.8.2
@@ -52502,9 +53417,7 @@
 2007041046 metadata/md5-cache/media-libs/libyami-1.3.0
 2007041046 metadata/md5-cache/media-libs/libyami-9999
 2007041046 metadata/md5-cache/media-libs/libzmf-9999
-2007041046 metadata/md5-cache/media-libs/lilv-0.24.6
 2007041046 metadata/md5-cache/media-libs/lsp-plugins-9999
-2007041046 metadata/md5-cache/media-libs/lvtk-1.2.0
 2007041046 metadata/md5-cache/media-libs/mutagen-1.43.0
 2007041046 metadata/md5-cache/media-libs/mutagen-1.44.0
 2007041046 metadata/md5-cache/media-libs/nas-1.9.4-r2
@@ -52562,9 +53475,7 @@
 2007041046 metadata/md5-cache/media-libs/zimg-9999
 2007041046 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
 2007061209 metadata/md5-cache/media-libs/libvorbis-1.3.7
-2007061209 metadata/md5-cache/media-libs/lilv-0.24.8
 2007061209 metadata/md5-cache/media-libs/opusfile-0.12
-2007081339 metadata/md5-cache/media-libs/alsa-lib-1.2.3.2
 2007091239 metadata/md5-cache/media-libs/ladspa-cmt-1.17
 2007091239 metadata/md5-cache/media-libs/ladspa-sdk-1.15
 2007100339 metadata/md5-cache/media-libs/libmikmod-3.3.11.1
@@ -52598,7 +53509,6 @@
 2007220239 metadata/md5-cache/media-libs/x264-9999
 2007220239 metadata/md5-cache/media-libs/xvid-1.3.5
 2007220239 metadata/md5-cache/media-libs/xvid-1.3.5-r1
-2007221039 metadata/md5-cache/media-libs/audiofile-0.3.6-r4
 2007230039 metadata/md5-cache/media-libs/freealut-1.1.0-r4
 2007230839 metadata/md5-cache/media-libs/gegl-0.2.0-r6
 2007230839 metadata/md5-cache/media-libs/gegl-0.3.34
@@ -52717,7 +53627,6 @@
 2007250041 metadata/md5-cache/media-libs/phonon-4.11.1-r1
 2007250041 metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
 2007250041 metadata/md5-cache/media-libs/phonon-vlc-0.11.1
-2007260409 metadata/md5-cache/media-libs/portmidi-217-r3
 2007250041 metadata/md5-cache/media-libs/ptex-2.3.2
 2007250041 metadata/md5-cache/media-libs/pulseaudio-qt-1.2
 2007250041 metadata/md5-cache/media-libs/qhull-2015.2
@@ -52773,10 +53682,22 @@
 2007301139 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
 2007301139 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4-r1
 2007301139 metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5
-2007310139 metadata/md5-cache/media-libs/Manifest.gz
 2007302309 metadata/md5-cache/media-libs/freetype-2.10.2-r1
 2007310009 metadata/md5-cache/media-libs/libao-1.2.2-r1
 2007310139 metadata/md5-cache/media-libs/osl-1.10.10
+2008021509 metadata/md5-cache/media-libs/Manifest.gz
+2008021509 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
+2008021509 metadata/md5-cache/media-libs/alsa-lib-1.2.3.1
+2008021509 metadata/md5-cache/media-libs/alsa-lib-1.2.3.2
+2008011109 metadata/md5-cache/media-libs/audiofile-0.3.6-r4
+2008011439 metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
+2008011809 metadata/md5-cache/media-libs/glm-0.9.9.8-r1
+2008021409 metadata/md5-cache/media-libs/libmad-0.15.1b-r10
+2008011239 metadata/md5-cache/media-libs/libvisual-0.4.0-r3
+2008021409 metadata/md5-cache/media-libs/lilv-0.24.6-r1
+2008021409 metadata/md5-cache/media-libs/lilv-0.24.8-r1
+2008011539 metadata/md5-cache/media-libs/lvtk-1.2.0
+2008012239 metadata/md5-cache/media-libs/portmidi-217-r3
 1702282326 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
@@ -52970,7 +53891,6 @@
 2006290109 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r1
 2007041046 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
 2007041046 metadata/md5-cache/media-plugins/alsaequal-0.7.1
-2007041046 metadata/md5-cache/media-plugins/ams-lv2-1.1.0
 2007041046 metadata/md5-cache/media-plugins/ams-lv2-1.2.1
 2007041046 metadata/md5-cache/media-plugins/audacious-plugins-9999
 2007041046 metadata/md5-cache/media-plugins/calf-9999
@@ -53119,7 +54039,6 @@
 2007041046 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.16.2
 2007050309 metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
 2007041046 metadata/md5-cache/media-plugins/gst-transcoder-1.8.2-r1
-2007041046 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
 2007041046 metadata/md5-cache/media-plugins/mda-lv2-1.2.4
 2007041046 metadata/md5-cache/media-plugins/mythplugins-30.0-r2
 2007041239 metadata/md5-cache/media-plugins/mythplugins-31.0
@@ -53308,8 +54227,6 @@
 2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.1.3
 2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
-2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-2.1.2
 2007292139 metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.1.1
@@ -53333,50 +54250,28 @@
 2007292139 metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.0
 2007292139 metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.1
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.0.5
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
-2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-6.0.0
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.1
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.1
 2007292139 metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.4.2
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
-2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.1.2
 2007292139 metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
 2007292139 metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.3.0
@@ -53400,9 +54295,41 @@
 2007292139 metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.2.0
 2007292139 metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
 2007300109 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
-2007310309 metadata/md5-cache/media-plugins/Manifest.gz
-2007310209 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
 2007310309 metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-2.1.2
+2008020439 metadata/md5-cache/media-plugins/Manifest.gz
+2008011509 metadata/md5-cache/media-plugins/ams-lv2-1.2.2
+2007312209 metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
+2007312209 metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+2007312209 metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
+2007312209 metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
+2007312209 metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
+2007312209 metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
+2007312209 metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
+2008010239 metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
+2007312209 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-6.0.5
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
+2008020439 metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
+2008020439 metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+2008011239 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
+2008011239 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002081239 metadata/md5-cache/media-radio/xdx-2.5.0
@@ -53460,7 +54387,6 @@
 1805272138 metadata/md5-cache/media-sound/bladeenc-0.94.2-r1
 1702282327 metadata/md5-cache/media-sound/chordii-4.5.1
 1702282327 metadata/md5-cache/media-sound/chordii-4.5.3
-1903242339 metadata/md5-cache/media-sound/darkice-1.3
 1702282327 metadata/md5-cache/media-sound/dcaenc-2
 1904290139 metadata/md5-cache/media-sound/fapg-0.42
 1805132239 metadata/md5-cache/media-sound/fmtools-2.0.7
@@ -53543,7 +54469,6 @@
 2006141358 metadata/md5-cache/media-sound/amsynth-1.8.0
 2006141358 metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
 2006141358 metadata/md5-cache/media-sound/audacity-2.2.2
-2006141358 metadata/md5-cache/media-sound/audacity-2.3.2
 2006141358 metadata/md5-cache/media-sound/audacity-2.3.3
 2006141358 metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
 2006141358 metadata/md5-cache/media-sound/audiocompress-2.0
@@ -53595,7 +54520,6 @@
 2006141358 metadata/md5-cache/media-sound/grip-4.1.1
 2006141358 metadata/md5-cache/media-sound/gstreamripper-0.2
 2006141358 metadata/md5-cache/media-sound/gtkguitune-0.8
-2006141358 metadata/md5-cache/media-sound/guimup-0.3.2
 2006141358 metadata/md5-cache/media-sound/herrie-2.2-r1
 2006141358 metadata/md5-cache/media-sound/horgand-1.14-r1
 2006141358 metadata/md5-cache/media-sound/id3-0.15-r1
@@ -53734,7 +54658,6 @@
 2006211639 metadata/md5-cache/media-sound/splay-0.9.5.2-r2
 2006211639 metadata/md5-cache/media-sound/streamripper-1.64.6
 2006280009 metadata/md5-cache/media-sound/ezstream-0.6.0-r1
-2006280009 metadata/md5-cache/media-sound/music-file-organizer-1.0.2
 2006290109 metadata/md5-cache/media-sound/gnump3d-3.0-r2
 2006290009 metadata/md5-cache/media-sound/gtick-0.5.5
 2006290109 metadata/md5-cache/media-sound/lltag-0.14.4-r1
@@ -53845,7 +54768,6 @@
 2007101339 metadata/md5-cache/media-sound/ecasound-2.9.3
 2007171039 metadata/md5-cache/media-sound/mpg123-1.25.13
 2007171109 metadata/md5-cache/media-sound/patchage-1.0.2
-2007220239 metadata/md5-cache/media-sound/lame-3.100-r1
 2007220239 metadata/md5-cache/media-sound/lame-3.100-r2
 2007220239 metadata/md5-cache/media-sound/mpd-0.21.22
 2007220239 metadata/md5-cache/media-sound/mpd-0.21.24
@@ -53891,7 +54813,6 @@
 2007250041 metadata/md5-cache/media-sound/pamix-1.6
 2007250041 metadata/md5-cache/media-sound/pamix-9999
 2007250041 metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
-2007250041 metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
 2007241509 metadata/md5-cache/media-sound/picard-2.3.1
 2007250041 metadata/md5-cache/media-sound/pms-0.42_p20170508
 2007250041 metadata/md5-cache/media-sound/pms-9999
@@ -53932,8 +54853,14 @@
 2007300309 metadata/md5-cache/media-sound/jack2-1.9.14
 2007301039 metadata/md5-cache/media-sound/elisa-20.04.3
 2007301909 metadata/md5-cache/media-sound/mumble-9999
-2007310039 metadata/md5-cache/media-sound/Manifest.gz
-2007310039 metadata/md5-cache/media-sound/twolame-0.4.0
+2008021609 metadata/md5-cache/media-sound/Manifest.gz
+2008021409 metadata/md5-cache/media-sound/audacity-2.4.2
+2008021539 metadata/md5-cache/media-sound/chuck-1.4.0.1
+2008021609 metadata/md5-cache/media-sound/darkice-1.3
+2007311409 metadata/md5-cache/media-sound/music-file-organizer-1.0.3
+2007311939 metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
+2008021609 metadata/md5-cache/media-sound/twolame-0.4.0
+2008021539 metadata/md5-cache/media-sound/vmpk-0.7.2
 1902221339 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
@@ -53960,7 +54887,6 @@
 2006262339 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225
 2006262339 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r2
 2007041046 metadata/md5-cache/media-tv/dtv-scan-tables-9999
-2007041239 metadata/md5-cache/media-tv/mythtv-31.0
 2007041239 metadata/md5-cache/media-tv/mythtv-31.0-r1
 2007041046 metadata/md5-cache/media-tv/plex-media-server-1.18.3
 2007041046 metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
@@ -53976,8 +54902,9 @@
 2007241509 metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r3
 2007281739 metadata/md5-cache/media-tv/kodi-18.8
 2007291039 metadata/md5-cache/media-tv/tvbrowser-bin-4.2.1
-2007292139 metadata/md5-cache/media-tv/Manifest.gz
 2007292139 metadata/md5-cache/media-tv/kodi-19.0_alpha1
+2008020139 metadata/md5-cache/media-tv/Manifest.gz
+2008020139 metadata/md5-cache/media-tv/mythtv-31.0-r2
 1702282327 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -54733,11 +55660,12 @@
 2007250041 metadata/md5-cache/net-analyzer/zmap-9999
 2007281209 metadata/md5-cache/net-analyzer/zabbix-4.0.23
 2007291309 metadata/md5-cache/net-analyzer/hydra-9.1
-2007290039 metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
 2007300439 metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
 2007301139 metadata/md5-cache/net-analyzer/zabbix-3.0.31-r1
-2007311039 metadata/md5-cache/net-analyzer/Manifest.gz
 2007311039 metadata/md5-cache/net-analyzer/barnyard-0.2.0-r6
+2008021409 metadata/md5-cache/net-analyzer/Manifest.gz
+2008011209 metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r1
+2008021409 metadata/md5-cache/net-analyzer/nfdump-1.6.21
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -54845,7 +55773,6 @@
 2006191909 metadata/md5-cache/net-dns/openresolv-3.9.0
 2006290109 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2007021239 metadata/md5-cache/net-dns/bind-tools-9.14.12
-2007021239 metadata/md5-cache/net-dns/bind-tools-9.16.3
 2007041046 metadata/md5-cache/net-dns/avahi-0.7-r2
 2007041046 metadata/md5-cache/net-dns/avahi-0.7-r4
 2007041046 metadata/md5-cache/net-dns/avahi-0.7-r5
@@ -54870,18 +55797,18 @@
 2007221109 metadata/md5-cache/net-dns/coredns-1.7.0
 2007222039 metadata/md5-cache/net-dns/libidn-1.36
 2007230739 metadata/md5-cache/net-dns/valtz-0.7-r3
-2007231439 metadata/md5-cache/net-dns/bind-9.14.12
-2007231439 metadata/md5-cache/net-dns/bind-9.16.3
-2007231439 metadata/md5-cache/net-dns/bind-9.16.4
 2007231609 metadata/md5-cache/net-dns/dnssec-root-20181220-r1
 2007250041 metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
 2007250041 metadata/md5-cache/net-dns/https_dns_proxy-9999
 2007250041 metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
 2007250041 metadata/md5-cache/net-dns/resolv_wrapper-1.1.6
 2007292009 metadata/md5-cache/net-dns/bind-tools-9.16.4
-2007311139 metadata/md5-cache/net-dns/Manifest.gz
-2007310609 metadata/md5-cache/net-dns/ddclient-3.9.1
 2007311139 metadata/md5-cache/net-dns/dnsdist-1.5.0
+2008021839 metadata/md5-cache/net-dns/Manifest.gz
+2008021839 metadata/md5-cache/net-dns/bind-9.14.12
+2008021839 metadata/md5-cache/net-dns/bind-9.16.4
+2008021839 metadata/md5-cache/net-dns/bind-9.16.5
+2008011209 metadata/md5-cache/net-dns/ddclient-3.9.1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2006141358 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -54922,10 +55849,6 @@
 2006262339 metadata/md5-cache/net-firewall/xtables-addons-3.9
 2006290109 metadata/md5-cache/net-firewall/psad-2.2.5
 2007020309 metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
-2007041046 metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
-2007041046 metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
-2007041046 metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
-2007041046 metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
 2007041046 metadata/md5-cache/net-firewall/ipt_netflow-9999
 2007041046 metadata/md5-cache/net-firewall/nftables-0.9.3-r1
 2007041046 metadata/md5-cache/net-firewall/nftables-0.9.4-r1
@@ -54934,11 +55857,13 @@
 2007041046 metadata/md5-cache/net-firewall/ufw-0.36
 2007200239 metadata/md5-cache/net-firewall/ebtables-2.0.11-r2
 2007230539 metadata/md5-cache/net-firewall/nftables-9999
-2007262139 metadata/md5-cache/net-firewall/Manifest.gz
 2007250041 metadata/md5-cache/net-firewall/itval-1.2_p20121104
 2007250041 metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
 2007262139 metadata/md5-cache/net-firewall/shorewall-5.2.6
 2007262139 metadata/md5-cache/net-firewall/shorewall-5.2.6.1
+2008020239 metadata/md5-cache/net-firewall/Manifest.gz
+2008020239 metadata/md5-cache/net-firewall/firewalld-0.7.1-r3
+2008020239 metadata/md5-cache/net-firewall/firewalld-0.7.3-r1
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.17.22.13.42
 1909212039 metadata/md5-cache/net-fs/mc-2019.07.31.19.17.35
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -54976,7 +55901,6 @@
 2007041046 metadata/md5-cache/net-fs/s3ql-2.33
 2007111909 metadata/md5-cache/net-fs/mc-2020.07.11.05.18.52
 2007161609 metadata/md5-cache/net-fs/samba-4.12.4
-2007171039 metadata/md5-cache/net-fs/nfs-utils-2.4.3
 2007182009 metadata/md5-cache/net-fs/samba-4.11.11
 2007201609 metadata/md5-cache/net-fs/davfs2-1.5.4
 2007201609 metadata/md5-cache/net-fs/davfs2-1.5.5
@@ -54984,8 +55908,9 @@
 2007250041 metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
 2007250041 metadata/md5-cache/net-fs/smbtad-1.2.6
 2007271709 metadata/md5-cache/net-fs/sshfs-3.7.0
-2007310109 metadata/md5-cache/net-fs/Manifest.gz
 2007310109 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7
+2008011109 metadata/md5-cache/net-fs/Manifest.gz
+2008011109 metadata/md5-cache/net-fs/nfs-utils-2.4.3
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
@@ -55072,7 +55997,6 @@
 2007041046 metadata/md5-cache/net-im/slack-4.3.2-r2
 2007041046 metadata/md5-cache/net-im/slack-4.4.2
 2007041046 metadata/md5-cache/net-im/slack-4.4.3
-2007041046 metadata/md5-cache/net-im/swift-4.0.2-r1
 2007041046 metadata/md5-cache/net-im/telepathy-logger-0.8.2
 2007041046 metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
 2007041046 metadata/md5-cache/net-im/toxic-0.8.2
@@ -55109,9 +56033,10 @@
 2007250041 metadata/md5-cache/net-im/vacuum-9999
 2007281739 metadata/md5-cache/net-im/ricochet-1.1.4
 2007281739 metadata/md5-cache/net-im/ricochet-9999
-2007301709 metadata/md5-cache/net-im/Manifest.gz
-2007301709 metadata/md5-cache/net-im/spectrum2-2.0.12-r3
-2007301709 metadata/md5-cache/net-im/spectrum2-2.0.13-r1
+2008012309 metadata/md5-cache/net-im/Manifest.gz
+2008012309 metadata/md5-cache/net-im/spectrum2-2.0.12-r4
+2008012309 metadata/md5-cache/net-im/spectrum2-2.0.13-r2
+2008012309 metadata/md5-cache/net-im/swift-4.0.2-r2
 1805212239 metadata/md5-cache/net-irc/dccserver-0.5-r1
 1812301839 metadata/md5-cache/net-irc/eggdrop-1.8.4
 1702282328 metadata/md5-cache/net-irc/nebula-0.5
@@ -55429,7 +56354,6 @@
 2007041046 metadata/md5-cache/net-libs/libprotoident-9999
 2007041046 metadata/md5-cache/net-libs/libqmi-9999
 2007041046 metadata/md5-cache/net-libs/libsearpc-3.0.8-r3
-2007041046 metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
 2007050309 metadata/md5-cache/net-libs/libsignon-glib-2.1
 2007041046 metadata/md5-cache/net-libs/libsrtp-1.6.0-r1
 2007041046 metadata/md5-cache/net-libs/libsrtp-2.2.0
@@ -55535,7 +56459,6 @@
 2007250041 metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
 2007250041 metadata/md5-cache/net-libs/libmirisdr-9999
 2007250041 metadata/md5-cache/net-libs/libnipper-0.12.6-r1
-2007260009 metadata/md5-cache/net-libs/libntlm-1.6
 2007250041 metadata/md5-cache/net-libs/libproxy-0.4.15-r1
 2007250041 metadata/md5-cache/net-libs/librsync-2.0.1-r1
 2007250041 metadata/md5-cache/net-libs/librsync-2.0.2
@@ -55584,7 +56507,6 @@
 2007250041 metadata/md5-cache/net-libs/tox-0.2.11
 2007250041 metadata/md5-cache/net-libs/tox-0.2.12
 2007250041 metadata/md5-cache/net-libs/tox-9999
-2007250041 metadata/md5-cache/net-libs/xrootd-4.12.0
 2007250041 metadata/md5-cache/net-libs/xrootd-4.12.3
 2007250041 metadata/md5-cache/net-libs/xrootd-5.0.0
 2007250041 metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
@@ -55599,9 +56521,12 @@
 2007301909 metadata/md5-cache/net-libs/nghttp2-1.41.0
 2007301909 metadata/md5-cache/net-libs/nghttp2-9999
 2007301109 metadata/md5-cache/net-libs/nodejs-14.7.0
-2007310039 metadata/md5-cache/net-libs/Manifest.gz
 2007310009 metadata/md5-cache/net-libs/libetpan-1.9.4-r1
 2007310009 metadata/md5-cache/net-libs/quiche-0.5.1
+2008021509 metadata/md5-cache/net-libs/Manifest.gz
+2008011109 metadata/md5-cache/net-libs/libntlm-1.6
+2008021509 metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+2008021509 metadata/md5-cache/net-libs/xrootd-4.12.0
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -55705,7 +56630,6 @@
 2006252139 metadata/md5-cache/net-mail/qmailadmin-1.2.16
 2006252139 metadata/md5-cache/net-mail/vchkuser-0.4
 2006252139 metadata/md5-cache/net-mail/vpopmail-5.4.33-r6
-2006252139 metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
 2006252139 metadata/md5-cache/net-mail/vqadmin-2.3.7
 2006262339 metadata/md5-cache/net-mail/mswatch-1.2.0-r1
 2006290109 metadata/md5-cache/net-mail/mhonarc-2.6.18-r2
@@ -55732,8 +56656,10 @@
 2007250509 metadata/md5-cache/net-mail/mailshears-0.0.4
 2007251109 metadata/md5-cache/net-mail/mailutils-3.9
 2007250141 metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r4
-2007310139 metadata/md5-cache/net-mail/Manifest.gz
 2007310139 metadata/md5-cache/net-mail/mu-1.4.10
+2008021739 metadata/md5-cache/net-mail/Manifest.gz
+2008021739 metadata/md5-cache/net-mail/rss2email-3.12
+2008010009 metadata/md5-cache/net-mail/vpopmail-5.4.33-r7
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1801071509 metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1
 1810062209 metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
@@ -55999,7 +56925,6 @@
 2006141358 metadata/md5-cache/net-misc/pps-tools-0.0.20120407
 2006141358 metadata/md5-cache/net-misc/pps-tools-1.0.1
 2006141358 metadata/md5-cache/net-misc/proxychains-4.12-r1
-2006141358 metadata/md5-cache/net-misc/proxychains-4.14
 2006141358 metadata/md5-cache/net-misc/proxytunnel-1.10.20200507
 2006141358 metadata/md5-cache/net-misc/proxytunnel-1.9.1-r2
 2006141358 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1
@@ -56224,8 +57149,6 @@
 2007041046 metadata/md5-cache/net-misc/rabbitmq-server-3.8.4
 2007041046 metadata/md5-cache/net-misc/ris-linux-0.4-r1
 2007050109 metadata/md5-cache/net-misc/rygel-0.38.4
-2007041046 metadata/md5-cache/net-misc/s3cmd-1.6.1
-2007041046 metadata/md5-cache/net-misc/s3cmd-2.0.0
 2007041046 metadata/md5-cache/net-misc/s3cmd-2.0.2
 2007041046 metadata/md5-cache/net-misc/seafile-6.2.11
 2007041046 metadata/md5-cache/net-misc/seafile-7.0.2
@@ -56262,7 +57185,6 @@
 2007152209 metadata/md5-cache/net-misc/zerotier-1.4.6
 2007170639 metadata/md5-cache/net-misc/curl-7.71.0
 2007170639 metadata/md5-cache/net-misc/curl-7.71.1
-2007171039 metadata/md5-cache/net-misc/pps-tools-1.0.2
 2007171109 metadata/md5-cache/net-misc/scponly-4.8-r7
 2007180239 metadata/md5-cache/net-misc/aria2-1.34.0-r2
 2007181739 metadata/md5-cache/net-misc/hylafaxplus-7.0.2
@@ -56340,14 +57262,16 @@
 2007242209 metadata/md5-cache/net-misc/wget-1.20.3-r3
 2007271839 metadata/md5-cache/net-misc/libteam-1.31
 2007271839 metadata/md5-cache/net-misc/libteam-9999
-2007280039 metadata/md5-cache/net-misc/openssh-8.3_p1-r4
 2007281009 metadata/md5-cache/net-misc/rsync-3.2.3_pre1
 2007281009 metadata/md5-cache/net-misc/rsync-9999
 2007301109 metadata/md5-cache/net-misc/kea-1.7.10
 2007301239 metadata/md5-cache/net-misc/youtube-dl-2020.07.28
-2007310309 metadata/md5-cache/net-misc/Manifest.gz
-2007310009 metadata/md5-cache/net-misc/rsync-3.2.2-r1
 2007310309 metadata/md5-cache/net-misc/sslh-1.21c
+2008021509 metadata/md5-cache/net-misc/Manifest.gz
+2007312209 metadata/md5-cache/net-misc/openssh-8.3_p1-r4
+2008011109 metadata/md5-cache/net-misc/pps-tools-1.0.2
+2008021509 metadata/md5-cache/net-misc/proxychains-4.14
+2008011209 metadata/md5-cache/net-misc/rsync-3.2.2-r1
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2002171109 metadata/md5-cache/net-nds/shelldap-1.5.0
@@ -56371,7 +57295,6 @@
 2007130809 metadata/md5-cache/net-nds/Manifest.gz
 1702282329 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
-2006141358 metadata/md5-cache/net-news/newsboat-2.13
 2006141358 metadata/md5-cache/net-news/quiterss-0.19.3
 2006141358 metadata/md5-cache/net-news/rssguard-3.5.9-r1
 2006141358 metadata/md5-cache/net-news/rsstail-1.8
@@ -56382,10 +57305,11 @@
 2007041046 metadata/md5-cache/net-news/quiterss-9999
 2007190239 metadata/md5-cache/net-news/liferea-1.12.7-r1
 2007190239 metadata/md5-cache/net-news/liferea-1.12.8
-2007212309 metadata/md5-cache/net-news/Manifest.gz
 2007212309 metadata/md5-cache/net-news/snownews-1.5.12-r1
 2007212309 metadata/md5-cache/net-news/snownews-1.5.13
 2007212309 metadata/md5-cache/net-news/snownews-1.6.10
+2008012239 metadata/md5-cache/net-news/Manifest.gz
+2008012239 metadata/md5-cache/net-news/newsboat-2.13
 1702282329 metadata/md5-cache/net-nntp/brag-1.4.3
 1909180009 metadata/md5-cache/net-nntp/slrn-1.0.3
 2002121952 metadata/md5-cache/net-nntp/leafnode-1.11.11
@@ -56603,7 +57527,6 @@
 2006262339 metadata/md5-cache/net-proxy/haproxy-2.1.7
 2007041046 metadata/md5-cache/net-proxy/haproxy-2.0.9999
 2007041046 metadata/md5-cache/net-proxy/hatop-0.7.7
-2007041046 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
 2007041046 metadata/md5-cache/net-proxy/polipo-9999
 2007041046 metadata/md5-cache/net-proxy/redsocks-9999
 2007041046 metadata/md5-cache/net-proxy/sshuttle-0.78.5
@@ -56622,8 +57545,9 @@
 2007250041 metadata/md5-cache/net-proxy/trojan-1.15.1
 2007250041 metadata/md5-cache/net-proxy/trojan-1.16.0
 2007250041 metadata/md5-cache/net-proxy/trojan-9999
-2007302139 metadata/md5-cache/net-proxy/Manifest.gz
 2007302139 metadata/md5-cache/net-proxy/hatop-0.8.0
+2008020739 metadata/md5-cache/net-proxy/Manifest.gz
+2008020739 metadata/md5-cache/net-proxy/mitmproxy-5.1.1
 2006141358 metadata/md5-cache/net-voip/yate-6.0.0
 2006141358 metadata/md5-cache/net-voip/yate-6.1.0
 2006141358 metadata/md5-cache/net-voip/yate-9999
@@ -56677,7 +57601,6 @@
 2006262339 metadata/md5-cache/net-vpn/vpnc-0.5.3_p550-r1
 2006262339 metadata/md5-cache/net-vpn/vtun-3.0.3
 2006262339 metadata/md5-cache/net-vpn/vtun-3.0.3-r1
-2006290009 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 2006291909 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.12
 2007041046 metadata/md5-cache/net-vpn/freelan-2.2
 2007041046 metadata/md5-cache/net-vpn/mullvad-netns-9999
@@ -56699,10 +57622,10 @@
 2007250041 metadata/md5-cache/net-vpn/i2pd-2.32.0
 2007250041 metadata/md5-cache/net-vpn/i2pd-2.32.1
 2007291939 metadata/md5-cache/net-vpn/tor-0.4.2.8
-2007301839 metadata/md5-cache/net-vpn/Manifest.gz
 2007301539 metadata/md5-cache/net-vpn/tor-0.4.4.3_alpha
-2007301839 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729
-2007301839 metadata/md5-cache/net-vpn/wireguard-modules-9999
+2007311539 metadata/md5-cache/net-vpn/Manifest.gz
+2007311539 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20200729
+2007311539 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200513
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -56826,7 +57749,6 @@
 2007092139 metadata/md5-cache/net-wireless/unifi-6.0.3
 2007161709 metadata/md5-cache/net-wireless/unifi-5.14.18
 2007161709 metadata/md5-cache/net-wireless/unifi-6.0.4
-2007191739 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
 2007230539 metadata/md5-cache/net-wireless/aircrack-ng-1.6_p20200722
 2007250041 metadata/md5-cache/net-wireless/airspy-1.0.9
 2007250041 metadata/md5-cache/net-wireless/airspy-9999
@@ -56906,7 +57828,10 @@
 2007250041 metadata/md5-cache/net-wireless/ubertooth-9999
 2007250041 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r1
 2007250041 metadata/md5-cache/net-wireless/uhd-3.15.0.0-r100
-2007280539 metadata/md5-cache/net-wireless/Manifest.gz
+2008012109 metadata/md5-cache/net-wireless/Manifest.gz
+2008012109 metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r4
+2008012109 metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
+2008011109 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -57389,7 +58314,6 @@
 2007041046 metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
 2007041046 metadata/md5-cache/sci-chemistry/nmrglue-0.7
 2007041046 metadata/md5-cache/sci-chemistry/propka-3.2.0
-2007041046 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
 2007041046 metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
 2007041046 metadata/md5-cache/sci-chemistry/vmd-1.9.3-r5
 2007250041 metadata/md5-cache/sci-chemistry/avogadro2-1.90.0_p20180211
@@ -57409,7 +58333,6 @@
 2007250041 metadata/md5-cache/sci-chemistry/openbabel-2.4.1
 2007250041 metadata/md5-cache/sci-chemistry/openbabel-2.4.1-r1
 2007250041 metadata/md5-cache/sci-chemistry/openbabel-perl-2.4.1
-2007250041 metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
 2007250041 metadata/md5-cache/sci-chemistry/pdbcat-1.3
 2007250041 metadata/md5-cache/sci-chemistry/pdbmat-3.89
 2007250041 metadata/md5-cache/sci-chemistry/tm-align-20150914
@@ -57439,7 +58362,8 @@
 2007250041 metadata/md5-cache/sci-chemistry/votca-xtp-1.6.1
 2007250041 metadata/md5-cache/sci-chemistry/votca-xtp-1.6_rc1
 2007250041 metadata/md5-cache/sci-chemistry/votca-xtp-9999
-2007282209 metadata/md5-cache/sci-chemistry/Manifest.gz
+2008021509 metadata/md5-cache/sci-chemistry/Manifest.gz
+2008021509 metadata/md5-cache/sci-chemistry/openbabel-python-2.4.1-r1
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1801270108 metadata/md5-cache/sci-electronics/iverilog-10.2
@@ -57500,7 +58424,6 @@
 2006262339 metadata/md5-cache/sci-electronics/xoscope-2.0
 2006262339 metadata/md5-cache/sci-electronics/xoscope-2.1
 2006290939 metadata/md5-cache/sci-electronics/iverilog-10.3
-2007041046 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
 2007040239 metadata/md5-cache/sci-electronics/fritzing-0.9.2b-r2
 2007041046 metadata/md5-cache/sci-electronics/iverilog-9999
 2007041046 metadata/md5-cache/sci-electronics/klayout-0.26.4-r1
@@ -57511,7 +58434,6 @@
 2007041046 metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1
 2007041046 metadata/md5-cache/sci-electronics/sigrok-cli-9999
 2007201009 metadata/md5-cache/sci-electronics/xcircuit-3.9.73
-2007250041 metadata/md5-cache/sci-electronics/Manifest.gz
 2007250041 metadata/md5-cache/sci-electronics/Stage-4.1.1
 2007250041 metadata/md5-cache/sci-electronics/Stage-4.3.0
 2007250041 metadata/md5-cache/sci-electronics/Stage-9999
@@ -57533,6 +58455,8 @@
 2007250041 metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
 2007250041 metadata/md5-cache/sci-electronics/pulseview-0.4.2
 2007250041 metadata/md5-cache/sci-electronics/pulseview-9999
+2008021509 metadata/md5-cache/sci-electronics/Manifest.gz
+2008021509 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
 1902211339 metadata/md5-cache/sci-geosciences/gdal-grass-2.1.3
 1805212239 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
 1902251809 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
@@ -57733,7 +58657,6 @@
 2006141358 metadata/md5-cache/sci-libs/colpack-1.0.10
 2006141358 metadata/md5-cache/sci-libs/cqrlib-1.1.3
 2006141358 metadata/md5-cache/sci-libs/dsdp-5.8-r3
-2006141358 metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3
 2006141358 metadata/md5-cache/sci-libs/fplll-4.0.4
 2006141358 metadata/md5-cache/sci-libs/galib-2.4.7-r1
 2006141358 metadata/md5-cache/sci-libs/gamer-1.5-r2
@@ -57862,8 +58785,6 @@
 2007041046 metadata/md5-cache/sci-libs/arpack-9999
 2007041046 metadata/md5-cache/sci-libs/blis-0.5.2
 2007041046 metadata/md5-cache/sci-libs/blis-0.6.0
-2007041046 metadata/md5-cache/sci-libs/bmrblib-1.0.3
-2007041046 metadata/md5-cache/sci-libs/bmrblib-1.0.4
 2007041046 metadata/md5-cache/sci-libs/cantera-2.4.0-r4
 2007041046 metadata/md5-cache/sci-libs/cantera-2.4.0-r5
 2007041046 metadata/md5-cache/sci-libs/cartopy-0.18.0_beta1
@@ -57890,13 +58811,6 @@
 2007041046 metadata/md5-cache/sci-libs/magma-1.4.0
 2007041046 metadata/md5-cache/sci-libs/magma-1.4.1
 2007041046 metadata/md5-cache/sci-libs/med-4.0.0-r1
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.10
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.11
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.3-r1
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.4
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.5
-2007041046 metadata/md5-cache/sci-libs/minfx-1.0.6
 2007041046 metadata/md5-cache/sci-libs/numkit-1.1.2
 2007041046 metadata/md5-cache/sci-libs/p4est-9999
 2007041046 metadata/md5-cache/sci-libs/pyshp-1.2.0
@@ -57911,7 +58825,6 @@
 2007041046 metadata/md5-cache/sci-libs/scikits_learn-0.22.2_p1
 2007041046 metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
 2007041046 metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
-2007041046 metadata/md5-cache/sci-libs/scipy-1.1.0
 2007041046 metadata/md5-cache/sci-libs/scipy-1.4.1
 2007041046 metadata/md5-cache/sci-libs/scipy-1.5.0
 2007041046 metadata/md5-cache/sci-libs/scipy-python2-1.1.0
@@ -57996,7 +58909,6 @@
 2007250041 metadata/md5-cache/sci-libs/ginkgo-1.1.1-r1
 2007250041 metadata/md5-cache/sci-libs/ginkgo-9999
 2007250041 metadata/md5-cache/sci-libs/gmsh-4.4.1
-2007251638 metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
 2007250041 metadata/md5-cache/sci-libs/hypre-2.14.0
 2007250041 metadata/md5-cache/sci-libs/hypre-2.18.0
 2007250041 metadata/md5-cache/sci-libs/hypre-2.18.2
@@ -58010,7 +58922,6 @@
 2007250041 metadata/md5-cache/sci-libs/itpp-4.3.1-r1
 2007250041 metadata/md5-cache/sci-libs/kim-api-2.1.3-r1
 2007250041 metadata/md5-cache/sci-libs/lapack-3.8.0
-2007260009 metadata/md5-cache/sci-libs/lapack-3.8.0-r1
 2007250041 metadata/md5-cache/sci-libs/lapack-reference-3.6.0
 2007250041 metadata/md5-cache/sci-libs/lapack-reference-3.7.0
 2007250041 metadata/md5-cache/sci-libs/lemon-1.3.1
@@ -58076,8 +58987,15 @@
 2007250041 metadata/md5-cache/sci-libs/votca-tools-9999
 2007250041 metadata/md5-cache/sci-libs/vtk-8.2.0
 2007250041 metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
-2007280539 metadata/md5-cache/sci-libs/Manifest.gz
-2007272209 metadata/md5-cache/sci-libs/fftw-3.3.8-r1
+2008021509 metadata/md5-cache/sci-libs/Manifest.gz
+2008021509 metadata/md5-cache/sci-libs/bmrblib-1.0.3
+2008021509 metadata/md5-cache/sci-libs/bmrblib-1.0.4
+2008010109 metadata/md5-cache/sci-libs/fflas-ffpack-2.4.3
+2008011209 metadata/md5-cache/sci-libs/fftw-3.3.8-r1
+2008011209 metadata/md5-cache/sci-libs/hdf5-1.10.5-r1
+2008011209 metadata/md5-cache/sci-libs/lapack-3.8.0-r1
+2008021509 metadata/md5-cache/sci-libs/minfx-1.0.11
+2008021509 metadata/md5-cache/sci-libs/scipy-1.1.0
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -58219,8 +59137,8 @@
 2007250041 metadata/md5-cache/sci-mathematics/wxmaxima-20.06.6
 2007250041 metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
 2007250041 metadata/md5-cache/sci-mathematics/z3-4.8.6
-2007302339 metadata/md5-cache/sci-mathematics/Manifest.gz
-2007302339 metadata/md5-cache/sci-mathematics/z3-4.8.8
+2008011209 metadata/md5-cache/sci-mathematics/Manifest.gz
+2008011209 metadata/md5-cache/sci-mathematics/z3-4.8.8
 1908291909 metadata/md5-cache/sci-misc/ViSP-images-3.2.0
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 1911262256 metadata/md5-cache/sci-misc/cdfplayer-11.2.0
@@ -59527,7 +60445,6 @@
 2006252139 metadata/md5-cache/sys-apps/ucspi-ssl-0.97
 2006252139 metadata/md5-cache/sys-apps/ucspi-ssl-0.98b
 2006252139 metadata/md5-cache/sys-apps/ucspi-ssl-0.99
-2006252139 metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
 2006252139 metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
 2006261839 metadata/md5-cache/sys-apps/yarn-1.22.4
 2006262339 metadata/md5-cache/sys-apps/cpint-2.5.3
@@ -59651,7 +60568,6 @@
 2007041046 metadata/md5-cache/sys-apps/opentmpfiles-9999
 2007041046 metadata/md5-cache/sys-apps/osinfo-db-tools-1.6.0-r1
 2007041046 metadata/md5-cache/sys-apps/pciutils-3.5.6-r1
-2007041046 metadata/md5-cache/sys-apps/pciutils-3.7.0
 2007041046 metadata/md5-cache/sys-apps/pcsc-lite-1.8.25-r1
 2007041046 metadata/md5-cache/sys-apps/pcsc-lite-1.8.26
 2007041046 metadata/md5-cache/sys-apps/pcsc-lite-1.9.0
@@ -59686,7 +60602,6 @@
 2007041046 metadata/md5-cache/sys-apps/util-linux-2.33.2
 2007041046 metadata/md5-cache/sys-apps/util-linux-2.34-r3
 2007041046 metadata/md5-cache/sys-apps/util-linux-2.35.1-r2
-2007041046 metadata/md5-cache/sys-apps/util-linux-2.35.2
 2007041046 metadata/md5-cache/sys-apps/util-linux-9999
 2007041046 metadata/md5-cache/sys-apps/x86info-1.30_p20190617
 2007062209 metadata/md5-cache/sys-apps/dtc-1.5.0
@@ -59700,7 +60615,6 @@
 2007120209 metadata/md5-cache/sys-apps/diffutils-3.7-r1
 2007120039 metadata/md5-cache/sys-apps/groff-1.22.4
 2007112309 metadata/md5-cache/sys-apps/irqbalance-1.6.0-r1
-2007102239 metadata/md5-cache/sys-apps/pciutils-3.6.4
 2007112009 metadata/md5-cache/sys-apps/usbutils-012
 2007121939 metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
 2007121939 metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
@@ -59754,9 +60668,14 @@
 2007291509 metadata/md5-cache/sys-apps/systemd-245.5
 2007292309 metadata/md5-cache/sys-apps/bubblewrap-0.4.1
 2007300309 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.7.2
-2007310209 metadata/md5-cache/sys-apps/Manifest.gz
-2007310209 metadata/md5-cache/sys-apps/hwloc-1.11.13
 2007310009 metadata/md5-cache/sys-apps/systemd-246
+2008021609 metadata/md5-cache/sys-apps/Manifest.gz
+2008021609 metadata/md5-cache/sys-apps/hwloc-1.11.13
+2008010539 metadata/md5-cache/sys-apps/pciutils-3.6.4
+2008010539 metadata/md5-cache/sys-apps/pciutils-3.7.0
+2008021509 metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
+2008012239 metadata/md5-cache/sys-apps/util-linux-2.35.2
+2008010009 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.7.1_pre
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 2001012339 metadata/md5-cache/sys-auth/pam_mount-2.16
@@ -59796,8 +60715,6 @@
 2006141358 metadata/md5-cache/sys-auth/pam_u2f-1.0.8
 2006141358 metadata/md5-cache/sys-auth/pam_yubico-2.26
 2006141358 metadata/md5-cache/sys-auth/passwdqc-1.3.0
-2006141358 metadata/md5-cache/sys-auth/polkit-0.115-r4
-2006141358 metadata/md5-cache/sys-auth/polkit-0.116-r1
 2006141358 metadata/md5-cache/sys-auth/skey-1.1.5-r11
 2006141358 metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
 2006141358 metadata/md5-cache/sys-auth/ykpers-1.19.3-r1
@@ -59855,8 +60772,11 @@
 2007250041 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
 2007250041 metadata/md5-cache/sys-auth/pam_abl-0.6.0
 2007250041 metadata/md5-cache/sys-auth/polkit-qt-0.113.0
-2007281909 metadata/md5-cache/sys-auth/Manifest.gz
 2007281909 metadata/md5-cache/sys-auth/pambase-20200304
+2008010209 metadata/md5-cache/sys-auth/Manifest.gz
+2008010209 metadata/md5-cache/sys-auth/polkit-0.115-r4
+2008010209 metadata/md5-cache/sys-auth/polkit-0.116-r1
+2008010209 metadata/md5-cache/sys-auth/polkit-0.117
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -60057,11 +60977,11 @@
 2007041046 metadata/md5-cache/sys-boot/udk-2015-r1
 2007041046 metadata/md5-cache/sys-boot/udk-2018-r1
 2007120209 metadata/md5-cache/sys-boot/systemd-boot-245
-2007132139 metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
 2007132139 metadata/md5-cache/sys-boot/plymouth-9999
-2007310739 metadata/md5-cache/sys-boot/Manifest.gz
 2007310739 metadata/md5-cache/sys-boot/lilo-24.2
 2007310039 metadata/md5-cache/sys-boot/refind-0.12.0-r1
+2007312339 metadata/md5-cache/sys-boot/Manifest.gz
+2007312339 metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
 1905311709 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r1
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
 1911101439 metadata/md5-cache/sys-cluster/onesis-2.0.2
@@ -60259,7 +61179,6 @@
 2007141909 metadata/md5-cache/sys-cluster/k9scli-0.21.2
 2007161809 metadata/md5-cache/sys-cluster/spark-bin-2.4.6
 2007201539 metadata/md5-cache/sys-cluster/corosync-2.4.2
-2007201539 metadata/md5-cache/sys-cluster/libqb-1.9.0
 2007201609 metadata/md5-cache/sys-cluster/lustre-2.13.0
 2007211839 metadata/md5-cache/sys-cluster/singularity-3.6.0
 2007250041 metadata/md5-cache/sys-cluster/ceph-12.2.12-r3
@@ -60290,8 +61209,9 @@
 2007250041 metadata/md5-cache/sys-cluster/rdma-core-9999
 2007260509 metadata/md5-cache/sys-cluster/slurm-20.02.3.1
 2007280139 metadata/md5-cache/sys-cluster/nomad-0.12.1
-2007301139 metadata/md5-cache/sys-cluster/Manifest.gz
 2007301139 metadata/md5-cache/sys-cluster/openmpi-4.0.4
+2008011109 metadata/md5-cache/sys-cluster/Manifest.gz
+2008011109 metadata/md5-cache/sys-cluster/libqb-1.9.0
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
@@ -60303,7 +61223,6 @@
 2003261841 metadata/md5-cache/sys-devel/autoconf-archive-2019.01.06
 2003261841 metadata/md5-cache/sys-devel/remake-4.2.1.1.4-r1
 2004032241 metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
-2004071339 metadata/md5-cache/sys-devel/binutils-config-5.2
 2004141039 metadata/md5-cache/sys-devel/icecream-1.0.0-r2
 2004211009 metadata/md5-cache/sys-devel/autoconf-2.13-r1
 2004211009 metadata/md5-cache/sys-devel/autoconf-2.64-r1
@@ -60410,10 +61329,6 @@
 2007152209 metadata/md5-cache/sys-devel/sparse-0.6.2
 2007152209 metadata/md5-cache/sys-devel/sparse-9999
 2007170609 metadata/md5-cache/sys-devel/binutils-config-5.3.1
-2007181809 metadata/md5-cache/sys-devel/clang-common-10.0.0
-2007181809 metadata/md5-cache/sys-devel/clang-runtime-10.0.0
-2007181809 metadata/md5-cache/sys-devel/llvm-common-10.0.0
-2007181809 metadata/md5-cache/sys-devel/llvmgold-10
 2007212239 metadata/md5-cache/sys-devel/clang-common-10.0.1
 2007212239 metadata/md5-cache/sys-devel/clang-runtime-10.0.1
 2007212239 metadata/md5-cache/sys-devel/llvm-common-10.0.1
@@ -60422,18 +61337,15 @@
 2007252109 metadata/md5-cache/sys-devel/binutils-9999
 2007252109 metadata/md5-cache/sys-devel/binutils-hppa64-2.35
 2007271109 metadata/md5-cache/sys-devel/bison-3.7
-2007250041 metadata/md5-cache/sys-devel/clang-10.0.0
 2007250041 metadata/md5-cache/sys-devel/clang-10.0.1
 2007250041 metadata/md5-cache/sys-devel/clang-11.0.0.9999
 2007250041 metadata/md5-cache/sys-devel/clang-12.0.0.9999
 2007250041 metadata/md5-cache/sys-devel/clang-9.0.1
 2007271109 metadata/md5-cache/sys-devel/gettext-0.21
-2007250041 metadata/md5-cache/sys-devel/lld-10.0.0
 2007250041 metadata/md5-cache/sys-devel/lld-10.0.1
 2007250041 metadata/md5-cache/sys-devel/lld-11.0.0.9999
 2007250041 metadata/md5-cache/sys-devel/lld-12.0.0.9999
 2007250041 metadata/md5-cache/sys-devel/lld-9.0.1
-2007250041 metadata/md5-cache/sys-devel/llvm-10.0.0
 2007250041 metadata/md5-cache/sys-devel/llvm-10.0.1
 2007250041 metadata/md5-cache/sys-devel/llvm-11.0.0.9999
 2007250041 metadata/md5-cache/sys-devel/llvm-12.0.0.9999
@@ -60449,8 +61361,6 @@
 2007250041 metadata/md5-cache/sys-devel/llvm-roc-3.5.0
 2007250041 metadata/md5-cache/sys-devel/llvm-roc-3.5.1
 2007250041 metadata/md5-cache/sys-devel/llvm-roc-3.6.0
-2007282039 metadata/md5-cache/sys-devel/binutils-config-5.3.2
-2007282039 metadata/md5-cache/sys-devel/gcc-config-2.3.1
 2007291339 metadata/md5-cache/sys-devel/clang-11.0.0_rc1
 2007291339 metadata/md5-cache/sys-devel/clang-common-11.0.0_rc1
 2007291339 metadata/md5-cache/sys-devel/clang-runtime-11.0.0_rc1
@@ -60458,41 +61368,53 @@
 2007291339 metadata/md5-cache/sys-devel/lld-11.0.0_rc1
 2007291339 metadata/md5-cache/sys-devel/llvm-11.0.0_rc1
 2007291339 metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc1
-2007292009 metadata/md5-cache/sys-devel/bison-3.6.4
 2007302009 metadata/md5-cache/sys-devel/crossdev-20200326
-2007310139 metadata/md5-cache/sys-devel/Manifest.gz
-2007310039 metadata/md5-cache/sys-devel/gcc-10.1.0-r2
-2007310039 metadata/md5-cache/sys-devel/gcc-10.2.0
-2007310039 metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
-2007310039 metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
-2007310039 metadata/md5-cache/sys-devel/gcc-4.9.4-r1
-2007310039 metadata/md5-cache/sys-devel/gcc-5.5.0
-2007310039 metadata/md5-cache/sys-devel/gcc-6.5.0-r1
-2007310039 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
-2007310039 metadata/md5-cache/sys-devel/gcc-6.5.0-r3
-2007310039 metadata/md5-cache/sys-devel/gcc-7.5.0
-2007310039 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
-2007310039 metadata/md5-cache/sys-devel/gcc-8.4.0
-2007310039 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
-2007310039 metadata/md5-cache/sys-devel/gcc-9.2.0-r2
-2007310039 metadata/md5-cache/sys-devel/gcc-9.2.0-r4
-2007310039 metadata/md5-cache/sys-devel/gcc-9.3.0
-2007310039 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
-2007310039 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
-2007310039 metadata/md5-cache/sys-devel/kgcc64-10.1.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-10.2.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-4.9.4
-2007310039 metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
-2007310039 metadata/md5-cache/sys-devel/kgcc64-5.4.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-5.5.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-6.4.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-6.5.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-7.3.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-7.5.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-8.3.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-8.4.0
-2007310039 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
-2007310039 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+2008012309 metadata/md5-cache/sys-devel/Manifest.gz
+2007311939 metadata/md5-cache/sys-devel/binutils-2.34-r2
+2008011209 metadata/md5-cache/sys-devel/binutils-config-5.3.2
+2007311939 metadata/md5-cache/sys-devel/binutils-hppa64-2.34-r2
+2008011239 metadata/md5-cache/sys-devel/bison-3.6.4
+2008010139 metadata/md5-cache/sys-devel/clang-10.0.0
+2008010139 metadata/md5-cache/sys-devel/clang-common-10.0.0
+2008010139 metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+2008012309 metadata/md5-cache/sys-devel/crossdev-20200801
+2008010009 metadata/md5-cache/sys-devel/gcc-10.1.0-r2
+2008010009 metadata/md5-cache/sys-devel/gcc-10.2.0
+2008010009 metadata/md5-cache/sys-devel/gcc-10.2.1_pre9999
+2008010009 metadata/md5-cache/sys-devel/gcc-11.0.0_pre9999
+2008011639 metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+2008010009 metadata/md5-cache/sys-devel/gcc-5.5.0
+2008010009 metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+2008010009 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
+2008010009 metadata/md5-cache/sys-devel/gcc-6.5.0-r3
+2008010009 metadata/md5-cache/sys-devel/gcc-7.5.0
+2008010009 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
+2008010009 metadata/md5-cache/sys-devel/gcc-8.4.0
+2008010009 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
+2008010009 metadata/md5-cache/sys-devel/gcc-9.2.0-r2
+2008010009 metadata/md5-cache/sys-devel/gcc-9.2.0-r4
+2008010009 metadata/md5-cache/sys-devel/gcc-9.3.0
+2008010009 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+2008010009 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+2008011209 metadata/md5-cache/sys-devel/gcc-config-2.3.1
+2008010009 metadata/md5-cache/sys-devel/kgcc64-10.1.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-10.2.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-4.9.4
+2008010009 metadata/md5-cache/sys-devel/kgcc64-4.9.4-r1
+2008010009 metadata/md5-cache/sys-devel/kgcc64-5.4.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-5.5.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-6.4.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-6.5.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-7.3.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-7.5.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-8.3.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-8.4.0
+2008010009 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r1
+2008010009 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+2008010139 metadata/md5-cache/sys-devel/lld-10.0.0
+2008010139 metadata/md5-cache/sys-devel/llvm-10.0.0
+2008010139 metadata/md5-cache/sys-devel/llvm-common-10.0.0
+2008010139 metadata/md5-cache/sys-devel/llvmgold-10
 2006141358 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2006141358 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2006141358 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -60616,7 +61538,6 @@
 1911181009 metadata/md5-cache/sys-fs/archivemount-0.8.12
 1911170939 metadata/md5-cache/sys-fs/rar2fs-1.28.0
 1911262256 metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130
-1912070409 metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
 1912110241 metadata/md5-cache/sys-fs/tmsu-0.6.1
 1912110241 metadata/md5-cache/sys-fs/tmsu-0.7.0
 1912111540 metadata/md5-cache/sys-fs/unionfs-fuse-1.0
@@ -60745,11 +61666,9 @@
 2006262339 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r3
 2006262339 metadata/md5-cache/sys-fs/ntfs3g-2017.3.23.5
 2006262339 metadata/md5-cache/sys-fs/udisks-2.8.4
-2006262339 metadata/md5-cache/sys-fs/udisks-2.9.0
 2006262339 metadata/md5-cache/sys-fs/vhba-20200106
 2006262339 metadata/md5-cache/sys-fs/zfs-kmod-0.8.4
 2006290109 metadata/md5-cache/sys-fs/ddrescue-1.24
-2006290109 metadata/md5-cache/sys-fs/ddrescue-1.25
 2006290009 metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
 2006290009 metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
 2007022009 metadata/md5-cache/sys-fs/lsscsi-0.31
@@ -60806,7 +61725,6 @@
 2007250041 metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
 2007250041 metadata/md5-cache/sys-fs/cryfs-0.10.2
 2007250041 metadata/md5-cache/sys-fs/dfc-3.1.1
-2007251439 metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
 2007250041 metadata/md5-cache/sys-fs/dislocker-0.7.1-r2
 2007250041 metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201-r1
 2007250041 metadata/md5-cache/sys-fs/encfs-1.9.5
@@ -60817,11 +61735,15 @@
 2007250041 metadata/md5-cache/sys-fs/shake-1.0
 2007251209 metadata/md5-cache/sys-fs/xfsprogs-5.7.0
 2007241139 metadata/md5-cache/sys-fs/xwmfs-0.86
-2007271909 metadata/md5-cache/sys-fs/Manifest.gz
 2007271809 metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
 2007271809 metadata/md5-cache/sys-fs/dislocker-9999
 2007271909 metadata/md5-cache/sys-fs/unionfs-fuse-2.1
 2007271909 metadata/md5-cache/sys-fs/unionfs-fuse-9999
+2008021509 metadata/md5-cache/sys-fs/Manifest.gz
+2008021509 metadata/md5-cache/sys-fs/ddrescue-1.25
+2008011209 metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r3
+2008011209 metadata/md5-cache/sys-fs/udisks-2.9.0
+2007312239 metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4
 1803241538 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.6-r1
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-3789.70.16-r5
 1912251739 metadata/md5-cache/sys-kernel/xnu-headers-4570.71.2-r5
@@ -60946,18 +61868,10 @@
 2007161639 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.9
 2007181939 metadata/md5-cache/sys-kernel/bliss-initramfs-8.1.0-r1
 2007181939 metadata/md5-cache/sys-kernel/bliss-initramfs-9.1.0
-2007190009 metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
-2007190009 metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
-2007190009 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
-2007190009 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
-2007190009 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
-2007190009 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
 2007180639 metadata/md5-cache/sys-kernel/mips-sources-4.14.188
 2007180639 metadata/md5-cache/sys-kernel/mips-sources-4.19.133
 2007180639 metadata/md5-cache/sys-kernel/mips-sources-4.4.230
 2007180639 metadata/md5-cache/sys-kernel/mips-sources-4.9.230
-2007190009 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
-2007190009 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
 2007200909 metadata/md5-cache/sys-kernel/git-sources-5.8_rc6
 2007221739 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.189
 2007221739 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.134
@@ -60971,28 +61885,48 @@
 2007221639 metadata/md5-cache/sys-kernel/linux-firmware-20200619
 2007221639 metadata/md5-cache/sys-kernel/linux-firmware-20200721
 2007221639 metadata/md5-cache/sys-kernel/linux-firmware-99999999
-2007221239 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.231
-2007221239 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.231
 2007250539 metadata/md5-cache/sys-kernel/genkernel-4.0.10
 2007250539 metadata/md5-cache/sys-kernel/genkernel-4.1.0_beta1
 2007250539 metadata/md5-cache/sys-kernel/genkernel-9999
-2007241509 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53
-2007241509 metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10
-2007241509 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53
-2007241509 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10
 2007270139 metadata/md5-cache/sys-kernel/git-sources-5.8_rc7
 2007250839 metadata/md5-cache/sys-kernel/pf-sources-5.7_p5
-2007241509 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53
-2007241509 metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10
 2007291639 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.190
 2007291639 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.135
 2007291639 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.54
 2007291639 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.11
-2007290909 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.190
-2007291639 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.135
-2007291639 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.54
-2007291639 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.11
-2007300839 metadata/md5-cache/sys-kernel/Manifest.gz
+2008011809 metadata/md5-cache/sys-kernel/Manifest.gz
+2008011639 metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+2008011639 metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.40
+2008011709 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.53
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.55
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.10
+2008011809 metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.12
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.40
+2008011709 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.53
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.55
+2008011639 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.10
+2008011809 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.12
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.191
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.136
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.232
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.232
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.55
+2007312209 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.12
+2008011639 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.40
+2008011639 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
+2008011639 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.53
+2008011639 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.55
+2008011639 metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.10
+2008011809 metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.12
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.191
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.136
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.232
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.232
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.55
+2008010109 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.12
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908230439 metadata/md5-cache/sys-libs/freeipmi-1.6.4
@@ -61049,7 +61983,6 @@
 2006141358 metadata/md5-cache/sys-libs/pwdb-0.62-r1
 2006141358 metadata/md5-cache/sys-libs/rpmatch-standalone-1.0
 2006141358 metadata/md5-cache/sys-libs/suacomp-0.6.14
-2006141358 metadata/md5-cache/sys-libs/timezone-data-2020a
 2006141358 metadata/md5-cache/sys-libs/uclibc-ng-1.0.30-r1
 2006141358 metadata/md5-cache/sys-libs/uclibc-ng-1.0.32
 2006141358 metadata/md5-cache/sys-libs/uclibc-ng-1.0.33
@@ -61144,29 +62077,22 @@
 2007232309 metadata/md5-cache/sys-libs/libseccomp-2.5.0
 2007232309 metadata/md5-cache/sys-libs/libseccomp-9999
 2007252109 metadata/md5-cache/sys-libs/binutils-libs-2.35
-2007250041 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
 2007250041 metadata/md5-cache/sys-libs/compiler-rt-10.0.1
 2007250041 metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
 2007250041 metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
 2007250041 metadata/md5-cache/sys-libs/compiler-rt-9.0.1
-2007250041 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
 2007250041 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
 2007250041 metadata/md5-cache/sys-libs/kpmcore-4.1.0
-2007260909 metadata/md5-cache/sys-libs/libblockdev-2.24
 2007260039 metadata/md5-cache/sys-libs/libcap-2.41
-2007250041 metadata/md5-cache/sys-libs/libcxx-10.0.0
 2007250041 metadata/md5-cache/sys-libs/libcxx-10.0.1
 2007250041 metadata/md5-cache/sys-libs/libcxx-9.0.1
-2007250041 metadata/md5-cache/sys-libs/libcxxabi-10.0.0
 2007250041 metadata/md5-cache/sys-libs/libcxxabi-10.0.1
 2007250041 metadata/md5-cache/sys-libs/libcxxabi-9.0.1
-2007250041 metadata/md5-cache/sys-libs/libomp-10.0.0
 2007250041 metadata/md5-cache/sys-libs/libomp-10.0.1
 2007250041 metadata/md5-cache/sys-libs/libomp-11.0.0.9999
 2007250041 metadata/md5-cache/sys-libs/libomp-12.0.0.9999
 2007250041 metadata/md5-cache/sys-libs/libomp-9.0.1
 2007261509 metadata/md5-cache/sys-libs/libosinfo-1.8.0
-2007250041 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
 2007250041 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
 2007250041 metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
 2007250041 metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
@@ -61195,7 +62121,16 @@
 2007301709 metadata/md5-cache/sys-libs/libcap-ng-0.7.10
 2007301209 metadata/md5-cache/sys-libs/readline-6.3_p8-r3
 2007301209 metadata/md5-cache/sys-libs/readline-7.0_p5-r1
-2007310139 metadata/md5-cache/sys-libs/Manifest.gz
+2008021839 metadata/md5-cache/sys-libs/Manifest.gz
+2007311939 metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
+2008010139 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+2008010139 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+2008011209 metadata/md5-cache/sys-libs/libblockdev-2.24
+2008010139 metadata/md5-cache/sys-libs/libcxx-10.0.0
+2008010139 metadata/md5-cache/sys-libs/libcxxabi-10.0.0
+2008010139 metadata/md5-cache/sys-libs/libomp-10.0.0
+2008010139 metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0
+2008021839 metadata/md5-cache/sys-libs/timezone-data-2020a
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -61416,7 +62351,6 @@
 2004062109 metadata/md5-cache/virtual/mysql-5.6-r13
 2004211009 metadata/md5-cache/virtual/awk-1
 2004211009 metadata/md5-cache/virtual/checkpassword-0
-2004211009 metadata/md5-cache/virtual/cron-0-r1
 2004211009 metadata/md5-cache/virtual/daemontools-0
 2004211009 metadata/md5-cache/virtual/eject-0-r1
 2004211009 metadata/md5-cache/virtual/emacs-25
@@ -61431,28 +62365,15 @@
 2004211009 metadata/md5-cache/virtual/package-manager-1
 2004211009 metadata/md5-cache/virtual/pager-0
 2004211009 metadata/md5-cache/virtual/perl-CPAN-2.220.0
-2004211009 metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r3
-2004211009 metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r5
-2004211009 metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r5
 2004211009 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.84.0
 2004211009 metadata/md5-cache/virtual/perl-DB_File-1.843.0
-2004211009 metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0
 2004211009 metadata/md5-cache/virtual/perl-Devel-PPPort-3.520.0
-2004211009 metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r9
 2004211009 metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0-r2
-2004211009 metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0
 2004211009 metadata/md5-cache/virtual/perl-Dumpvalue-1.180.0-r5
 2004211009 metadata/md5-cache/virtual/perl-Encode-3.10.0
 2004211009 metadata/md5-cache/virtual/perl-Exporter-5.730.0-r2
 2004211009 metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.231
-2004211009 metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r2
-2004211009 metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r2
 2004211009 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r2
-2004211009 metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0
-2004211009 metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0
-2004211009 metadata/md5-cache/virtual/perl-File-Path-2.160.0
-2004211009 metadata/md5-cache/virtual/perl-File-Spec-3.780.0
-2004211009 metadata/md5-cache/virtual/perl-File-Temp-0.230.900
 2004211009 metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r2
 2004211009 metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r2
 2004211009 metadata/md5-cache/virtual/perl-HTTP-Tiny-0.76.0
@@ -61569,17 +62490,8 @@
 2007041046 metadata/md5-cache/virtual/mpi-2.0-r5
 2007041046 metadata/md5-cache/virtual/opencl-3-r1
 2007041046 metadata/md5-cache/virtual/opengl-7.0-r2
-2007041046 metadata/md5-cache/virtual/python-backports_abc-0
 2007041046 metadata/md5-cache/virtual/python-cffi-0
-2007041046 metadata/md5-cache/virtual/python-enum34-2
-2007041046 metadata/md5-cache/virtual/python-funcsigs-2-r1
-2007041046 metadata/md5-cache/virtual/python-futures-1
 2007041046 metadata/md5-cache/virtual/python-greenlet-1.0-r1
-2007041046 metadata/md5-cache/virtual/python-ipaddress-1.0-r1
-2007041046 metadata/md5-cache/virtual/python-singledispatch-0
-2007041046 metadata/md5-cache/virtual/python-typing-0-r1
-2007041046 metadata/md5-cache/virtual/python-unittest-mock-1
-2007132009 metadata/md5-cache/virtual/python-pathlib-1.0
 2007171009 metadata/md5-cache/virtual/rust-1.45.0
 2007182339 metadata/md5-cache/virtual/perl-Archive-Tar-2.360.0
 2007182339 metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r3
@@ -61594,9 +62506,34 @@
 2007231639 metadata/md5-cache/virtual/perl-Time-Piece-1.330.0
 2007290039 metadata/md5-cache/virtual/gsasl-2
 2007290039 metadata/md5-cache/virtual/podofo-build-0.9.6
-2007311239 metadata/md5-cache/virtual/Manifest.gz
 2007310009 metadata/md5-cache/virtual/cblas-3.8
 2007311239 metadata/md5-cache/virtual/rust-1.45.1
+2008020039 metadata/md5-cache/virtual/Manifest.gz
+2007311609 metadata/md5-cache/virtual/cron-0-r2
+2008010039 metadata/md5-cache/virtual/perl-CPAN-2.270.0
+2008010039 metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r4
+2008010039 metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.140.0-r6
+2008010039 metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.18.0-r6
+2008010039 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.93.0
+2008010039 metadata/md5-cache/virtual/perl-DB_File-1.853.0
+2008010039 metadata/md5-cache/virtual/perl-Data-Dumper-2.174.0-r1
+2008010039 metadata/md5-cache/virtual/perl-Devel-PPPort-3.570.0
+2008010039 metadata/md5-cache/virtual/perl-Digest-1.170.100_rc-r10
+2008010039 metadata/md5-cache/virtual/perl-Digest-MD5-2.550.100_rc
+2008020039 metadata/md5-cache/virtual/perl-Digest-SHA-6.20.0-r1
+2008020039 metadata/md5-cache/virtual/perl-Dumpvalue-1.210.0
+2008020039 metadata/md5-cache/virtual/perl-Encode-3.60.0
+2008020039 metadata/md5-cache/virtual/perl-Exporter-5.740.0
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.234
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r3
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r3
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.440.0
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-Manifest-1.720.0-r1
+2008020039 metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.400.0-r1
+2008020039 metadata/md5-cache/virtual/perl-File-Path-2.160.0-r1
+2008020039 metadata/md5-cache/virtual/perl-File-Spec-3.780.0-r1
+2008020039 metadata/md5-cache/virtual/perl-File-Temp-0.230.900
+2008020039 metadata/md5-cache/virtual/perl-Filter-Simple-0.960.0
 1907262139 metadata/md5-cache/www-apache/mod_authnz_external-3.3.3
 1909061809 metadata/md5-cache/www-apache/mod_authz_unixgroup-1.1.0
 1808151104 metadata/md5-cache/www-apache/mod_fastcgi_handler-0.6-r1
@@ -61654,14 +62591,14 @@
 2007041046 metadata/md5-cache/www-apache/mod_authnz_external-9999
 2007041046 metadata/md5-cache/www-apache/mod_authz_unixgroup-9999
 2007041046 metadata/md5-cache/www-apache/mod_h2-9999
-2007041046 metadata/md5-cache/www-apache/mod_wsgi-4.5.13
-2007041046 metadata/md5-cache/www-apache/mod_wsgi-4.6.5
-2007041046 metadata/md5-cache/www-apache/mod_wsgi-4.7.0
 2007041046 metadata/md5-cache/www-apache/modsec-flameeyes-99999999
 2007082139 metadata/md5-cache/www-apache/mod_h2-1.15.12
 2007132039 metadata/md5-cache/www-apache/mod_h2-1.15.13
 2007161009 metadata/md5-cache/www-apache/passenger-6.0.6
-2007221309 metadata/md5-cache/www-apache/Manifest.gz
+2008021509 metadata/md5-cache/www-apache/Manifest.gz
+2008021509 metadata/md5-cache/www-apache/mod_wsgi-4.5.13
+2008021509 metadata/md5-cache/www-apache/mod_wsgi-4.6.5
+2008021509 metadata/md5-cache/www-apache/mod_wsgi-4.7.0
 1903221339 metadata/md5-cache/www-apps/airdcpp-webui-2.6.0
 1905211209 metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
 1906051110 metadata/md5-cache/www-apps/cgp-1_p20181209
@@ -61757,15 +62694,6 @@
 2007041046 metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-9999
 2007041046 metadata/md5-cache/www-apps/klaus-1.5.1
 2007041046 metadata/md5-cache/www-apps/klaus-1.5.2
-2007041046 metadata/md5-cache/www-apps/netbox-2.5.11
-2007041046 metadata/md5-cache/www-apps/netbox-2.5.12
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.1
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.12
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.4
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.5
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.6
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.7
-2007041046 metadata/md5-cache/www-apps/netbox-2.6.8
 2007041046 metadata/md5-cache/www-apps/netbox-2.7.2
 2007041046 metadata/md5-cache/www-apps/netbox-2.7.6
 2007041046 metadata/md5-cache/www-apps/netbox-2.7.8
@@ -61813,14 +62741,14 @@
 2007271339 metadata/md5-cache/www-apps/nextcloud-17.0.8
 2007271339 metadata/md5-cache/www-apps/nextcloud-18.0.7
 2007271339 metadata/md5-cache/www-apps/nextcloud-19.0.1
-2007302139 metadata/md5-cache/www-apps/Manifest.gz
 2007302139 metadata/md5-cache/www-apps/kibana-bin-6.8.11
 2007302139 metadata/md5-cache/www-apps/kibana-bin-7.8.1
+2008020009 metadata/md5-cache/www-apps/Manifest.gz
+2008020009 metadata/md5-cache/www-apps/bugzilla-5.0.6
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2002231739 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre4
 2006141358 metadata/md5-cache/www-client/dillo-3.0.5
-2006141358 metadata/md5-cache/www-client/dillo-3.0.5-r3
 2006141358 metadata/md5-cache/www-client/dillo-3.1_p20181005
 2006141358 metadata/md5-cache/www-client/dillo-9999
 2006141358 metadata/md5-cache/www-client/elinks-0.12_pre6-r4
@@ -61868,7 +62796,6 @@
 2007191409 metadata/md5-cache/www-client/netsurf-3.10-r2
 2007202109 metadata/md5-cache/www-client/opera-developer-71.0.3756.0
 2007221939 metadata/md5-cache/www-client/opera-beta-70.0.3728.59
-2007262009 metadata/md5-cache/www-client/chromium-85.0.4183.39
 2007262009 metadata/md5-cache/www-client/chromium-86.0.4209.2
 2007250041 metadata/md5-cache/www-client/falkon-3.1.0-r1
 2007250041 metadata/md5-cache/www-client/midori-9.0
@@ -61886,8 +62813,10 @@
 2007302109 metadata/md5-cache/www-client/google-chrome-beta-85.0.4183.49
 2007302109 metadata/md5-cache/www-client/google-chrome-unstable-86.0.4214.2
 2007301109 metadata/md5-cache/www-client/vivaldi-snapshot-3.2.1967.38_p1
-2007310439 metadata/md5-cache/www-client/Manifest.gz
 2007302339 metadata/md5-cache/www-client/firefox-68.11.0
+2008021509 metadata/md5-cache/www-client/Manifest.gz
+2007312309 metadata/md5-cache/www-client/chromium-85.0.4183.48
+2008021509 metadata/md5-cache/www-client/dillo-3.0.5-r3
 1808151104 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -61928,15 +62857,14 @@
 2006290109 metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
 2006290109 metadata/md5-cache/www-plugins/google-talkplugin-5.41.3.0
 2006290109 metadata/md5-cache/www-plugins/google-talkplugin-9999
-2007041046 metadata/md5-cache/www-plugins/passff-host-1.2.1
-2007041046 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
 2007141139 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.403
 2007250041 metadata/md5-cache/www-plugins/freshplayerplugin-0.3.9-r1
 2007250041 metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
 2007282039 metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.105
-2007302109 metadata/md5-cache/www-plugins/Manifest.gz
 2007302109 metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.49_beta
 2007302109 metadata/md5-cache/www-plugins/chrome-binary-plugins-86.0.4214.2_alpha
+2008010139 metadata/md5-cache/www-plugins/Manifest.gz
+2008010139 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 1802271938 metadata/md5-cache/www-servers/pshs-0.3.3
 2006041239 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -61968,7 +62896,6 @@
 2007041046 metadata/md5-cache/www-servers/tornado-4.5.3
 2007041046 metadata/md5-cache/www-servers/tornado-5.1-r1
 2007041046 metadata/md5-cache/www-servers/tornado-6.0.3
-2007041046 metadata/md5-cache/www-servers/uwsgi-2.0.18
 2007041046 metadata/md5-cache/www-servers/varnish-6.0.6
 2007041046 metadata/md5-cache/www-servers/varnish-6.3.2
 2007041046 metadata/md5-cache/www-servers/varnish-6.4.0
@@ -61991,8 +62918,9 @@
 2007270339 metadata/md5-cache/www-servers/civetweb-1.12
 2007250041 metadata/md5-cache/www-servers/h2o-2.2.6
 2007250041 metadata/md5-cache/www-servers/h2o-9999
-2007282139 metadata/md5-cache/www-servers/Manifest.gz
 2007282139 metadata/md5-cache/www-servers/cherokee-1.2.104-r2
+2008021509 metadata/md5-cache/www-servers/Manifest.gz
+2008021509 metadata/md5-cache/www-servers/uwsgi-2.0.18
 2004032241 metadata/md5-cache/x11-apps/luit-20190106
 2006141358 metadata/md5-cache/x11-apps/amlc-0.5.1
 2006141358 metadata/md5-cache/x11-apps/appres-1.0.5
@@ -62134,8 +63062,6 @@
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-ati-9999
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
-2007291239 metadata/md5-cache/x11-drivers/Manifest.gz
-2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r2
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
@@ -62143,6 +63069,8 @@
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r5
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-440.100-r1
 2007291239 metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
+2008011009 metadata/md5-cache/x11-drivers/Manifest.gz
+2008011009 metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
 1702282335 metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5
 1705241709 metadata/md5-cache/x11-libs/liboglappth-1.0.0
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-0.2.1
@@ -62306,17 +63234,12 @@
 2007100039 metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1
 2007131109 metadata/md5-cache/x11-libs/fltk-1.3.5-r4
 2007152009 metadata/md5-cache/x11-libs/libQGLViewer-2.7.2
-2007211239 metadata/md5-cache/x11-libs/cairo-1.16.0-r4
-2007211239 metadata/md5-cache/x11-libs/libdrm-2.4.102
-2007211239 metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1
-2007250041 metadata/md5-cache/x11-libs/Manifest.gz
 2007250041 metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
 2007250041 metadata/md5-cache/x11-libs/gl2ps-1.3.9
 2007250041 metadata/md5-cache/x11-libs/gl2ps-1.4.0
 2007250041 metadata/md5-cache/x11-libs/gl2ps-1.4.2
 2007250041 metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r2
 2007250041 metadata/md5-cache/x11-libs/libfm-qt-0.15.1
-2007250041 metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
 2007250041 metadata/md5-cache/x11-libs/libva-intel-media-driver-18.3.0
 2007250041 metadata/md5-cache/x11-libs/libva-intel-media-driver-18.4.1
 2007250041 metadata/md5-cache/x11-libs/libva-intel-media-driver-20.1.1
@@ -62331,6 +63254,12 @@
 2007250041 metadata/md5-cache/x11-libs/qtermwidget-9999
 2007250041 metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
 2007250041 metadata/md5-cache/x11-libs/tslib-1.21
+2007312309 metadata/md5-cache/x11-libs/Manifest.gz
+2007312109 metadata/md5-cache/x11-libs/cairo-1.16.0-r4
+2007312309 metadata/md5-cache/x11-libs/libX11-1.6.10
+2007312109 metadata/md5-cache/x11-libs/libdrm-2.4.102
+2007311939 metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
+2007312109 metadata/md5-cache/x11-libs/libxkbcommon-0.10.0-r1
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bbcd-0.3.1-r2
@@ -62727,7 +63656,6 @@
 2007211609 metadata/md5-cache/x11-misc/qt5ct-1.1
 2007211339 metadata/md5-cache/x11-misc/xkbd-0.8.18
 2007211339 metadata/md5-cache/x11-misc/xkbd-999999
-2007211239 metadata/md5-cache/x11-misc/xkeyboard-config-2.30
 2007220939 metadata/md5-cache/x11-misc/xlockmore-5.65
 2007231109 metadata/md5-cache/x11-misc/xdg-utils-1.1.3-r1
 2007231139 metadata/md5-cache/x11-misc/xscreensaver-5.38-r1
@@ -62743,9 +63671,7 @@
 2007250041 metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17
 2007250041 metadata/md5-cache/x11-misc/kronometer-2.2.3
 2007250041 metadata/md5-cache/x11-misc/obconf-qt-0.14.1
-2007250041 metadata/md5-cache/x11-misc/obconf-qt-0.15.0
 2007250041 metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
-2007250041 metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
 2007250041 metadata/md5-cache/x11-misc/polybar-3.4.2-r1
 2007250041 metadata/md5-cache/x11-misc/polybar-3.4.3
 2007250041 metadata/md5-cache/x11-misc/projecteur-0.7-r2
@@ -62755,7 +63681,6 @@
 2007250041 metadata/md5-cache/x11-misc/qlipper-5.1.2
 2007250041 metadata/md5-cache/x11-misc/qps-1.10.20
 2007250041 metadata/md5-cache/x11-misc/qps-2.0.0
-2007250041 metadata/md5-cache/x11-misc/qps-2.1.0-r1
 2007250041 metadata/md5-cache/x11-misc/qterm-0.7.1
 2007250041 metadata/md5-cache/x11-misc/qterm-0.7.3
 2007250041 metadata/md5-cache/x11-misc/qtfm-99999
@@ -62785,10 +63710,15 @@
 2007252109 metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r1
 2007250041 metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
 2007241039 metadata/md5-cache/x11-misc/zim-0.73.2
-2007272209 metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
-2007300439 metadata/md5-cache/x11-misc/Manifest.gz
-2007300439 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3
 2007300339 metadata/md5-cache/x11-misc/xsettingsd-1.0.0
+2008020209 metadata/md5-cache/x11-misc/Manifest.gz
+2008020209 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3
+2007311939 metadata/md5-cache/x11-misc/obconf-qt-0.15.0
+2007311939 metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
+2007311939 metadata/md5-cache/x11-misc/qps-2.1.0-r1
+2008011209 metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220
+2007312109 metadata/md5-cache/x11-misc/xkeyboard-config-2.30
+2008011139 metadata/md5-cache/x11-misc/xmobar-0.35.1
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -63050,15 +63980,15 @@
 2007050309 metadata/md5-cache/x11-terms/terminology-1.7.0-r1
 2007061609 metadata/md5-cache/x11-terms/xterm-357
 2007201909 metadata/md5-cache/x11-terms/alacritty-0.4.3
-2007201909 metadata/md5-cache/x11-terms/alacritty-0.5.0_rc1
-2007201909 metadata/md5-cache/x11-terms/alacritty-9999
-2007250041 metadata/md5-cache/x11-terms/Manifest.gz
 2007250041 metadata/md5-cache/x11-terms/qterminal-0.14.1-r1
 2007250041 metadata/md5-cache/x11-terms/qterminal-0.15.0
 2007250041 metadata/md5-cache/x11-terms/qterminal-9999
 2007250041 metadata/md5-cache/x11-terms/roxterm-3.9.3
 2007250041 metadata/md5-cache/x11-terms/sakura-3.7.0
 2007250041 metadata/md5-cache/x11-terms/sakura-3.7.1
+2008010409 metadata/md5-cache/x11-terms/Manifest.gz
+2008010409 metadata/md5-cache/x11-terms/alacritty-0.5.0
+2008010409 metadata/md5-cache/x11-terms/alacritty-9999
 1707301038 metadata/md5-cache/x11-themes/chameleon-xcursors-0.5-r1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
@@ -63236,21 +64166,21 @@
 2007101639 metadata/md5-cache/x11-themes/slim-themes-1.2.3a-r7
 2007121839 metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.06.07
 2007121839 metadata/md5-cache/x11-themes/papirus-icon-theme-20200702
-2007140409 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
 2007140439 metadata/md5-cache/x11-themes/gnome-backgrounds-3.36.0
 2007142239 metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
 2007201009 metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
 2007201609 metadata/md5-cache/x11-themes/gtk-engines-aurora-1.5.1
-2007250041 metadata/md5-cache/x11-themes/Manifest.gz
 2007250041 metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
 2007250041 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2007250041 metadata/md5-cache/x11-themes/kvantum-0.16.0
 2007250041 metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
-2007250041 metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
 2007250041 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
 2007250041 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
 2007250041 metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
 2007250041 metadata/md5-cache/x11-themes/qtcurve-9999
+2008021139 metadata/md5-cache/x11-themes/Manifest.gz
+2008021139 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.36.1
+2007311939 metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
 1908192239 metadata/md5-cache/x11-wm/e16-1.0.20
 1805240409 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 1912220239 metadata/md5-cache/x11-wm/e16-1.0.21
@@ -63360,7 +64290,6 @@
 2007130039 metadata/md5-cache/x11-wm/mutter-3.36.4
 2007171139 metadata/md5-cache/x11-wm/enlightenment-0.24.1
 2007191609 metadata/md5-cache/x11-wm/icewm-1.6.6
-2007211239 metadata/md5-cache/x11-wm/twm-1.0.11
 2007250041 metadata/md5-cache/x11-wm/awesome-3.5.9-r3
 2007250041 metadata/md5-cache/x11-wm/awesome-4.2-r3
 2007250041 metadata/md5-cache/x11-wm/awesome-4.3-r1
@@ -63373,8 +64302,9 @@
 2007261239 metadata/md5-cache/x11-wm/i3-4.18.2
 2007250041 metadata/md5-cache/x11-wm/wmfs-201003
 2007300039 metadata/md5-cache/x11-wm/mutter-3.36.4-r1
-2007301609 metadata/md5-cache/x11-wm/Manifest.gz
 2007301539 metadata/md5-cache/x11-wm/qtile-0.16.0
+2007312109 metadata/md5-cache/x11-wm/Manifest.gz
+2007312109 metadata/md5-cache/x11-wm/twm-1.0.11
 2002112051 metadata/md5-cache/xfce-base/xfce4-appfinder-4.14.0
 2002112051 metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1
 2003152212 metadata/md5-cache/xfce-base/xfdesktop-4.14.2
@@ -63400,9 +64330,11 @@
 2007231109 metadata/md5-cache/xfce-base/xfce4-session-4.14.1
 2007231109 metadata/md5-cache/xfce-base/xfce4-session-4.14.2
 2007262239 metadata/md5-cache/xfce-base/xfwm4-4.14.3
-2007282239 metadata/md5-cache/xfce-base/xfconf-4.14.3
-2007282239 metadata/md5-cache/xfce-base/xfwm4-4.14.2
-2007310009 metadata/md5-cache/xfce-base/Manifest.gz
+2008011809 metadata/md5-cache/xfce-base/Manifest.gz
+2008011209 metadata/md5-cache/xfce-base/xfconf-4.14.3
+2008011209 metadata/md5-cache/xfce-base/xfwm4-4.14.2
+2008011809 metadata/md5-cache/xfce-base/xfwm4-4.14.4
+2008011809 metadata/md5-cache/xfce-base/xfwm4-4.15.0
 1910102139 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 1811152009 metadata/md5-cache/xfce-extra/transd-0_p20120503-r1
 1910131439 metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.1.0
@@ -63467,4 +64399,4 @@
 2007302309 metadata/md5-cache/xfce-extra/Manifest.gz
 2007302309 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
 2007302309 metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1
-2007311239 metadata/md5-cache/Manifest.gz
+2008021909 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bdfaa5c3bef5..451530dd7728 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Jul 2020 10:00:01 +0000
+Sun, 02 Aug 2020 16:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7be4182aefed..0b013b20f1ea 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ba4185505dacc2bb19e95c6ce939f13132042a4d 1596187967 2020-07-31T09:32:47+00:00
+434481292739af92209924d97ac24ed970757fdf 1596383840 2020-08-02T15:57:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 404b41aec7ae..e97e38b85f86 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1596188101 Fri 31 Jul 2020 09:35:01 AM UTC
+1596384301 Sun 02 Aug 2020 04:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 30e067bf5c12..871a8b8422a5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Jul 2020 09:38:23 +0000
+Sun, 02 Aug 2020 16:38:26 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 15d8e87f79c9..2c8a1544e9d5 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index dd8f50c82739..dfde471e73d2 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac0
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a
 EBUILD nagios-plugins-2.2.1-r3.ebuild 3117 BLAKE2B 13499d056ea1b3649809c5c66baaf455693850595c99663793cb80a15c5a12a59117f6648311dfbc5bb67334a9b9c36bddff566a0de83cdc3848cfb0a124ab0b SHA512 32095fd98cad6b56376cd47df6bcfd320bc917960202e6fda95f511465760200b270f742cbafd9469bc69330b6200c33cbe88f4345030ca409a4731cdac3d1a7
-EBUILD nagios-plugins-2.3.1-r1.ebuild 3047 BLAKE2B 0dad37a1747e013a928e6b9554d89f80a4a9604e9461003532e3c8c4fc824e924e5ca51747253b8db20008391142356aa881efa6323d977a0915beb25036c21a SHA512 6411c17d113d9ddd7a564f2f0d978e2da1b2ae3d767698176e192bd91fb3f8eff2e7349e569b0ecbd75ff3386a9adcd96f3ace46c13063c352608e7c2adb3e0b
+EBUILD nagios-plugins-2.3.1-r1.ebuild 3045 BLAKE2B 409ad9b5ccd8cd3fc68232e90f56de8c192facb34ff8e27514019e5d8081ff869e86de5c92b34f1aa1fc479b5a25dd62d701fb78aced87dd6cd96a40aee0726e SHA512 9c3a73affe7a70ed7d24835ea5a013adc1fd5c134d83ab98865a2a53d7003b67254a32b6f74181d5587d3fa33e834e69394d43430adf7bfcc7f457592ae82ba3
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
index 71fa9aafd71e..9fb37fa2d6fc 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc ~x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 9474ab03c1b3..1c2270ea2803 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -2,6 +2,8 @@ AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
 DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e
 DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137
+DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34
 EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035
 EBUILD nfdump-1.6.20.ebuild 1392 BLAKE2B f9d43b2f41c5c901255e06c391eff327bf2b56bf9af02add91e22ad8a935c682e6e332b252be90dfa9564971f59d908c37ea532b36a08ac7df09106b9ea41218 SHA512 5da3069596339dd040c1573a65b538e1cedc75d30420e84cf0864474a391e5a19a6914a2dafa8f7f4024b491c84799a926bd9b4f4d31cd7fff57788e822b2f9f
+EBUILD nfdump-1.6.21.ebuild 1469 BLAKE2B 932f15a9e9c9b136868fb6365c6fb0933ca081c25787712c50d08c4b49f3d3e90990c3879f7f3883d27b8b37de4e1d1f127b44597cf458ee71c6b6c809e7efa1 SHA512 7a2e14a66f05d516fe6cbdaf2e337ca1b57afb24ea33f583ad1a744b3a6dd3136914a7b41a6dc00b2321aa791989e0024fab6c0fbc25268db5ab1f0ad1eedc47
 MISC metadata.xml 909 BLAKE2B 51cc25f3d90d566c345857c50aafb86601e1c48350291f18cee655d008bb90a73f54277c78141fec70923d6e3f0af5a86b3f77f87c0142ea7fa3963282213103 SHA512 ff5188e78baccfa693342af4e1f053a1685e78e68ce11ae43b1f7ae6c31eec31dbf1efc7f3b0628e6f77bf237072830dcffae58e0c06ad5d52aeb35ee92b9ede
diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21.ebuild
new file mode 100644
index 000000000000..4c59fb92baec
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.6.21.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1.6.15"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	# --without-ftconf is not handled well #322201
+	econf \
+		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
+		$(use nfprofile && echo --enable-nfprofile) \
+		$(use nftrack && echo --enable-nftrack) \
+		$(use_enable debug devel) \
+		$(use_enable readpcap) \
+		$(use_enable sflow) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 880f271fcda8..fbd294110b4d 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 26c91d2cff08..5a45b771b829 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,10 +1,8 @@
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
-DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
 DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
 DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7
 DIST bind-tools-9.16.4-manpages.tar.xz 54768 BLAKE2B bff3b680673a5ebd7aad151bafb5004ca18b2ecda680320aad8821468aa399f48da20746d0e49cdfc0b431d5aedefa621015430b743968c7967bf2a5e878d1e0 SHA512 1930f4c04ae8dbdf10380082c680d59320f9a3eca3a7cbca2cb4fa83f1d4b6b00cc62a43104deb45cc56fe2e1dcc5902d6176daf1545f35d35fe297676afe6ca
 EBUILD bind-tools-9.14.12.ebuild 3153 BLAKE2B 1bea1fbfc9afcec51d142ec31987f0ddfa4e567dd8f826486abf5a055e3d7490beac8a994796f67025abe777dcfde1578a7ab6aa6213ca98dd3a6870e9167cb1 SHA512 6b0005e2510e5e6bbfdd8aa09b5aa220e79edc375abee84f965bad6f77d4dea4b1bc79724f593a5194c6919226484392ba7b0f381bd6e01754bb8f00821068c6
-EBUILD bind-tools-9.16.3.ebuild 3179 BLAKE2B b35de17b1a66f5e788cb683c080df412b625f903111513b877b85c88a1262c3434307ad9a40b729432665df031ebe4a71c2053575787fe2b9228d072d37646bf SHA512 9ff56fe1718b59982e9fd08d7ca0c5135118b34560ff0c48ee7230bee54e3a1e943ac9e4bea2679db8959544923776959e8d8c4f15a5a8516dc9e91c4ce7183e
 EBUILD bind-tools-9.16.4.ebuild 3544 BLAKE2B b9d393382aed0512b2346902dc48140f814916dbce717dd8fd296832e514dcd9840b7296ed2f9e5031e465cdae4caadc7f49e4624f72add97482d5cfb236272b SHA512 54d581b04746cae974f2047bf03d7f27b372249a64ace537a4653757ada3220572232a6a5992d78dc24955def05793ce55493e776bc1554d32367ea9b2680eba
 EBUILD bind-tools-9.16.5.ebuild 3473 BLAKE2B 4dbd640258e65af4514593a7b19eb3a02265c5e8793017373b43fae18b81369ee7eb3696e52f3699c307e6c1d1eabcab5437a6522e9f9304170e7f51f5c41d27 SHA512 a96bd8e9dd72f473cd1e3576f17063c9a8870779f48c001b0f71b3f005e77aafc85fb6ed24b41dda3add1daf43602d97e614c3d962dbdb4c87fa013062992366
 MISC metadata.xml 423 BLAKE2B 6424fc07b8bba765fa045750b1de629ae57a7004ef10839a3069dab45f20e01e6b50ae755e344f77130edc639aee17c9320dcbb64ed5289fb86a9fb129967617 SHA512 1ec81bf782ad0014c890349248d8ec0302c1940fb13953754ee03f8ea907b0edae79b436e7983982e8f273d04112c8263c416b06e973eba22ac179dd9c68f649
diff --git a/net-dns/bind-tools/bind-tools-9.16.3.ebuild b/net-dns/bind-tools/bind-tools-9.16.3.ebuild
deleted file mode 100644
index 3150d630e4db..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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="+caps doc gssapi idn ipv6 libedit libressl readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
-	dev-libs/libuv:=
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/libidn2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:= )
-	)"
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4 || die
-	rm -rf libtool.m4/ || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--with-openssl="${EPREFIX}"/usr
-		$(use_with idn libidn2)
-		$(use_with xml libxml2)
-		$(use_with gssapi)
-		$(use_with readline)
-		$(use_enable caps linux-caps)
-		AR="$(type -P $(tc-getAR))"
-	)
-
-	# bug 607400
-	if use libedit ; then
-		myeconfargs+=( --with-readline=-ledit )
-	elif use readline ; then
-		myeconfargs+=( --with-readline=-lreadline )
-	else
-		myeconfargs+=( --without-readline )
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# to expose CMSG_* macros from sys/sockets.h
-	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf "${myeconfargs[@]}"
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR="${AR}" -C lib/
-	emake AR="${AR}" -C bin/delv/
-	emake AR="${AR}" -C bin/dig/
-	emake AR="${AR}" -C bin/nsupdate/
-	emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	cd "${S}"/bin/delv || die
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig || die
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate || die
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		docinto html
-		dodoc nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec || die
-	for tool in dsfromkey importkey keyfromlabel keygen \
-		revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			docinto html
-			dodoc dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 963e22ef85b3..9cf320a65b06 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,10 +9,10 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
-DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
 DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
+DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.12.ebuild 11258 BLAKE2B 616e3fa8b541316dc4ec23da144f1daaf2741b2c6bb773f474dad5089ea55622997467942e3e1acac102d93c404c8f881d11edde6f866bbcf1a89a0d3cb86076 SHA512 902d4a36f637fe077d7bcba3aead39eaedccf63d7add4dae4ea4ba93550422a341888741cd5f4eaa01e20dd9e317ed8adf2bb4ca523de043908304edae4e1639
-EBUILD bind-9.16.3.ebuild 11263 BLAKE2B 790688cdc24df29bae5598cec4a8ab6482331f7d47dc0fed5b7e4cf1f17ec1fc8a2d93754413735e7f3ae5c6169c54f8046e52fc1ff2da8a62a5278fb8ca48ad SHA512 628965b5aa165f0e9e0309889812b2979a322fe1b02a1cfa039047cbe8bb7441fb23b0ca504fefbed4db5f6419981833cd852e2bb37d6973f9055be7b935631e
-EBUILD bind-9.16.4.ebuild 10436 BLAKE2B df0d4921c1bf2f1826f7a0bcecf18823f8ff24515027665e4a5998780b589aca4e9a2dacf4b6bb7dee467ba03b108bed56b4a85625f3e0eefb8d05e524f79687 SHA512 12629e4adf0493feee40cbab459edcb52edcf8143601e5926a70fa3fe2b17fc23e7fdfe6c2803032bc82fbb9813faed72ed8ed88a92a4b712862dd5e50900183
+EBUILD bind-9.14.12.ebuild 11192 BLAKE2B c81ec4d1dbcefdff4ca0692757009f7628197a35e84e511dc0e3268721fb46f0afce28eed64ec4c74399689481f83cffccb3f9a2f98bec00c0b5d608d5f4edfc SHA512 750e44fd30c2467e3f71e64005ad072ce6bd07b13e5d7a3704000de46530f6c7252f24bf089d77db2369e7e17533649c0913859ac3acbf4fcb821c9d3a474e4b
+EBUILD bind-9.16.4.ebuild 10370 BLAKE2B 1163eed6482b88e52b616f19e55191467134648ead8fdcd29c50ea349e0322d7db41e8cf2add79792756e0d3867b4d328fb3d77b843993c181782d6ffb569c9f SHA512 fe4bc1801f257d4fc4fc23f5e813d0ddb4cdc485ec586aa8b73ea1d91d4484501608002a569dca760a2b0f4d8854eb2980ad7ece12ed13cd46fa7d8c03001c10
+EBUILD bind-9.16.5.ebuild 10377 BLAKE2B 15ae693f70c8390c4b9734f64e8df7061ebef88def6ab0dda2412df50d9808ffd29d78f902d291d6df1b3925c2bcd1ee38f00c8c83981c009ca1d26d941e35f9 SHA512 0b294df5861a16427a5cf3a123b8add0659109c52c3d04e49bd4739209ac1a10f9e5f598de4b8dbf1746f1564169fb8a18cbd287a97cd554ec13b2f1e6a21590
 MISC metadata.xml 1043 BLAKE2B c4b1341082f3bd13a93ea378f61608a65ac7f904273932dcdbcf2a73ea8b4c7610ced855ed4a3fb61c7b02044db23bd0effda02d71b3114c7b4017c06784ac31 SHA512 879eca4059049ced098da9afe6aec250d174fabbc701e55ca6c22cfdf050b7c49289113a7e9ad99fa90685ca62c5f672201e04c7f0c766b55d780e26f8da59a2
diff --git a/net-dns/bind/bind-9.14.12.ebuild b/net-dns/bind/bind-9.14.12.ebuild
index bf875cba35de..1027fa4133c0 100644
--- a/net-dns/bind/bind-9.14.12.ebuild
+++ b/net-dns/bind/bind-9.14.12.ebuild
@@ -99,8 +99,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
-
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
 		sed -i \
diff --git a/net-dns/bind/bind-9.16.4.ebuild b/net-dns/bind/bind-9.16.4.ebuild
index bebcedfc5f9c..4514f38987ad 100644
--- a/net-dns/bind/bind-9.16.4.ebuild
+++ b/net-dns/bind/bind-9.16.4.ebuild
@@ -92,8 +92,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
-
 	# should be installed by bind-tools
 	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
 
diff --git a/net-dns/bind/bind-9.16.3.ebuild b/net-dns/bind/bind-9.16.5.ebuild
similarity index 90%
rename from net-dns/bind/bind-9.16.3.ebuild
rename to net-dns/bind/bind-9.16.5.ebuild
index e524cc62351b..0399c16a1540 100644
--- a/net-dns/bind/bind-9.16.3.ebuild
+++ b/net-dns/bind/bind-9.16.5.ebuild
@@ -30,9 +30,6 @@ DESCRIPTION="Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="https://www.isc.org/software/bind"
 SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
@@ -95,29 +92,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
-
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
 	# should be installed by bind-tools
 	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
 
@@ -132,6 +106,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
 		--prefix="${EPREFIX}"/usr
 		--sysconfdir=/etc/bind
 		--localstatedir=/var
@@ -161,8 +136,8 @@ src_configure() {
 		$(use_with zlib)
 	)
 
-	use geoip && myeconfargs+=( --with-geoip )
-	use geoip2 && myeconfargs+=( --with-geoip2 )
+	use geoip && myeconfargs+=( --enable-geoip )
+	use geoip2 && myeconfargs+=( --with-maxminddb )
 
 	# bug #158664
 #	gcc-specs-ssp && replace-flags -O[23s] -O
@@ -183,8 +158,6 @@ src_install() {
 	dodoc CHANGES README
 
 	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
 		docinto misc
 		dodoc -r doc/misc/
 
@@ -217,7 +190,7 @@ src_install() {
 	newenvd "${FILESDIR}"/10bind.env 10bind
 
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
 	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
 	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
 	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest
index ff4d6dc536a8..a6f2d8211ce8 100644
--- a/net-dns/ddclient/Manifest
+++ b/net-dns/ddclient/Manifest
@@ -5,5 +5,5 @@ AUX ddclient.tmpfiles 149 BLAKE2B 0ad955937dd6cf714530429ffb423e0acc7033bdf7e248
 DIST ddclient-3.9.0.tar.gz 59018 BLAKE2B b9b58108d9f124fcd5a72cc57bfb0e6a5bc2e115edc27a1d5950a929670d67d5c703b09f51e7e82e977ccfb544d115da177b0ac8dc06a76a800aa207cde5a42d SHA512 ae314c96a37dd90256d6acf62f4a4523b72f540194131e351a032239b00b4520351f6549d3b20a9209fe49ccc6de7ce158ffa8635d341066ea71b789dc667438
 DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346
 EBUILD ddclient-3.9.0-r3.ebuild 1491 BLAKE2B 081c440e79719d02f666439026ee97534b2aa0d391d8901e3d38256e65618d5fd32d998ca5d4cb027d9fc888c7d540f0fb07879bbb1f663ea1e637b72679f09a SHA512 ccb99b8d8e0b72fd4f3b15b764d6975b22de3e15b274fd8d50dc1024da27cce4e638b9c0ec1530e2e325560e61fd8645016b09b466188414d526330e64442fc1
-EBUILD ddclient-3.9.1.ebuild 1507 BLAKE2B 426fa1042cfb5daea131d772e8168630a86458a0280e4040140ae752386a8a31db62336a61242002048d3f18fa82f57486eec17cd8833ee4dec81c221a594eae SHA512 9555b6898ce73cadc2b06dadbfea03f47ec722106cc77c5b7e6f20c9b3c59aabff1014abac671f13f4872f5ba1d101d733d7b547e81e57b11fd0eccdfd7b99e1
+EBUILD ddclient-3.9.1.ebuild 1505 BLAKE2B d065080d86a6f9ba1ac52c4d44341a2b751d08edc0fe917534acca02b96c272494f2d71815fd2b38deca0344c56d60009021bde74c78403ca5b6aac14935e94f SHA512 9e02fbe7132fa0bbb612f7afdca7fb2f1d27b0f4ae486ddf844a2c0fb5b61d5162d7f57d0d69ea654cef4a16ae309eb2ba21280b3026a9106d0be6eb32c1bec6
 MISC metadata.xml 999 BLAKE2B 03fc5ec95eaabd6a8c15006f04ffa5e1c9d809719629319a8f919237a1d7359d8ea82ffa29b2796099eafd7ee152e81b544971734f1d751bf8f61e2cb51c1f0c SHA512 f70662793b7eca94703847084e4c0882ab6a6ec891383bd012c03afbb26c7b252db5adfdfaa9937dce1988b1c88bcd91f1a7a3c318b1fe3a5a6479d74de4a6b0
diff --git a/net-dns/ddclient/ddclient-3.9.1.ebuild b/net-dns/ddclient/ddclient-3.9.1.ebuild
index 8999892218ea..047ec60c8e86 100644
--- a/net-dns/ddclient/ddclient-3.9.1.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Perl client used to update dynamic DNS entries"
 HOMEPAGE="https://ddclient.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="examples iproute2"
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index dcf27674f0eb..9bc7f39ec4c2 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index b54e5525a6ad..fc30f1e1f636 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,6 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
 DIST firewalld-0.7.3.tar.gz 1247590 BLAKE2B 80b34749ab47fa3f2733c6c2fe6dec9483b38baa3485c91875888ecce4bacc16a05e69d5734aaed017408ec2ba8b33155aa0c08e93b1f8eac5c6708682edf238 SHA512 49ab1403b29b215ef69d54baf9060826917ab2a6d632f0a53b458170576639e74580e4399e5c78a74bf12a4999479db86aadacbc17c749ab25e9de8ed686146f
-EBUILD firewalld-0.7.1-r3.ebuild 3257 BLAKE2B 87d864ba1e9889806a42c0be2b4a91eb65c502100bf681adfbed5cef5f451a0e5bdd3223d6ee391fb177a041e46102767e03035e7b1dbd6c3e6d0a94a511e186 SHA512 b84a171f56147aa649c515c4986ca439d3e9203afd03280261b813f1c2708d814a0cc4fcd9e89ff397406ad7b83c93efcf9cb94c64fdff92c9c2abe08c8f10f5
-EBUILD firewalld-0.7.3-r1.ebuild 3259 BLAKE2B 400accbe443a5d1360261ff2d35062f8d316fef898283ed9253ecc9708892c3fbf95ebbd9c9e2101cd4f2b6a84aae0b99384eabc78f0b9f11449402cd5555f00 SHA512 70b573f0d912a4d964eaf11d8d6f7f6b5c1ec3fe12119b4d60445da819cd3abea58b356e6d310ff7a1abd1452eb91d953951dcef3050fefe6d72c0029b1809ee
+EBUILD firewalld-0.7.1-r3.ebuild 3251 BLAKE2B eacf145c3da5043f32e1be54248db4c9796c7e43782fb9277c17d9f3bf7f623becfaf72ffdfaf922e3fdd1ec495bac84f75b8a2155d47731030a9793717caed2 SHA512 c09693f304c5e520945f22e1640b101598dd1ffa8fd830693611d0c1e46df99cc5d734919ead543d2c36ec2b82efd6a5a107b93b59c9787790fac3c21aad1ada
+EBUILD firewalld-0.7.3-r1.ebuild 3253 BLAKE2B a45e1e523147476203c32021162ba1df63bbe6f3bfd52471946d030804fa252e000b8867c7ef84d22a97107cc95133d233875a9da23825d1815d4d6c9ec44184 SHA512 37f0f46f951de2b2b313c1dd11c5d7b1d708d8e8864e694aaf31a807c248ee7d8c24436f3541040a8e04a860347a9ab8e8b813ebb024ecea564b62992811e308
 MISC metadata.xml 486 BLAKE2B 0d1b9c530a7b7ac43414cda002e07cbc9b897164be53d9183dc50ba78bc8d29a40bfc364444f4253f903ac1698a459e6f7ca68431a22905a6f5aed02ca41bb61 SHA512 d4b20ffb819399bfc60760ec90bfaf60ffbe666a1c0b2117a8eae42db2f85c1f5274c8dee28fbfa7b66bea1d9720ad1dd8acb425c43eb71cf0c9b2557a1471a0
diff --git a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
index 28feae85d15a..f3dffe12669a 100644
--- a/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.1-r3.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
diff --git a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
index 8f68175271de..2b79e871a7b3 100644
--- a/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
+++ b/net-firewall/firewalld/firewalld-0.7.3-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools bash-completion-r1 gnome2-utils l10n linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index 116c21e2a65b..e2b33d128b8a 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -4,8 +4,5 @@ AUX fwknopd.init 2706 BLAKE2B 561cc62b1e557d425648947c25751dfb2fe323b04cb96ea1d0
 AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833712f748026eda3afd8019d6ec6bb86434b40ad273a4cc46115d3a64a73b621731ec68f3bad92dc41 SHA512 890bbba586183275cbd3b420a9c0d609ff3eca0fd239b4af97e2730e2790f317fc114f51d60107ba4fbddd2cabb60c70d8b615e2a75bb80cf27d352c894a1c6d
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
-DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
-EBUILD fwknop-2.6.10-r1.ebuild 3706 BLAKE2B 25805b725cca9f3c5345d49edafd7c4e6ca40f44ab3206b829c61be43447b19864f645b9a93e1d794c8680d275ad2d88549733c62a3bd8f91085e3f9a3f0b9e3 SHA512 a9267412dc4d1ab74be5479a857475f1571599a7f08e13699de90cfd13bc97ec5c8299e818dd34bb1c99e3dbb30777ff72502467b9acb81f00ef35e00944748f
 EBUILD fwknop-2.6.10-r2.ebuild 3353 BLAKE2B 0e7577c18dd8ff04fb6b529585801bb27e6218fb3eb3424e7f0c49f17b24c35fe2547474eeb565f20cb4301588a6d9757ae5284743b2f74ff7511febe87986eb SHA512 2e30cd3499ee75d9e5ae35ae2ef3f313689a3d2afd10634d4c6e4a88281804ff497f4bb3f344d278dbe2b2d44050bc58c25535067f6b0a96d93db43defee3783
-EBUILD fwknop-2.6.9-r1.ebuild 3794 BLAKE2B 34962c2026d3ad921bca886f69483fccbb5b107c497fffda054fcd2088548afe905cf19b16b4d3f9017fb9383fc8580ed98e54f7b9f7f0cdb9c4b7fe3e6861a3 SHA512 a07321223267ed412af9a72fd4527b358bf49f2de34fd03be80e40a33a345acf835fe1a2314f5e23d56724d80be68a021918c35e02ca78617743bed338b2ec87
 MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
deleted file mode 100644
index 786366d6895e..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python extension supports only Python 2.
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="https://www.cipherdyne.org/fwknop/"
-SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server"
-
-DEPEND="
-	client? ( net-misc/wget[ssl] )
-	firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] )
-	gdbm? ( sys-libs/gdbm )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	iptables? ( net-firewall/iptables )
-	nfqueue? ( net-libs/libnetfilter_queue )
-	python? ( ${PYTHON_DEPS} )
-	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	nfqueue? ( server )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	server? ( ^^ ( firewalld iptables ) )
-	udp-server? ( server )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" )
-
-DOCS=( AUTHORS ChangeLog README )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
-Please edit them to suit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Install example configs with .example suffix.
-	if use server; then
-		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/run"
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable nfqueue nfq-capture)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
-	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default_src_install
-
-	if use extras; then
-		dodoc extras/apparmor/usr.sbin.fwknopd
-		dodoc extras/console-qr/console-qr.sh
-		dodoc extras/fwknop-launcher/*
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit "${FILESDIR}/fwknopd.service"
-		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
-		readme.gentoo_create_doc
-	fi
-
-	if use python; then
-		# Redefine DOCS, otherwise distutils-r1 eclass interferes.
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-
-		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
-			echo
-			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
-			ewarn "created firewall rules, which is an important security feature."
-			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
-			echo
-		fi
-		if use nfqueue && \
-			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
-			echo
-			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
-			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
-			echo
-		fi
-	fi
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
deleted file mode 100644
index ff9bea4cb409..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Python extension supports only Python 2.
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-DISTUTILS_SINGLE_IMPL=1
-
-inherit autotools distutils-r1 eutils linux-info ltprune readme.gentoo-r1 systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="https://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server"
-
-DEPEND="
-	client? ( net-misc/wget[ssl] )
-	firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] )
-	gdbm? ( sys-libs/gdbm )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	iptables? ( net-firewall/iptables )
-	nfqueue? ( net-libs/libnetfilter_queue )
-	python? ( ${PYTHON_DEPS} )
-	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	nfqueue? ( server )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	server? ( ^^ ( firewalld iptables ) )
-	udp-server? ( server )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
-Please edit them to suit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Install example configs with .example suffix.
-	if use server; then
-		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/run"
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable nfqueue nfq-capture)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
-	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default_src_install
-	prune_libtool_files --modules
-
-	if use extras; then
-		dodoc extras/apparmor/usr.sbin.fwknopd
-		dodoc extras/console-qr/console-qr.sh
-		dodoc extras/fwknop-launcher/*
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit extras/systemd/fwknopd.service
-		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
-		readme.gentoo_create_doc
-	fi
-
-	if use python; then
-		# Redefine DOCS, otherwise distutils-r1 eclass interferes.
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-
-		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
-			echo
-			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
-			ewarn "created firewall rules, which is an important security feature."
-			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
-			echo
-		fi
-		if use nfqueue && \
-			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
-			echo
-			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
-			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
-			echo
-		fi
-	fi
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 237e117d557a..5f5feec7880e 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index a1657cac32f8..235ce38bc953 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -23,6 +23,6 @@ DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa
 DIST nfs-utils-2.4.3.tar.bz2 921710 BLAKE2B 9386a99561370e09ffe871ec38a4fc993e99332c0c6fdb0d07eb7a924cfab4634e5c5186ac1f1629deecf02557fd2d3d5d99b90d97c32d3680ca4478b5c49d9c SHA512 160c828dd7a7b3206b7f167eb99a8dfac7e1a0c8dd88c81b639c3a1f66916908b3ca11fb9a945e4cf6a474f82509ed91a8a3217623f6cb79302d3d9b760f19d9
 DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
 EBUILD nfs-utils-2.4.1-r4.ebuild 6205 BLAKE2B 6a8c7bb4e2796bbf00c8aef69243cafd7a428aae5b1c0c1e4d82418593b14272efd37e8d7561ef0a671de217e27147f73c6287a207016185054c88ae31df3f86 SHA512 68a109f63eefc855a42569867db9876bd0c49ac222bc30c1791b5e7ce88752144315553e309c613c8953dfbc8f3c58c69f067312c936574a491355349ec61f14
-EBUILD nfs-utils-2.4.3.ebuild 5789 BLAKE2B 3fc452e804f3db5f3bb4458d72f8e703c92c38c6afd6b20d03dc49f44890e13f40da7d7ee583e292c3b865c6a0c7044fe14665a3b4c51a06964675c3ab03972d SHA512 046c7020b289c0ec9da1f35b494f3895683abdfb793e87ec57b354efb20eae0ef028a5c68955bf94632403d9a63743f11cd45afb58ababf460c16992e329c4fd
+EBUILD nfs-utils-2.4.3.ebuild 5788 BLAKE2B fb3b87163a7337d3d8e08b87f874168a0ead5f40bfff0614366201221783e647ab8aa2dbd0e50bf5be6a948cf8b44955ae93c91a290d0d334b243854e0af8170 SHA512 f3d6b7c868ef735455f49ff495244396528bbd35134e85d42743054fe8eb8fb7fc8cd7afcf5d9a5781dfecf79832f6eb8cd5034c3fb9ec1d350b872c40760f67
 EBUILD nfs-utils-2.5.1.ebuild 5796 BLAKE2B a2b68add141b971e43ef27b3e8fe02dda6ac1f214e64013d1aafbcdb845a5bd7ed2c6dd4200737f1720e5809aeb4ee69a6e3e3e1fefbe36f1d268173961bac11 SHA512 78af39e7bc35dd68894b32d7bc0afc0d7b63ec8470a126e6f6e34ea26533bd0212ba6976b2049ce2fd5e27898a343ebb776cfbdec92f67345bf760b5d5b713ad
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
index 46241c2f0979..259c7ff8cd49 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.3.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2e0a4242e793..d2afa86510a6 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index a59f531482c2..2538615c7178 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -5,6 +5,6 @@ AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37f
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
-EBUILD spectrum2-2.0.12-r3.ebuild 2404 BLAKE2B 35bf922885fc038454cca3560000ce8f7dd2d2e37416009aaea98a0978f29b4b043c66370ee6f4920e2cc7b170cd59ceb0f278d96b49fc22c209ca48af6e0168 SHA512 89c2e53eaf69ef30a09e65513660924524bb22c9fdbe500b9a43df8a2a9061f5ee3e14810a626b1a8977256b54b080e201dbed453d3071fce059d34dcafa0bc6
-EBUILD spectrum2-2.0.13-r1.ebuild 2295 BLAKE2B 2a5a2fe1cd62bf5db123fe3b1ad6c8174d41401bbbf9fc352f6f2a5ab67e18639c19f58ecedac3225cda2e276090f94200656e693cc326d51baae9f63d9575b9 SHA512 7df9c93e8af7c4176d1312c97d2012a4ae8b6a3abb27898e9bb473c70287d8f06971533744633f64cf63b0e82a1401ae45affd8015f79f8b70ecab12632ea0ce
+EBUILD spectrum2-2.0.12-r4.ebuild 2433 BLAKE2B 78b117c01085df7b875089a59c4eacb5ae99702f08651ce4adbfa037f7190bff3b94d219209e3f88f6e6b457f94bc375477c7c5ae57a3148bb5ce8c63123d56e SHA512 ea588b7d2ea50d9efdd8a4437ecfdbe58f6b641fc5d5065332866244b23ce82bcbee492d65c61f7c1ff9c885389ac87cce30eb71b221668b86f4824e1ed1c24f
+EBUILD spectrum2-2.0.13-r2.ebuild 2324 BLAKE2B 283f71e8b71dca40e7db30be25546ad27273b8e2f23f996dbb0021c28ed31a114fdbb6a39956cda46a284babaf2d93e3cdbe56ab4847d089743c7eee77408fc0 SHA512 087d42b3d12d31c453ecf501611df696768809b98767e81aea26405b702f14ea292d329c4647b31e9b0b14d3af3a758a36a10c0ae67c51adabccf34428db8a33
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
similarity index 94%
rename from net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
rename to net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 85771c62be5c..334f15bf5380 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r3.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -13,7 +13,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,7 +31,7 @@ RDEPEND="
 	dev-libs/popt
 	dev-libs/protobuf:=
 	net-dns/libidn:0=
-	net-im/swift:=
+	>=net-im/swift-4.0.2-r2:=
 	net-misc/curl
 	sys-libs/zlib:=
 	frotz? ( !games-engines/frotz )
@@ -39,7 +42,7 @@ RDEPEND="
 			dev-db/mysql-connector-c
 		)
 	)
-	postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+	postgres? ( <=dev-libs/libpqxx-7.0.0:= )
 	purple? (
 		dev-libs/glib
 		net-im/pidgin:=
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
similarity index 94%
rename from net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
rename to net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index 34d6db43558e..edbad4cad3eb 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -13,7 +13,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -28,7 +31,7 @@ RDEPEND="
 	dev-libs/popt
 	dev-libs/protobuf:=
 	net-dns/libidn:0=
-	net-im/swift:=
+	>=net-im/swift-4.0.2-r2:=
 	net-misc/curl
 	sys-libs/zlib:=
 	frotz? ( !games-engines/frotz )
@@ -39,7 +42,7 @@ RDEPEND="
 			dev-db/mysql-connector-c
 		)
 	)
-	postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+	postgres? ( <=dev-libs/libpqxx-7.0.0:= )
 	purple? (
 		dev-libs/glib
 		net-im/pidgin:=
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index d4020c2b64a9..78cc1d6409ca 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -2,5 +2,5 @@ AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1
 AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2B 78abb2fb27a796d2b0ba1c4d9ee2a5662a3a166b404f16ca67cb0b884db65d36a95b95a82827a7d2cfcf1b65204ebe23b11791b94fa4a88b85a72c1f1b12cf10 SHA512 57cb292b32365d7041a3d9b17488288e07eba5402bdc0db5ec3ff447a5ad7b3dfe7d13275d8783ddf6d338831a9bee93d481b74342d8d57a62486b3b7ca7689e
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r1.ebuild 4372 BLAKE2B f31ffc57dcfc165d2c05c0bcf4ed93585383384736836d9d51e8dca73f0a97453e96bc96d36ae71b4762783946527bc10b611373dafabb6ae99cd81433086a74 SHA512 26176d2006c1b93040bce59831696c28e9e1a6b5b51cf9644aa498614cb1b39079f16eb21b5e4acd3c5d367eba310e3de98d88cd8b375d8f0b2d6f35aace23a9
+EBUILD swift-4.0.2-r2.ebuild 4510 BLAKE2B 8381768b09d39dd0ab0cad3403cde517ca22f93b269e1c84dd75e0572f3212bbe0268a0bab54f6683e9e4adb789f1a306b76883fe1eb516fff709c04377bd44d SHA512 d461335e7ae83ca5dea5df543c636b6ceb40bb62b1f556e4df5a048358871cd623a182c3965e03438288c908d36737b01a53e6c7d3a5b0f94ecd144b87577e0d
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild
similarity index 96%
rename from net-im/swift/swift-4.0.2-r1.ebuild
rename to net-im/swift/swift-4.0.2-r2.ebuild
index 40f92b5a1ab6..b24e201e6521 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r2.ebuild
@@ -72,6 +72,9 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# Don't include '/usr/lib*' in the link command line for `swiften-config`
+	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
 	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index b20740116d09..93faf6a570c9 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,4 +1,3 @@
-AUX 2.1.20-qt-includes.patch 2226 BLAKE2B c1e0a285e9d5e5a76c5ab918d4fa287e8598739bf0444ccc300d3e1f084fd19bce6e2369e24b82191a13699e1a824382c0eb607995289ba26efcf803a22d57f4 SHA512 dd6dfc20f4dbfd178dc08c2fd42d4a62a4601edc38bfeab9c6099349b6aec23e57fad331e97d450671cfce6570d738a428eeadb6ba26272d7d7ea41c269e38d9
 DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
 DIST tdesktop-2.2.0-full.tar.gz 36612169 BLAKE2B dcc9d81da5d99552bea3139d595c7f1aca75464a19be34c880a93d27ddd8a58a01510efe8fde31104b13d50e34e944b05406e21bc96995e85cb95283ff8de08a SHA512 2aeca83be7bc385bd7537d56ecf66996facedd0af588e743fedbb08c3158fc76436d6cf3b1fb5dd7c8d37b4471f739872ca54ba300aa1d0e0202e87c005703fd
 EBUILD telegram-desktop-2.1.13.ebuild 3887 BLAKE2B e69436b8a7bd74f12886266745d9caf82e6a826812c10017aac43c0093a01c87177e159bd134a611e8625c935d36a89b0208b5f95febcf4c5ab15366438b805f SHA512 86789ea69657cb77596bb183bc6a2cfcf032bba02ae3c286966d56c4a9caeff37a8d37057bbdbce541d5c7d641a503cefdd05a264aa3e32778be48a05ca19944
diff --git a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch b/net-im/telegram-desktop/files/2.1.20-qt-includes.patch
deleted file mode 100644
index a2f02aea3b05..000000000000
--- a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9eb24ca5c194482faf86e68d93527707fa01a78e Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Thu, 16 Jul 2020 18:54:29 +0400
-Subject: [PATCH] QtWaylandClient contains QtXkbCommonSupport includes
-
----
- external/qt/CMakeLists.txt | 25 +++++++++++++++++++++++++
- external/qt/package.cmake  |  1 +
- 2 files changed, 26 insertions(+)
-
-diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
-index 25b662a..490d13b 100644
---- a/cmake/external/qt/CMakeLists.txt
-+++ b/cmake/external/qt/CMakeLists.txt
-@@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED)
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport)
-+
-+        target_include_directories(external_qt
-+        INTERFACE
-+            ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
-+        )
-+    endif()
-+
-     if (Qt5WaylandClient_FOUND)
-         target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
- 
-@@ -97,6 +106,15 @@ else()
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_include_directories(external_qt SYSTEM
-+        INTERFACE
-+            ${qt_loc}/include/QtXkbCommonSupport
-+            ${qt_loc}/include/QtXkbCommonSupport/${qt_version}
-+            ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport
-+        )
-+    endif()
-+
-     if (LINUX)
-         target_include_directories(external_qt SYSTEM
-         INTERFACE
-@@ -129,6 +147,13 @@ else()
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_compile_definitions(external_qt
-+        INTERFACE
-+            QT_XKBCOMMON_SUPPORT_LIB
-+        )
-+    endif()
-+
-     if (LINUX)
-         target_compile_definitions(external_qt
-         INTERFACE
-diff --git a/external/qt/package.cmake b/external/qt/package.cmake
-index 4e97717..ac40f05 100644
---- a/cmake/external/qt/package.cmake
-+++ b/cmake/external/qt/package.cmake
-@@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED)
- 
- if (LINUX)
-     find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
-+    find_package(Qt5 COMPONENTS XkbCommonSupport)
- 
-     if (NOT DESKTOP_APP_USE_PACKAGED)
-         find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED)
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 609940471073..799ae316cb86 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index 735de98ddde6..32f3d50df0f0 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,3 +1,3 @@
 DIST libntlm-1.6.tar.gz 688608 BLAKE2B 8e545619b1fb00d778bbebf6ab9748005928a2669dab8c3d9c6285127b551c1bf039e1748a710e5eb551e7cbcb1a8775b57c21b163ca2a0206a4b9948b11df8a SHA512 d68bc6b5cd7f5f70385ba78275a810fa46e60f761f0949f2262eef35ae052661739ef17ce3fc4ab75f7e8cfc788b1ccd7766d4ff0ee78db08ea4de3e224653f2
-EBUILD libntlm-1.6.ebuild 546 BLAKE2B b88ee1341a628e1ae974650f73e709b1e5a951767b1b9731812e6ac54d481ab878a717b0e6699543db8dedefcc4b9e492c6069b8e526f5228519fb0ed2a10f56 SHA512 ff721f9d16a7f55078a795ff2dae04e03dde21ae674f7dc391470f3b6cb971f08988aa4c8d71dff3f9e4c957941c8e76be979824c2617c0dcf03cd1bc7965656
+EBUILD libntlm-1.6.ebuild 545 BLAKE2B 0193445155b7133abd68e64277c00d60b3949b03b034050aed32e2286c62f7fbb16f8ef849bca140ca59919cb53cc717895f37157819b606d6f7ffbfc4a2a804 SHA512 33f5e4f62a3b9c38de69e9eb69b59871036617f9241064c6062f31b924c7abed01a690b6cab6af85ca25d4806017889e8dacd8b6b976ced95ce43bedf4f83c81
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index 3e6348ee0afc..0c0220891886 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index ebf15fe55621..68c79e004015 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,5 +1,5 @@
 DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
 EBUILD libsearpc-3.0.8-r3.ebuild 972 BLAKE2B c9c8ea665ac2dce2090982e10d755b9addf8c950d94ca01543aa73fef832cb765f9ee019eaf6904c6cd9209239d3680f6970c90dd1d3d7111d71ab9adc98f37c SHA512 9b6f516b7f9911f133e18b9017a2baa1b4adce76b02a53ed1804808f6822a3c44e2ede4945cbdabe45e7308cc1cdee86be6978b5d283b5cf704d8daabe4e681a
-EBUILD libsearpc-3.2.0-r1.ebuild 892 BLAKE2B edf92e0e49f00e23faf417c512cb2a37950f56c9f9603201e72c1d5e291e1e9ddae67daa7fdcccf43413e9733c329c18e1658f1847897d0a1a959d4c31b30004 SHA512 d1f78e33fcf2ba923d90405145a60958f2c678d86970dabbb5f6a8a5a192c398c8fffe5d1ab8b6f8a92014a8b1c036596f3d03b2a2bb4cb23df792ad40ec9d3b
+EBUILD libsearpc-3.2.0-r1.ebuild 886 BLAKE2B 2caa94cc7263c828db647057a4d57e6011ae4045234a293bffc9b8c816cc202eab634de78b9a9cf977277636a8bc99c1d5351d7f9ef659eb8dff4d7c99d5d89d SHA512 f0acfe1e1a026335c319fb1bcb512e810fd7fac670a1c06d76f22cd157c77c97ee2ef6baadfa54d2ea12addceb7a074a2f5c100eacc396ae87b9217b982b4d90
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index 5ae50cbad5a9..69f45d332ed7 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 WANT_AUTOMAKE=1.16
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 364b0b28ee99..5fb6702e1470 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,4 +1,3 @@
-AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 EBUILD libsoup-2.70.0.ebuild 3000 BLAKE2B 6896ff81e8d0eb822357c8c198e0774a9e563e239433033049e1b89214df733edec33e3f59eaa966978f9c224ca51afeeee821dae29c544e030c0b0fe44a949e SHA512 fe281bafa2b5ad22f69e55ec6631b05a28382a0cb067dcb2f0f480c04616f712458b7504599a95066ba95730ac0cf1306dc12109b2f7c536a3c52088d8facdec
diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
deleted file mode 100644
index 04c9cccfeec0..000000000000
--- a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra@igalia.com>
-Date: Tue, 20 Aug 2019 16:04:06 +0300
-Subject: [PATCH] NTLM: Fix build with ntlm enabled
-
-Just realized that build with NTLM enabled was broken (!?)
-
-(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f0e34cb0..346ed2fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -271,7 +271,7 @@ if host_machine.system() != 'windows'
- 
-     if ntlm_auth.found()
-       add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
--      add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c')
-+      add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
-     endif
-   endif
- endif
--- 
-2.20.1
-
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 69d8bc20db58..15eb472b26cd 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -7,7 +7,7 @@ AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae27327
 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
 DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d
 DIST xrootd-5.0.0.tar.gz 2754256 BLAKE2B c80a38ede3263ae669181f2173f6ee2bb0a347dc973cecc9dedf00867041190f7bceb7f475696e8cd3921c57d4c197b73ee57b29c9e78a027393ca61dca1b6d3 SHA512 75b69d3da2a6e477edbf5588afd943a91a2e1e86fcc98afc34d964c9231fc0224b4eec82336e9a7d5bd8bd0cd5c20e442ee37b8f6239f417b05efdf39038d93c
-EBUILD xrootd-4.12.0.ebuild 2527 BLAKE2B a48f6d68fa7926aee485c8f56a4a33d7d661e633c2875271acc35e7fbac66132ce8fcb999d8ba58dc561ba59da3bad5d08e9ff0284dec4f5c58a5b675ec6caf6 SHA512 e401d9e3a10f2c28be18243cd64132de5f079ca5c9db9f18df5c179560b47b9ea3e0bf471a7257f3f15956e4d552a5442b2ad02f969808c1643721fb0e7f2c2c
+EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
 EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0
 EBUILD xrootd-5.0.0.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.0.ebuild
index 414f5edd4dc1..3974f5488b24 100644
--- a/net-libs/xrootd/xrootd-4.12.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index b254262cf157..6e4daa12fb69 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 0f3b4c7b5065..4e90ec64cf1f 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,4 +1,6 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
+DIST rss2email-3.12.tar.gz 73830 BLAKE2B b9a891e9fbe1a252e15cf5534e2ec5c19da69f14d7af7dbbc5665c87747882370f23bebed01755d6c96c1446ea61ee287c5cd175459c75cc8a74ad3995e9edf2 SHA512 0523c26f13b147ad4fff9c3a9831bc0b6c2475e7f3a4c010641d2b5110aa6ccfbf00077d70c03805437ba148cdb3593a67c32ef42423af0a71d1380c0c48c917
 EBUILD rss2email-3.11-r1.ebuild 666 BLAKE2B a38fc2dc7182cb7c9e5b97f971d4cb88d89a8fd5adb0687c4229a5a7dda4588e398886de21d115594411817c3d92bf6ebddaa55180d24dea0f905abd433918fd SHA512 8fe6db64a3cd3ddb2169690277ec317cf3ed8ab60237bbb671760b408f1fabcb83d831f986c22ed8bcbae972029c10caa1f5d2aed4b9c48cdc587a47a3544dc0
 EBUILD rss2email-3.11.ebuild 755 BLAKE2B 817ea1f2e4a551d709951a269114cd1be122af38f35de07e0e1a1d94581430b4c236fc5be58f085fd13ff9850b5aa5ffc08d83321dd75eb372d729c987070e48 SHA512 2a69931b3803c53dd16060ea04534ca57b37a4da07d6c59071fb4ce48caf4ffd4f9438c1ea1a6f4a3d66e34d28980a87af15a109cda135bff936972c14694307
+EBUILD rss2email-3.12.ebuild 668 BLAKE2B 3ec18a77a6e2f57d6e815e6686338131fd240e240b4192ac162d6c862aea9d0baccbed42f29236841bf76746c91f7df5af71a7606b981cbcd6d6c085f9bc528e SHA512 ead1bbbba4c49e17ff3d58565c8999c2057790a585a3939a0ad6b100acb824554a0f52268fa9e2cb09293b6b26f49e179c8d3d79022b56e6895555253d1f29c1
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-3.12.ebuild b/net-mail/rss2email/rss2email-3.12.ebuild
new file mode 100644
index 000000000000..0d679cf6d547
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.12.ebuild
@@ -0,0 +1,27 @@
+# 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 script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index e062981fade9..923c18b2d68e 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -8,6 +8,7 @@ AUX vpopmail-5.4.33-strncat.patch 6266 BLAKE2B 98656fb8d963df082ec48fbf7918423c8
 AUX vpopmail-5.4.33-unistd.patch 266 BLAKE2B 19dd429573f0b45b93cd35d522787029ba445c2f363a7a270ab1c547e4f0c2a7be89c287642a3e5e8d69ea59a82271aff271670d19d3850146e92a3389aa3dc8 SHA512 1cc6e6a067cabc004224c022af8c3ee90125a3b3daa9c346ca8a57962be30681a6181605624fc09a8992a7e3d3e7b3d8d6c0ce95095399c1a5dec798e9d6f6cd
 AUX vpopmail-5.4.33-use-proper-printf-format-strings.patch 9207 BLAKE2B 78d51e71fc29ede44e76109d43a0e4dc81458cb74c0873d33efdae33d7a99321e31839eff420654868f38b7e82677c345e276375fac3d9cf13ce54310e8235a3 SHA512 453887050002fb075046637b1ace82caeefd7c2a0f587403d24da0b9d0602a580d2d6595c2ea8af42f49fedd7c2168f9de46dd24f5aee0befab2ba0c7bb4e1c5
 AUX vpopmail-5.4.33-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0
+AUX vpopmail-5.4.33-vpgsql-onchange.patch 804 BLAKE2B a3c5cac7cf5aa19c3d853abc7377361432f95ee4ca4c78a316c06ec368d7c5fa0c14d3095bf8b268b32d17222d6adb3a5e22284d04d8b7e8b421629f04240c94 SHA512 9edaf5faf8d7979b1b1ec3b67f6345ecb70a6a8faef6083063ed2861debe61cf2e0ed201acf3e034b8c1c00d5440bcd52b6f5935c8e59a5d21aabd9df329f2d4
 AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B ebf8c80ed2668d0bc96930493bd46788abf58d45defd5cb3ebcff0b67c0c31d7473b7dbf07c958366e18dc7ca56434a6e45b9bf7c9d920da993b8d51927df95a SHA512 6587d2a4ac7b6943b07db2334750db83aaf2e974053732696ad17846da29250a82ac91598f25f0cf1caafc731fdb89ec016e7ba6ff6f70ab269af3c0a15e80b5
 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9
 AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107edfca033126fb420420a9b1eb8866a53552df110e8dca8cced2d653181eb2a6dfc3c07e33a958d7f86ad4035285 SHA512 df7a99357d4673f9d5c4619d67e418a769b2ab72c95d0a7477f186bf15fc4d0f6bec93a64970660439c25573dc0cd2994f5f4aca335723eeaec6761a7838f332
@@ -15,5 +16,5 @@ AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
 EBUILD vpopmail-5.4.33-r6.ebuild 7516 BLAKE2B 568a2f25393c132211dc351c7704c4767b272dbcf4ed7e90823b46e2bf5899d1fad283e3dabb352c85d648b9289da0c09c317eb48dba137df490f13db6b22c7e SHA512 6c31b1653290c10d3892c984c4b7bc287d771664914c11b0b07a024c92dfc93fe5454b4d4f3e8f27ba40ff1ddfb58fc9561a4cf9609ba6916b11badbceb9c523
-EBUILD vpopmail-5.4.33-r7.ebuild 7537 BLAKE2B 88c87449980b0f8596cd2cf72b75456af84ce344a7a6a074d6cb0c673ecb3012e9512eb97762f6436fd2a161e36b03b98818166b0ef6ad7f6eabcc3cf1637c7e SHA512 61ee7395ebfcd55e0a38a8e96103babc9919d2c00351fc64ffaffe5a58ea020b2ecc94b664943f4f5909247a95652eaf2ecd5ec9500a46a64d8493195a100424
+EBUILD vpopmail-5.4.33-r7.ebuild 7587 BLAKE2B e7ed4efe7efc7c12dfed3b16dd6dc93c6cb77aa4f771fb4ca8e2526c689240f5740a4eb689665ecd8ce5cf85b81fbd6c3be070bdfb933dfa0fff260697e17849 SHA512 dc8019fd250e05985762b26d87d1af4b333a331929a6706f9648d4a347cde48c3d4c274c621c8bc8125b7924a2515c50d01928e6cc04fa3294140ed213301c83
 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch
new file mode 100644
index 000000000000..4fcd3a51a0bc
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch
@@ -0,0 +1,26 @@
+From c317829c750438fbb16867cbadb196328f3ba567 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 31 Jul 2020 22:09:50 +0200
+Subject: [PATCH] fix build when using PostgreSQL and --enable-onchange-script
+
+This obviously has never worked.
+---
+ vpgsql.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vpgsql.c b/vpgsql.c
+index b5dd40b..7d8e5c0 100644
+--- a/vpgsql.c
++++ b/vpgsql.c
+@@ -1456,7 +1456,7 @@ int valias_delete_domain( char *domain)
+ #ifdef ONCHANGE_SCRIPT
+   if( allow_onchange ) {
+      /* tell other programs that data has changed */
+-     snprintf ( onchange_buf, MAX_BUFF, "%s@%s - %s", alias, domain, alias_line);
++     snprintf ( onchange_buf, MAX_BUFF, "%s", domain );
+      call_onchange ( "valias_delete_domain" );
+      }
+ #endif
+-- 
+2.26.2
+
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index face2fb6b996..ce3584c722a0 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
 	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
 	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+	"${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch
 )
 DOCS=(
 	ChangeLog
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 68966ba05a5c..88c507965d9e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3dbd18c1f2a6..2ca50139916f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -20,6 +20,7 @@ AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc
 AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
 AUX openssh-8.3_p1-X509-glue-12.5.1.patch 1721 BLAKE2B c67e6ce756d8febea9066ca52d47baff962075610ca87ee8ef9581940db020ab8889f1bb7e2809bac7c521058e835a25823f30bd6ee8b4948cbb19b7459e512c SHA512 bf356de43307cb48fd79427b22fff5bf40ad4fc72c6e906b517209f5f51bddf6a5f81d7617ad01e8434db5703df4fa45f68d4a70fd5869691536b9f82fb18b18
 AUX openssh-8.3_p1-hpn-14.20-glue.patch 6059 BLAKE2B 454178571fbf051fad6edff93c87d96f4fa62c687b03666a27e912e29c9f11d375935d0f830edff779ff73f0de16831bc54d2a7e747ff5e3951933b25f39b452 SHA512 0791c0936b4e316715e691b3ac0fa6dd03495fc30ddb68ba15a73c2f8aafb3892df5fa3c29d91e16d956f9aa3c9fd66ded8ad744834788f2fad08b807efe0a5b
+AUX openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
@@ -41,5 +42,5 @@ DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d
 EBUILD openssh-8.2_p1-r6.ebuild 16856 BLAKE2B f2e13e4cf7dd8f5fa5413bf66fb78116c27dc578b3a1f3368e288b26aea5a90d3e19f8a347e79d460935123169c95583c379c9db1ed352af54ed34991d02ad43 SHA512 e9bf2cda73df7d5b5a38e0ef9ce907a9be9fdeeb871e47d80809773e4119664dd42277f0d8016f4e77ae486750540c52fbdf0712fdecbac919b282a25d1e493c
-EBUILD openssh-8.3_p1-r4.ebuild 17251 BLAKE2B cdd2ccf10699c35ea094c763c7567ad3d8b375a11b84b024c4af84abd7cdd0b72540eae50e8489db678534452ea86af2a98a8ed6747a681a63e8592970389406 SHA512 1ef376547c19c0211b6e5d94aace205698bed1b7af0f895c2f24d86fbce8cc916cec5c6ab07700d95da13a2c9f60577e11845f6e6869909011eb28b7e1b57755
+EBUILD openssh-8.3_p1-r4.ebuild 17367 BLAKE2B df636c3214640c6235680604c09edc62ec2325744ce0ab06a09c16fde5846fe9eaeee798ba3999f77a3f2705aa0976a3cfe80efe95e638b63864c9d8556a44dc SHA512 7a64e0c50a9be53511d717989d31856fcfbe9c232170226b26a1fccc6b9c4ba6b66d45df9bc388a5d7735651058664ed93eac9487f0853d1c69ab036dcbba552
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch
new file mode 100644
index 000000000000..6bd716619701
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index c9e4294d..2dbfac24 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,7 +44,7 @@ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+ CFLAGS_NOPIE=@CFLAGS_NOPIE@
+-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@
+ PICFLAG=@PICFLAG@
+ LIBS=@LIBS@
+ K5LIBS=@K5LIBS@
diff --git a/net-misc/openssh/openssh-8.3_p1-r4.ebuild b/net-misc/openssh/openssh-8.3_p1-r4.ebuild
index a3d261036a76..6e93d57cf890 100644
--- a/net-misc/openssh/openssh-8.3_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r4.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
 	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
 
+	# workaround for https://bugs.gentoo.org/734984
+	use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
+
 	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
 
 	local PATCHSET_VERSION_MACROS=()
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index 80a0954200ef..dd03446b49b2 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -9,5 +9,5 @@ DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30
 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
 EBUILD pps-tools-0.0.20120407.ebuild 683 BLAKE2B 86c7a81d4a0d372967245aa0695f39d9c0e873d1532f305b8debaca5f55377b21f202e32fb8829409452882adde35cb1169184a0508ec504d5e9943e92058be7 SHA512 6ded78dfbb7ea4ff2221b0cf4d8833aa3b71d2bcce158d7467fc130402f0445c974da85f71bd3ba9f8311477a39c7e896fb2a0ed8514d9819070fb691471e473
 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a
-EBUILD pps-tools-1.0.2.ebuild 545 BLAKE2B 32349260271e5e273522db5a103dd67b1bc67ac65e9e04bbd65965bb7b5712f5e6ed46ce7f505e0adba0e36bbd067f06335fd4cfd3969d9a8e27ed76d6f8ea54 SHA512 adc9650b6b2cfe691946151332e985bef755b3905aabc75cc1add07aab11ad588f72f9a0670a6abdd8d525178eeece65abbb17b506d3681ecc7f287000af977d
+EBUILD pps-tools-1.0.2.ebuild 544 BLAKE2B 98ca845a43a744c287750f2e81d4040eafc52a769c4c4983d69b7db866a034155a72da3719052a5c2b7404b6c5a2b7c429f1b0f21eceb7205bd3d6029b023fb3 SHA512 3a37793a5493210a619e575dda0765eea43c1e932361249cf0d3f9c32364b6f6938a310ffa410a5c26d0d0af0bdd0490445fa8d5c98cb5adfde064e117e1b6da
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
index 4959b09df699..c9c3561e2f2f 100644
--- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild
+++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 6617103b255b..57a6e6fb571a 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -3,5 +3,5 @@ AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703
 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
 DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95
 EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558
-EBUILD proxychains-4.14.ebuild 1029 BLAKE2B b8bbe250a091c7334346edd2e2b44e33218aa4d474565ae632fbd85c49107deda8da65b0fbb41b14412531f557bc807c6550ab747f1d793d750fa6532ae88862 SHA512 c0f99cbeed4536aa58b40ebd31f5e9dfa48c0e097e822642529276d5006c7a8e7e8474a37c8b215b5e9ba4acee1ea93c4820d6627154afff83dbd5338c45ffae
+EBUILD proxychains-4.14.ebuild 1028 BLAKE2B 2ab7b1fe78ef9ab866570a61bcfb21b114d7723348c00410808828c96025c9f932ce3e00aaac2715d1b02434aa5d901d7dd171b635ea43232f7207f3bb5bffff SHA512 152bf29fe1489bfc43e233c76769ea7c2f53fd20ebce608a2a68d1f077c37fcba665eac3aec8b02ae923353f185fa77503c3e1bb4ed8db28f96d80b4273539ef
 MISC metadata.xml 622 BLAKE2B 0437eff84f33578c5d27f011dddb6bacd7b645f2efcdcb612155eb30e2d49ac58b2fe5b38831eb973254c5e213b3eefed46fd9a9e3d89e8396483b9ee348b04b SHA512 8aae7373f8835661775fee0cb07a5a5fb16228e29d3f87434dc95b05f051f18c19e327595a79d447028c91edf8ae410e5a7c3c5f54a43d6283d5e32a16ee2b04
diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild
index 440fc2477149..a6331cc22059 100644
--- a/net-misc/proxychains/proxychains-4.14.ebuild
+++ b/net-misc/proxychains/proxychains-4.14.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
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 9de33e656b1d..ec87981c7dae 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -12,7 +12,7 @@ DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565b
 DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
 DIST rsync-3.2.3pre1.tar.gz 1074550 BLAKE2B 37ed2626489559758f96bc5c316e5f7d439fb2021d86682b0239dca63e16b236c3a9f90fa69637c1f4c5cdcc2c174202c525c5aa7482284779af0f9b81eab157 SHA512 d9cad88dfd2e5078ebdb337a3a6c6515820c117c3c3fc782f2daa33e50270694660cfa5e2288d32de9fee25d92f19306e33d4bc25e9438894441f8e08cdf33d5
 EBUILD rsync-3.2.0-r1.ebuild 4509 BLAKE2B ab0897f40b2f7ea13a8a841892ba5eca647befe4f8be98d6440ed9f1cdb7addc13d548a45660c4295472b116517b8c41b30f35e01b37227a1ede1b507a45fa20 SHA512 89ad2d62e3b764e8283dc41899b54ecb93d69f16e9ab4e7e859d0c45bd108bff744776fee114cbca2c4ea85e944ae53e6b5d068b809253aea482cca002ebe5a7
-EBUILD rsync-3.2.2-r1.ebuild 4599 BLAKE2B 0487ae97920f7e4170e4d319cf2ade57437499341f73a96e2ceaa81380ede30dba5bfc54ec0e8518710b302b9d7ae8f6af15acccf99db7a13ccaf02ee7f1779d SHA512 94b6c1ebf2b48c6f0883c55e504ccc6718d23d84895fcb6de3860cad2a1d15a69ff65630d30bd07c9ac1f3f36918cde7e7665e50e09522cff8279676777ee501
+EBUILD rsync-3.2.2-r1.ebuild 4597 BLAKE2B 28228f29f4a44d8881aac15ad0446455582b4d93f0476e18ac25c5e070e554e1bfe369aa31bf207853485c7b6cb6a83bd803a2390466925fb31b9b66afe1618d SHA512 3030c2beb6d55362f9dfbffcf058f22af95b876fdae96221d95dae3ce56719838d1babced4a9941b27d8417564f40457c3e3c051266c6fa02945489736362a7f
 EBUILD rsync-3.2.2.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e
 EBUILD rsync-3.2.3_pre1.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e
 EBUILD rsync-9999.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e
diff --git a/net-misc/rsync/rsync-3.2.2-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild
index 4f1da2b58c9b..71fcd1eb1917 100644
--- a/net-misc/rsync/rsync-3.2.2-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.2-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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 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"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 77a16a9fb993..239790941693 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,7 +1,3 @@
-DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f610cd582524c20fa88cbd592762f5e41a6abb36c6fc49ff6719b87322b12cc37c973d52847f9a400d8bf3024 SHA512 0b1e3cf839144b24e42974f973a8ae97e9b4c79df3a40e38f61cc4b5284ea41a1fcbdc9dd45ff2b402915acb1ffc908a1e1c45c12f93243211ef2349c9acf70b
-DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
-EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
-EBUILD s3cmd-2.0.0.ebuild 569 BLAKE2B 531a6555be566cbbe57325c6bd98cfb1bdffe32028addd89d67d72fe12d6dc66debf02acc58b061d53eff3a66af5488ca19a7b3eabeb6c71372629cbb32926b5 SHA512 4ecf2fa88755bc3d74a1a53960ad59dc31bde4dce32fc67babd92d6e6f5740d40e7b586d97e2a0bb4434b7a57103020f8b74e6ff4dac3a54fc5542b0bb966a03
 EBUILD s3cmd-2.0.2.ebuild 579 BLAKE2B 37142c3dbcb5ee3d9ddd574738fdd0df153e566949a0f1f7350b1ba2c02acd36e0a4398ba4683f12ab9392d86375a5e10adbf9b39d76a020e20e4b565af1b5ef SHA512 bfad562510e73393e0cb8ca22ca7b7853ed5a66b35105282eb6eeec1ccef38a0e051d45a62eb442b923148fd75a88259fda742cd28399fad9bfdaf31fe731775
-MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
+MISC metadata.xml 573 BLAKE2B 38dea8cc5348d894944ae0b5abd6b1298849215771e72d2661763bd308b638c41d9e408ebc21288a67a70518719f4d3030feb3600eca3bf7e5570fb4001a8aff SHA512 69472497e9016d0aa4357af53682fd41c3fd228881117c4014a2cf51c1071b9d156c375cfd07236c215dbbe12ce9f5f4191d3d3d81d9f3372a76091c219307cb
diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 1e93066ae8dc..a669dac0de29 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -13,9 +13,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription>
-    Command line client for Amazon S3.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">s3tools</remote-id>
   </upstream>
diff --git a/net-misc/s3cmd/s3cmd-1.6.1.ebuild b/net-misc/s3cmd/s3cmd-1.6.1.ebuild
deleted file mode 100644
index d94467370c51..000000000000
--- a/net-misc/s3cmd/s3cmd-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Amazon S3"
-HOMEPAGE="https://s3tools.org/s3cmd"
-SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]"
-
-S="$WORKDIR/${P/_/-}"
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
deleted file mode 100644
index 49035b03c3ef..000000000000
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6  )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Amazon S3"
-HOMEPAGE="https://s3tools.org/s3cmd"
-SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~ia64 x86 ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-magic[${PYTHON_USEDEP}]"
-
-S="$WORKDIR/${P/_/-}"
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index bb7e3fd3dc49..6ec4a03c693c 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index dcdfe53ad16e..5af891ad8de1 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,4 +1,5 @@
 AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6
+AUX newsboat-2.13-json-c-0.14.0.patch 1007 BLAKE2B ba2770bf0d4c419ea54f871331d25ed68f016913507ccab32e5392dded6a1ea100f6f611de60a28e34438007987a6a53f9c1e20f1759c85ef8894650d49e04a6 SHA512 813ab4310cf055ce71c2dcc39110b6a5c33fa5f51fc40f5c77abbf1c964afaa7f45591aa088e97522eb17fa0d994a8f7c7f9c0fada6ae3defb3331831b3b4ba4
 AUX newsboat-2.19-json-c-0.14.0.patch 970 BLAKE2B e6685bca764b01c62d0e76b743aa95c90541d10283cfb74f4a58c2f730cb311d35dd27a54496aa183f40bdc54afd4d9cc50e812cfe612ed1a69405f25c11e39c SHA512 482086d59d6fa0c67897c829ced6480e674b8e42b3d658e65842ac0a75719ca1981175165014567c53d74d4d902d266b2903865acebec02b7df4ee63f483c138
 AUX newsboat-2.19-libressl.patch 5497 BLAKE2B 556f1cb3102014be879b99f8f1bdec642ca40e893cc46a1053d46a8065fc56e2a9b59c96db0af51707ae716b7334ad36ae13c06ee08c316483bec95ddc42583b SHA512 0e6d2970a5b78b7a11fe4639c4f17031e5b8498d5445e7f60be3290dfdb193a63d1c085f4277b678149c862180fd998c306cce8c52fd9f7288d42155007027d1
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
@@ -104,6 +105,6 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-EBUILD newsboat-2.13.ebuild 1252 BLAKE2B 20607997ab2079d9531b6214a21f556c0c78f4059d3276c08f87006eb19603e92a8daff0883b527f136959078a6172a7a77c2099616dfc481f60a4d062a17b00 SHA512 139266eed0947fbb7f479c9d973cf30a44b97c5ab3ee09d3909d494db016cc9045d064436d28bcc986d0a7d0dc15bb1df10014a4a9e38e4e6804733df3d84852
+EBUILD newsboat-2.13.ebuild 1298 BLAKE2B 116421fdc4e419d3d1c59abdd3f4495b4eb1d4c6edd889330297489c5cc71322654b36741c9a4836b37e9f08711732783be30e45b61f6eb5e8e08ec1cef1d6c4 SHA512 3ca881ea8dd9cc736a60569b08c19cddc2d9f93229279ab4a7227549a60f6efd1a63e3adb1abdedb01626f11aac4f3192a8666396d3da65863edf34080339198
 EBUILD newsboat-2.19-r1.ebuild 3187 BLAKE2B 399c02bce80f6b2bbef3d0090d054865eef9e6a145f1cfe5cb6c5d44327df7803ed608357a00d7056fc2d35710f4bc0a4df906dfd9bedaf99451d1e68332ad9d SHA512 c12c83de368391b3ad5a9a052e16714c0efbae1a17240042098c6ec99822b7e7adb629a12ad873b5d6a0940629e1eb3f0c1ff5cf5e66e29d5196b5a11dee152a
 MISC metadata.xml 216 BLAKE2B 6a9d054ae44666e41d1fa4f4876a8ef7bb95e7023a56b7a7f108cc2cc5b131e94d2080a5777dbbeef466a38db321c530af83dcec5eff25aa5bd8137dc949b6b7 SHA512 237dec64aa7d798b0b71f56a1c93a701fd424b0374d549a1f51272fd22905341157bdd7bcde6f77a7afeb83afede7e6eb2bbd0a2e3a70a9670933bd1d8732196
diff --git a/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch
new file mode 100644
index 000000000000..4e46843c6b7f
--- /dev/null
+++ b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch
@@ -0,0 +1,37 @@
+Patch merged upstream for future versions of newsboat: https://github.com/newsboat/newsboat/pull/883
+
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 13 Apr 2020 12:52:46 +0200
+Subject: [PATCH] Add support for upcoming json-c 0.14.0.
+
+TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
+
+
+---
+ src/newsblurapi.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/newsblur_api.cpp b/src/newsblur_api.cpp
+index 2d1acdae..e124852d 100644
+--- a/src/newsblur_api.cpp
++++ b/src/newsblur_api.cpp
+@@ -9,6 +9,19 @@
+ #include "strprintf.h"
+ #include "utils.h"
+ 
++/* json-c 0.13.99 does not define TRUE/FALSE anymore
++ * the json-c maintainers replaced them with pure 1/0
++ * https://github.com/json-c/json-c/commit/0992aac61f8b
++ */
++#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE  1
++#endif
++#endif
++
+ #define NEWSBLUR_ITEMS_PER_PAGE 6
+ 
+ namespace newsboat {
diff --git a/net-news/newsboat/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
index faeebc9cfb6e..fb6e8dc0de87 100644
--- a/net-news/newsboat/newsboat-2.13.ebuild
+++ b/net-news/newsboat/newsboat-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.11-flags.patch
+	"${FILESDIR}"/${PN}-2.13-json-c-0.14.0.patch
 )
 
 src_configure() {
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index eb1bc436c621..3f632a51c77c 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 59babd2de74c..5088f6be38b4 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-5.1.1.tar.gz 27223155 BLAKE2B 38369eb07c41bde9f8e8c246ab5cc4fc6edfcd222f353624f4d2ae193f176228471aafdadd1b65238ccd808d778a69e1d140035be9116b87a75c286493747fe8 SHA512 ac5cd82d4d89590b57625661c493aca6a702605c612ea1acd9e0d0806067d47f60085ee68260bba2a10dc343410ae6a76ea1575287a0e312e4467a4e8485c6e1
-EBUILD mitmproxy-5.1.1.ebuild 2888 BLAKE2B 0519da8953dc11a9d3c3a9cbc79ea3719cf298148d00f3f0dff9cefac2c43c83379fe86840d6492caf2cec9e5b1cc7076e9537b5570d394f49fa51700b69aac2 SHA512 bb6e9efc1ae729586c3f8571eb9b40da6056d999a9eb87e41ea70fc096e659c57b59c81b99184767902bc3898eb17d91b11d2ab6a238e1467b9873b53e544153
+EBUILD mitmproxy-5.1.1.ebuild 2884 BLAKE2B a066a3006656839fb2e04efe8b17ae2db0b0db899958f359e5718341c3988d9870911c817eedd91680ee250ee2d2bd32c3b0706897c58ac8db73339a6d5ca5b7 SHA512 045fb1f56dcaf446d6d5396db7ee78c0dd9f10e15688b29a29fffde0efa1e1a2c5ee37795c2def434536da60cd8c0ae55142847cc2b7013e0a4a4406e46f046f
 MISC metadata.xml 239 BLAKE2B 9ce254c9d79c1823be126f0737ead27524b2690a447914d59f3cad0ec3c549b2020fd9b31e50f67054b819c2264791cec5befd5602be80b4c0b0cb86b50d615d SHA512 70f4cee52fc1b316d727f8d0a423b718e78fb5b6d78ec321fc2aea5ba5dc5b08cc0142846a6d4b1cbe478f5a6322254222b08843a72e0307ecfd053cdb801c03
diff --git a/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild b/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
index 1e3fcc5ed4b7..d127d4bbb616 100644
--- a/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-5.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 2f913e7c99e8..54d57eb0be9c 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index 61f6af5270eb..ccbe325e00f7 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,4 +1,3 @@
 DIST wireguard-linux-compat-1.0.20200729.tar.xz 262464 BLAKE2B 2ab0ccd173889941e65f588564a5815df5b47c08c1f5dfdeb8b0c4f1ec3a91ee4664d96fac390c1a30cf5067b9dd9c3b17c43dc459bdcd9f317348e1aa098d76 SHA512 8eb06eb7e56340e9088f53d887716777cf07cd4b3330cc41243ae7d6d63ed469d2710b84fd1a3fca0118dfb8c8c77377ba4ec4de3ffe1e7d0541ec25115525c5
-EBUILD wireguard-modules-1.0.20200729.ebuild 3475 BLAKE2B 906d7957220061329383106ca8e9cc5efc2860effc41bd65c7af5540f3413a233d26782b66d0689999b3428bd6e5113f1d723ef944b342c2ee6ad8d3d680e27a SHA512 69e0c25b3ccb35ac1a293493c2143c4da36e595526bf8ddf5f51e1fb8ee069f44f329479ed5c2d49c6700140c4c9e29e6e48fc2f7973e32fb60d0738c7dc718c
-EBUILD wireguard-modules-9999.ebuild 3475 BLAKE2B 906d7957220061329383106ca8e9cc5efc2860effc41bd65c7af5540f3413a233d26782b66d0689999b3428bd6e5113f1d723ef944b342c2ee6ad8d3d680e27a SHA512 69e0c25b3ccb35ac1a293493c2143c4da36e595526bf8ddf5f51e1fb8ee069f44f329479ed5c2d49c6700140c4c9e29e6e48fc2f7973e32fb60d0738c7dc718c
+EBUILD wireguard-modules-1.0.20200729.ebuild 3486 BLAKE2B 2a201c656281cd4a83df1129776c0ec17800683c0f844373cbd05fe2153fff4f9d91e4464d532951294ff7ef1ef52cd6de3802a74aa0fe6c34ffe6a585913e5f SHA512 aafd74e5c34c5f92dea25f45d8a5220cf8a620c5b30b1360e622f3c1e3e4dd9de793a1413a868a4cc4547f68eade0a373a6e47f15636f37237097125c69eddb2
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild
index 85fe87ad3b45..198636c9d9a4 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="debug +module module-src"
 
 DEPEND=""
-RDEPEND="${DEPEND} !<virtual/wireguard-1"
+RDEPEND="${DEPEND}"
 
 MODULE_NAMES="wireguard(kernel/drivers/net:src)"
 BUILD_TARGETS="module"
@@ -40,8 +40,8 @@ pkg_setup() {
 			eerror "enable CONFIG_WIREGUARD=y in your kernel configuration."
 			eerror
 			die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package."
-		elif kernel_is -lt 3 10 0; then
-			die "This version of ${PN} requires Linux >= 3.10."
+		elif kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then
+			die "This version of ${PN} requires Linux >= 3.10 and < 5.6."
 		fi
 	fi
 }
diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
deleted file mode 100644
index 85fe87ad3b45..000000000000
--- a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-linux-compat"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
-	S="${WORKDIR}/wireguard-linux-compat-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module module-src"
-
-DEPEND=""
-RDEPEND="${DEPEND} !<virtual/wireguard-1"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
-
-pkg_setup() {
-	if use module; then
-		linux-mod_pkg_setup
-		if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then
-			eerror
-			eerror "WireGuard has been merged upstream into this kernel. Therefore,"
-			eerror "you no longer need this compatibility ebuild. Instead, simply"
-			eerror "enable CONFIG_WIREGUARD=y in your kernel configuration."
-			eerror
-			die "Use CONFIG_WIREGUARD=y for this kernel, and do not use this package."
-		elif kernel_is -lt 3 10 0; then
-			die "This version of ${PN} requires Linux >= 3.10."
-		fi
-	fi
-}
-
-src_compile() {
-	BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
-	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
-	use module && linux-mod_src_compile
-}
-
-src_install() {
-	use module && linux-mod_src_install
-	use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
-	if use module-src && ! use module; then
-		einfo
-		einfo "You have enabled the module-src USE flag without the module USE"
-		einfo "flag. This means that sources are installed to"
-		einfo "${ROOT}/usr/src/wireguard instead of having the"
-		einfo "kernel module compiled. You will need to compile the module"
-		einfo "yourself. Most likely, you don't want this USE flag, and should"
-		einfo "rather use USE=module"
-		einfo
-	fi
-
-	if use module; then
-		linux-mod_pkg_postinst
-		local old new
-		if [[ $(uname -r) != "${KV_FULL}" ]]; then
-			ewarn
-			ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
-			ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
-			ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
-			ewarn "which this module was built."
-			ewarn
-		elif [[ -f /sys/module/wireguard/version ]] && \
-		     old="$(< /sys/module/wireguard/version)" && \
-		     new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
-		     [[ $old != "$new" ]]; then
-			ewarn
-			ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
-			ewarn "However, the old version is still running on your system. In order to use the"
-			ewarn "new version, you will need to remove the old module and load the new one. As"
-			ewarn "root, you can accomplish this with the following commands:"
-			ewarn
-			ewarn "    # rmmod wireguard"
-			ewarn "    # modprobe wireguard"
-			ewarn
-			ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
-			ewarn "to gracefully remove them yourself prior."
-			ewarn
-		fi
-	fi
-}
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 19b55ea22eac..05829c4c3116 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,3 +1,3 @@
 DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
-EBUILD wireguard-tools-1.0.20200513.ebuild 3272 BLAKE2B 800f2ec75e42ac5adb2ef8ffd0403ebd448e19f27609e6d9883d252743e838bd3a017ef86561d4aa8c82e0e67ec7f3b5d3c543ca100f495935bdb6d45faebe25 SHA512 714e11822d0854acb7eb86db716266cd53ff0ae8eb713c962b2aacaaa35b72dcca5ed03562c1a858e6cb204ae85ab25a9097f0db1516fb2ba62d33f1186f35a5
+EBUILD wireguard-tools-1.0.20200513.ebuild 3943 BLAKE2B 53f490c071e1ee17388e2c8b6dd7f636f6e8142630cee1e73a41cf34c2c1f3e8c642edf42cfb1146fae7a79c62b720517dfb9ccecb02144237ee0e410880ebd3 SHA512 97d71c9435bf5593425315e44702b1a736da49ab219d3e927b44461b102c5b0661e94d10f845b57cb903364e5dd3e160eadd497cc5dc1265569304a0ac78b291
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
index 07fee8d91012..05151edab944 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
 		|| ( net-firewall/nftables net-firewall/iptables )
 		virtual/resolvconf
 	)
-	!<virtual/wireguard-1
 "
 
 wg_quick_optional_config_nob() {
@@ -36,29 +35,44 @@ wg_quick_optional_config_nob() {
 }
 
 pkg_setup() {
-	use wg-quick || return 0
-	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
-	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
-	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
-	if has_version net-firewall/nftables; then
-		wg_quick_optional_config_nob NF_TABLES
-		wg_quick_optional_config_nob NF_TABLES_IPV4
-		wg_quick_optional_config_nob NF_TABLES_IPV6
-		wg_quick_optional_config_nob NFT_CT
-		wg_quick_optional_config_nob NFT_FIB
-		wg_quick_optional_config_nob NFT_FIB_IPV4
-		wg_quick_optional_config_nob NFT_FIB_IPV6
-		wg_quick_optional_config_nob NF_CONNTRACK_MARK
-	elif has_version net-firewall/iptables; then
-		wg_quick_optional_config_nob NETFILTER_XTABLES
-		wg_quick_optional_config_nob NETFILTER_XT_MARK
-		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
-		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
-		wg_quick_optional_config_nob NETFILTER_XT_MATCH_ADDRTYPE
-		wg_quick_optional_config_nob IP6_NF_RAW
-		wg_quick_optional_config_nob IP_NF_RAW
-		wg_quick_optional_config_nob IP6_NF_FILTER
-		wg_quick_optional_config_nob IP_NF_FILTER
+	if use wg-quick; then
+		wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+		wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+		wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+		if has_version net-firewall/nftables; then
+			wg_quick_optional_config_nob NF_TABLES
+			wg_quick_optional_config_nob NF_TABLES_IPV4
+			wg_quick_optional_config_nob NF_TABLES_IPV6
+			wg_quick_optional_config_nob NFT_CT
+			wg_quick_optional_config_nob NFT_FIB
+			wg_quick_optional_config_nob NFT_FIB_IPV4
+			wg_quick_optional_config_nob NFT_FIB_IPV6
+			wg_quick_optional_config_nob NF_CONNTRACK_MARK
+		elif has_version net-firewall/iptables; then
+			wg_quick_optional_config_nob NETFILTER_XTABLES
+			wg_quick_optional_config_nob NETFILTER_XT_MARK
+			wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+			wg_quick_optional_config_nob NETFILTER_XT_MATCH_ADDRTYPE
+			wg_quick_optional_config_nob IP6_NF_RAW
+			wg_quick_optional_config_nob IP_NF_RAW
+			wg_quick_optional_config_nob IP6_NF_FILTER
+			wg_quick_optional_config_nob IP_NF_FILTER
+		fi
+	fi
+	get_version
+	if [[ -f $KERNEL_DIR/include/uapi/linux/wireguard.h ]]; then
+		CONFIG_CHECK="~WIREGUARD $CONFIG_CHECK"
+		declare -g ERROR_WIREGUARD="CONFIG_WIREGUARD: This option is required for using WireGuard."
+	elif kernel_is -ge 3 10 0 && kernel_is -lt 5 6 0 && ! has_version net-vpn/wireguard-modules; then
+		ewarn
+		ewarn "Your kernel does not appear to have upstream support for WireGuard"
+		ewarn "via CONFIG_WIREGUARD. However, the net-vpn/wireguard-modules ebuild"
+		ewarn "contains a compatibility module that should work for your kernel."
+		ewarn "It is highly recommended to install it:"
+		ewarn
+		ewarn "    emerge -av net-vpn/wireguard-modules"
+		ewarn
 	fi
 	linux-info_pkg_setup
 }
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c9542a447fbe..770005c7ea6b 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index d2efc6941a65..1b068a9158d1 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,10 +1,13 @@
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
+DIST 0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2 6933 BLAKE2B 021574de46f582f668788d35bb0f2fb7a47a03ae9d8009adaf3d53946bdf7fc61301a985a7eb0c6cde37fef36dceae86d71d287a8beb61d793b6309064e4e09d SHA512 f42f997a92592d3caf7e29e50bfb5733ab94988743eb3231c78b31272c5cde840f5abd984e1c6b1f928828a6be84eb5d17c3455207509f48652ed160a4f6c7ae
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
+EBUILD gnuradio-3.7.13.5-r4.ebuild 8132 BLAKE2B 7cfc1cc16e906645bac232bda3e7d3d0f2e52a8b260c0edf4eb309e70eb55f0916d3fb36b33578eadbbd497adb5f2913991522941503c980a6f05ef3d9cb6e96 SHA512 c0fd682270036c84be9b1439ed7f8516be27e4476061463c4300229625131c3b6a4addc16d4d2361a3b74ef0e15a40e7b701d35d0785d80c30c8e104e875cb41
 EBUILD gnuradio-3.8.1.0-r1.ebuild 5995 BLAKE2B cb288a4e5610db280d7f508c22084a94c8a7482333a9e9704b28f6bf71c8b32f25f68c9fcd1d4488cd230fca8fd5bc965d8956259090d031116678820ec1686d SHA512 27c9e8e47489fd91464217756626848b04c749a181ff71e8f983a227d3a70e52e8d4c687d25c4b6671654fc12956cb226249525164d07345c81001aab462e14c
+EBUILD gnuradio-3.8.1.0-r2.ebuild 6174 BLAKE2B 4547198356244074b45993c2aaf7c3466e3fb7bcac45133f36eea38fe63b886dc6efa3480ea47110939704557d1e7db1a06c3343f0b212b443867874c3c727aa SHA512 c663d579e77289ca863c9bf0774ca1b1a33ef23cbb6c2092a5886d3a7330d274cbe0f75c84ce13ab8a0e0b7975794d34c0cdb1b9a8584771b9d9a8868ec24ca2
 EBUILD gnuradio-9999.ebuild 6019 BLAKE2B e620da24a69f4b285e34752cac338dff0343a0f77501f8fcd93c76aa860328cc55b8b128ea37fcb6318fcdcb97888edf43dd083f6786cc284ccbafc7fee465f0 SHA512 babb6b819b29a57497b56f555adf45ffc688747dab5f1a19a82297eb1801a5b75a129abda8115d7f5495e675afc2248764002553d5fa47afc2c2c7451b53d1ac
 MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
new file mode 100644
index 000000000000..b85c4e578724
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz
+		https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint-3.7"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
+		alsa? ( audio )
+		oss? ( audio )
+		jack? ( audio )
+		portaudio? ( audio )
+		analog? ( filter )
+		digital? ( filter analog )
+		dtv? ( fec )
+		pager? ( filter analog )
+		qt5? ( filter )
+		uhd? ( filter analog )
+		fcd? ( || ( alsa oss ) )
+		wavelet? ( analog )
+		wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib:=
+	)
+	fcd? ( virtual/libusb:1 )
+	jack? (
+		virtual/jack
+	)
+	log? ( dev-libs/log4cpp )
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
+	vocoder? ( media-sound/gsm
+		>=media-libs/codec2-0.8.1 )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			x11-libs/qwt:6[qt5(+)]
+			dev-qt/qtwidgets:5
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
+	"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	if [[ ${PV} == "9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	epatch "${WORKDIR}"/qt5-maint-00*.patch
+	epatch "${WORKDIR}"/codec2-next-00*.patch
+	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
+	epatch "${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch"
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	#zeromq missing deps isn't fatal
+	python_export PYTHON_SITEDIR
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DDESIRED_QT_VERSION="$(usex qt5 5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
new file mode 100644
index 000000000000..ed6d89a7a8fa
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+PATCHES=(
+	"${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch"
+)
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index d0cfc25edfeb..9ce24a45a902 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,5 +1,5 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1776 BLAKE2B 05271ab15e9fc49a63454a9099477ee4532bd31e276bf42ab72ed25f0c8049f9903f6d55c350bccae5bd4323b0616d6be5a01f0b27418c79ae441e153cd95796 SHA512 d1a44e968ca19424d81e0c8d7f8188b61227ea6929db3e45eacb8ca4faaea2c125f3179e2d16005319e6ebdd3a101ab2659c820765a25f6030a2363d6c856406
+EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 154b536864dab7a1b024d17a8a996c8641674a936ab08580b98eff46d6024d0eb61b28b427515e80cd93302cdc0c8c6435af2b5ef34f59270642a40ce83703b0 SHA512 27bba166483e60c9daee81683d4de75010491245297a556a7b6e1440f61cb2906051571101577a5bed624662ac23b4efa115da15b545f7d0569dd13fd46dc52e
 EBUILD wireless-tools-30_pre9.ebuild 1763 BLAKE2B 13d6da1bc9bbf1ca4bfe19a83a4b8b3dfe2ca8642abde1f2711814051ca91047bbf161d069acc3dbacea8cb5dada5ace287de309c1c60121809610a01fca272c SHA512 6099ac7cd5f4615e49ef894c21278df88616479ba7a5a8d7e41e289cee43c1eacd575d36ac7804968205ac9396bdbf060a67ff127722dea362bf3e23d8838987
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index b43c43b91367..b6ebdfd2dde9 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_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="multicall"
 
 DEPEND="sys-apps/sed"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 404c75380074..f90752c1866f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index a5f9a5ef145b..a98935d8995c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# alpha has no virtual/rust support, needed by newer gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no alpha keywords
 app-editors/emacs xwidgets
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index 10f4ba530681..89db1e265ac1 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -6,3 +6,4 @@ dev-lang/nim
 dev-lang/rust-bin
 dev-lang/rust
 virtual/rust
+>=gnome-base/librsvg-2.41
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index 10f4ba530681..89db1e265ac1 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -6,3 +6,4 @@ dev-lang/nim
 dev-lang/rust-bin
 dev-lang/rust
 virtual/rust
+>=gnome-base/librsvg-2.41
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index a4d8f03b198b..5353df361e8e 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -6,3 +6,4 @@ dev-lang/nim
 dev-lang/rust-bin
 dev-lang/rust
 virtual/rust
+>=gnome-base/librsvg-2.41
diff --git a/profiles/arch/arm/armv6j/package.use.mask b/profiles/arch/arm/armv6j/package.use.mask
index fe3adac983aa..acb4ca99cbd4 100644
--- a/profiles/arch/arm/armv6j/package.use.mask
+++ b/profiles/arch/arm/armv6j/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# virtual/rust is available here
+>=media-gfx/eog-3.33.1 -svg
+
 # Sam James <sam@gentoo.org> (2020-07-04)
 # Rust is available here
 # Bug #728558
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
index 597c86aa21ea..75303868b9a5 100644
--- a/profiles/arch/arm/armv7a/package.use.mask
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# virtual/rust is available here
+>=media-gfx/eog-3.33.1 -svg
+
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # Bug #728558
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 87f5bf05f461..6ba66a8a5d04 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# armv5 and older has no virtual/rust support yet, needed by newer
+# gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-07-28)
 # Requires dev-libs/boost[context] which is masked on arm, bug #727138
 dev-libs/msgpack boost
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f3a8116c6890..8480df637fc4 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# ia64 has no virtual/rust support, needed by newer gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
 # Requires dev-python/networkx.
 app-portage/nattka depgraph-order
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index f1e9b3c2ab04..4ab52f3cd7f7 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -44,7 +44,6 @@ app-editors/emacs xwidgets
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-20)
 # dev-python/PyQt5 is not stable.
 dev-python/matplotlib qt5 test
-dev-python/matplotlib-python2 qt5 test
 media-sound/pulseaudio qt5
 net-print/hplip qt5
 
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 6e70f40cc3f2..e14205e93a8d 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,12 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# ppc32 has no virtual/rust support yet, needed by newer
+# gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no ppc keywords
 app-editors/emacs xwidgets
 gnome-extra/evolution-data-server oauth
 app-office/gnucash gui doc
 dev-util/geany-plugins markdown
+>=media-gfx/gthumb-3.10.0 http
 # needs mail-client/evolution, depends on net-libs/webkit-gtk
 app-office/planner eds
 # needs gnome-extra/sushi, depends on net-libs/webkit-gtk
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 0a595e2b137a..e836857218fb 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-07-31)
+# Large amount of missing keywords for cmake and friends
+# bug #720296, bug #724358
+dev-util/cmake doc test
+dev-libs/jsoncpp doc
+
 # Lars Wendler <polynomial-c@gentoo.org> (2020-06-25)
 # Missing keyword. Requires dev-util/cmake which also lacks keyword and
 # possibly a whole bunch of its deps as well
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0332c9e3d788..a4aaa0ba7e4f 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# sparc has no virtual/rust support, needed by newer gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring -zbc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0099caf4fbb5..d81d09541850 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2020-08-01)
+# dev-python/distributed is going to be last rited.
+dev-python/dask distributed
+dev-python/joblib doc
+
 # Michał Górny <mgorny@gentoo.org> (2020-07-30)
 # Forces downgrade of dev-python/ws4py and its revdeps.
 www-apps/nikola websocket
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4c51769639fc..1bc750da3d8b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
+# consolekit is masked for removal
+consolekit
+
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index a21502a83c44..2434ef498d73 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -31,10 +31,12 @@ as - Assamese
 ast - Asturian
 az - Azerbaijani
 be - Belarusian
+bea - Beaver
 bg - Bulgarian
 bn - Bengali
 bn-BD - Bengali (Bangladesh)
 bn-IN - Bengali (India)
+bla - Siksika
 bo - Tibetan
 br - Breton
 brx - Bodo (India)
@@ -43,10 +45,14 @@ ca - Catalan
 ca-valencia - Catalan (Valencian)
 cak - Kaqchikel
 ceb - Cebuano
+ch - Chamorro
 chr - Cherokee
+ckb - Central Kurdish
 cnr - Montenegrin
+cop - Coptic
 co - Corsican
 cs - Czech
+cu - Church Slavic
 cy - Welsh
 da - Danish
 de - German
@@ -86,10 +92,14 @@ fr-CA - French (Canada)
 fy - Western Frisian
 ga - Irish
 gd - Scottish Gaelic
+gez - Geez
 gl - Galician
 gn - Guarani
+got - Gothic
+grc - Ancient Greek (to 1453)
 gu - Gujarati
 gug - Paraguayan Guarani
+gv - Manx
 he - Hebrew
 hi - Hindi
 hr - Croatian
@@ -108,22 +118,27 @@ jbo - Lojban
 jv - Javanese
 ka - Georgian
 kab - Kabyle
+kek - Kekchí
 kk - Kazakh
 km - Central Khmer
 kmr-Latn - Northern Kurdish (Latin script)
 kn - Kannada
 ko - Korean
 kok - Konkani (macrolanguage)
+kpg - Kapingamarangi
 ks - Kashmiri
+ktu - Kituba (Democratic Republic of Congo)
 ku - Kurdish
 ky - Kirghiz
 la - Latin
 lb - Luxembourgish
 lij - Ligurian
+ln - Lingala
 lo - Lao
 lt - Lithuanian
 lv - Latvian
 mai - Maithili
+mg - Malagasy
 mi - Maori
 mk - Macedonian
 ml - Malayalam
@@ -135,6 +150,7 @@ mt - Maltese
 my - Burmese
 nan - Min Nan Chinese
 nb - Norwegian Bokmål
+nd - North Ndebele
 ne - Nepali
 nl - Dutch
 nn - Norwegian Nynorsk
@@ -146,12 +162,17 @@ om - Oromo
 or - Oriya (macrolanguage)
 pa - Punjabi
 pl - Polish
+pon - Pohnpeian
+pot - Potawatomi
+ppk - Uma
+prs - Dari
 ps - Pushto
 pt - Portuguese
 pt-BR - Portuguese (Brazil)
 pt-PT - Portuguese (Portugal)
 qu - Quechua
 rm - Romansh
+rmq - Caló
 ro - Romanian
 ru - Russian
 rw - Kinyarwanda
@@ -164,6 +185,8 @@ si - Sinhala
 sid - Sidamo
 sk - Slovak
 sl - Slovenian
+sml - Central Sama
+sn - Shona
 so - Somali
 son - Songhai languages
 sq - Albanian
@@ -176,6 +199,7 @@ sv - Swedish
 sw - Swahili (macrolanguage)
 sw-TZ - Swahili (Tanzania)
 syc - Classical Syriac
+syr - Syriac
 ta - Tamil
 ta-LK - Tamil (Sri Lanka)
 te - Telugu
@@ -184,10 +208,12 @@ th - Thai
 ti - Tigrinya
 tk - Turkmen
 tl - Tagalog
+tlh - Klingon
 tn - Tswana
 to - Tonga (Tonga Islands)
 tr - Turkish
 ts - Tsonga
+tsg - Tausug
 tt - Tatar
 ug - Uyghur
 uk - Ukrainian
@@ -195,6 +221,7 @@ ur - Urdu
 uz - Uzbek
 ve - Venda
 vi - Vietnamese
+vls - Vlaams
 xh - Xhosa
 yi - Yiddish
 yo - Yoruba
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
index 74e6d3748ee5..fbf0bdcfb18a 100644
--- a/profiles/features/multilib/make.defaults
+++ b/profiles/features/multilib/make.defaults
@@ -13,4 +13,4 @@ USE="multilib"
 # FEATURES="multilib-strict" specific settings.
 MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"
 MULTILIB_STRICT_DENY="64-bit.*shared object"
-MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec|llvm)"
+MULTILIB_STRICT_EXEMPT="(perl5|gcc|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec|llvm)"
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index a61840d2484b..b7dca5d25359 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -61,21 +61,6 @@ gnome-base/libgnome-keyring
 gnome-base/libgnomeui
 gnome-base/orbit
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-16)
-# Virtuals for Python 2 backports.  Mostly obsolete, and some of them
-# are really confusing.  Use $(python_gen_cond_dep ...) instead
-# if your package still needs to support Python 2 (or remove it
-# for Python 3 only packages).
-virtual/python-backports_abc
-virtual/python-enum34
-virtual/python-funcsigs
-virtual/python-futures
-virtual/python-ipaddress
-virtual/python-pathlib
-virtual/python-singledispatch
-virtual/python-typing
-virtual/python-unittest-mock
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-03-08)
 # dev-python/pygtk is in the process of being removed, tracker bug #706462
 dev-python/pygtk
@@ -89,13 +74,6 @@ x11-libs/gtkglext
 # bug #699796.
 virtual/libffi
 
-# Jason A. Donenfeld <zx2c4@gentoo.org> (2019-12-30)
-# Directly install net-vpn/wireguard-tools and net-vpn/wireguard-modules.
-# This may be accomplished by running:
-#     emerge -nO net-vpn/wireguard-tools net-vpn/wireguard-modules
-#     emerge -C virtual/wireguard
-virtual/wireguard
-
 # Michał Górny <mgorny@gentoo.org> (2019-12-30)
 # PyPy packages have been restructured, and the virtual is no longer
 # necessary.  Depend on dev-python/pypy{,3} instead.
diff --git a/profiles/package.mask b/profiles/package.mask
index 6192322bc630..772e99988ff0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,155 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-08-02)
+# Discontinued.  Last patch in 2008.  Py2 only.
+# Removal in 30 days.  Bug #734632.
+x11-misc/pypanel
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-02)
+# Stuck on py2.  Last release in 2010, last commit in 2014.  No revdeps.
+# Blocks dev-python/mysql-python removal.
+# Removal in 30 days.  Bug #735178.
+dev-python/python-openid
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-02)
+# Discontinued upstream in favor of dev-python/mock.  Py2 only.
+# The only revdep is last rited now.
+# Removal in 30 days.  Bug #735158.
+dev-python/mox
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-02)
+# Discontinued upstream in 2015.  Python 2 only.  No revdeps.
+# abseil-py (not package) is the suggested replacement.
+# Removal in 30 days.  Bug #735156.
+dev-python/google-apputils
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
+# consolekit is abandoned upstream.
+# People are encouraged to switch to any logind
+# implementation (systemd/elogind).
+# Removal in 60 days (bug #727730)
+sys-auth/consolekit
+sec-policy/selinux-consolekit
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-02)
+# Py3.6 backport for dataclasses. No rdeps left.
+# Removal in 30 days
+dev-python/dataclasses
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py3.6 only. Dead upstream.
+# Removal in 30 days. Bug #718898
+dev-python/cloudlib
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days. Bug #722060
+app-arch/cfv
+app-arch/ipkg-utils
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days
+# Bug #568602,#340164,#560840,#716420,#560254
+# #476424,#643982
+app-accessibility/SphinxTrain
+app-accessibility/sphinx3
+app-accessibility/sphinxbase
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Upstream has py3 versions
+# m-n. Removal in 30 days.
+www-apps/scgi
+www-apache/mod_scgi
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days
+app-crypt/openssl-blacklist
+app-crypt/ssh-multiadd
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Upstream has py3 version
+# Removal in 30 days. Bug #709278
+media-gfx/printrun
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days
+dev-python/pyvorbis
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days
+dev-python/pyrex
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream. Fails to build
+# Removal in 30 days. Bug #662572,#730328
+dev-python/pyode
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days
+dev-python/pylzma
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream
+# Removal in 30 days
+dev-python/pyid3lib
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream
+# Removal in 30 days
+dev-python/pupynere
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream
+# Removal in 30 days
+dev-python/id3-py
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Dead upstream.
+# Removal in 30 days. Bug #706238
+dev-python/flup
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-01)
+# Python 2 backport, not used by anything anymore.
+# Removal in 30 days.
+dev-python/backports-abc
+dev-python/backports-lzma
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Use dev-python/lxml instead.
+# Removal in 30 days
+dev-python/elementtree
+
+# Aaron Bauman <bman@gentoo.org> (2020-08-01)
+# Py2 only. Last upstream release 2013.
+# Removal in 30 days. Last 2 have deps on cddb.
+dev-python/cddb-py
+media-sound/exaile
+media-sound/jack
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-01)
+# This package's tests are seriously broken (they access random Internet
+# hosts for no good reason all the time), and it has no real revdeps.
+# Removal in 30 days.  Bug #735010.
+dev-python/distributed
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-07-31)
+# Broken package with dead upstream.
+# Libraries like tikz/pgf can be used as a replacement.
+# Removal in 30 days.
+dev-tex/herm-pic
+
+# Jason A. Donenfeld <zx2c4@gentoo.org> (2020-07-31)
+# This package has been deprecated for 8 months now, in addition to
+# loud ewarns upon every install. It is replaced with explicitly
+# installing net-vpn/wireguard-tools. Removal in 7 days.
+virtual/wireguard
+
 # Michał Górny <mgorny@gentoo.org> (2020-07-28)
 # Masked for the time being due to dep on LLVM 8.  Bug #720236.
 <=dev-ada/gps-2019-r1
@@ -236,6 +385,17 @@ dev-perl/Data-Diver
 ~virtual/perl-Archive-Tar-2.360.0
 ~virtual/perl-autodie-2.320.0
 ~virtual/perl-Compress-Raw-Bzip2-2.93.0
+~virtual/perl-Compress-Raw-Zlib-2.93.0
+~virtual/perl-CPAN-2.270.0
+~virtual/perl-DB_File-1.853.0
+~virtual/perl-Devel-PPPort-3.570.0
+~virtual/perl-Digest-MD5-2.550.100_rc
+~virtual/perl-Dumpvalue-1.210.0
+~virtual/perl-Encode-3.60.0
+~virtual/perl-Exporter-5.740.0
+~virtual/perl-ExtUtils-CBuilder-0.280.234
+~virtual/perl-ExtUtils-MakeMaker-7.440.0
+~virtual/perl-Filter-Simple-0.960.0
 
 # Christoph Junghans <junghans@gentoo.org> (2020-07-14)
 # Unmaintained upstream and does not support systemd or firewalld.
@@ -243,11 +403,6 @@ dev-perl/Data-Diver
 # Removal in 30 days.
 app-admin/denyhosts
 
-# Matt Turner <mattst88@gentoo.org> (2019-09-01)
-# Icons look funny. E.g., the X (close) icon is wrong. I suspect files are
-# installed incorrectly
->=x11-themes/adwaita-icon-theme-3.36
-
 # William Hubbs <williamh@gentoo.org> (2020-07-14)
 # The kubernetes split packages are old versions with known security
 # issues.
@@ -370,23 +525,12 @@ media-gfx/uniconvertor
 # Removal in 30 days.
 dev-tex/cjk-latex
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-07-01)
-# Depends on dead gnome-base/libgnomeui, bug #726816, dead upstream. Big Debian
-# patch exists, but we won't become new upstream. Masked for removal in 30 days.
-games-board/teg
-
 # Stephan Hartmann <stha09@googlemail.com> (2020-06-29)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
 >=www-client/chromium-86
 
-# Mart Raudsepp <leio@gentoo.org> (2020-06-27)
-# Disappeared upstream and download locations. Potential replacements:
-# media-sound/quimup, xfce-extra/xfce4-mpc-plugin, media-sound/xfmpc
-# Bug 729822. Removal in 30 days.
-media-sound/guimup
-
 # Hans de Graaff <graaff@gentoo.org> (2020-06-14)
 # Ruby 2.4 is no longer supported by upstream and no longer gets
 # security updates since the 2.4.10 release. Use ruby 2.5 or later
@@ -511,11 +655,6 @@ www-plugins/passff
 ~dev-python/setuptools-46.1.3
 >=dev-python/setuptools-47
 
-# Ulrich Müller <ulm@gentoo.org> (2020-01-06)
-# Snapshots from Git and pretest versions, masked for testing.
-=app-editors/emacs-27.0.50_pre*
-~app-editors/emacs-27.0.90
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index a5b0d5ffa135..f47f8d80b660 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # When you add an entry to the top of this file, add your name, the date, and
@@ -8,6 +8,17 @@
 # NOTE: Please add your entry at the top!
 #
 
+# Fabian Groffen <grobian@gentoo.org> (2020-08-02)
+# Python 3.6 is soon going away and won't be updated for Prefix anymore.
+dev-lang/python:3.6
+
+# Fabian Groffen <grobian@gentoo.org> (2020-08-02)
+# Python 2 is no longer supported
+# Recent Portage releases no longer supports Python 2, and the version
+# available in the Prefix tree has security issues.  If you still need
+# Python 2, you should really look into moving away from it.
+dev-lang/python:2.7
+
 # Fabian Groffen <grobian@gentoo.org> (2017-04-15)
 # reentrant patch breaks prefix option, bug #615560
 =sys-devel/flex-2.6.3-r1
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 1bbc8fbbd656..eec7f2215773 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -16,7 +16,6 @@ move net-misc/strongswan net-vpn/strongswan
 move net-misc/tinc net-vpn/tinc
 move net-misc/vpnc net-vpn/vpnc
 move net-misc/vpncwatch net-vpn/vpncwatch
-move net-misc/wireguard virtual/wireguard
 move net-misc/vtun net-vpn/vtun
 move net-misc/isatapd net-vpn/isatapd
 move net-misc/iodine net-vpn/iodine
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 6551d58beb06..0235d8a7c60e 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -5,7 +5,6 @@ slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
 move media-libs/libkgeomap kde-apps/libkgeomap
 slotmove =dev-python/pyfltk-1.3.3 1 0
-move virtual/funcsigs virtual/python-funcsigs
 move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
 slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2
 move dev-perl/module-info dev-perl/Module-Info
diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019
index 5a0b3ea10df2..55d4ca511320 100644
--- a/profiles/updates/4Q-2019
+++ b/profiles/updates/4Q-2019
@@ -5,4 +5,3 @@ move app-admin/graylog2 app-admin/graylog
 move media-libs/libclthreads dev-libs/libclthreads
 move media-libs/libclxclient x11-libs/libclxclient
 slotmove net-misc/teamviewer 15 0
-move net-vpn/wireguard virtual/wireguard
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c512b99f3e4d..5ba1c0ac0bd0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1197,6 +1197,7 @@ app-text/pandoc:http-conduit - Enable downloading of resources over https.
 app-text/pandoc:https - Enable support for downloading of resources over https.
 app-text/pandoc:make-pandoc-man-pages - Build program to regenerate pandoc man pages from README.
 app-text/pandoc:network-uri - Get Network.URI from the network-uri package.
+app-text/pandoc:optimize - Enable -O1 optimizations (requires ~16GiB memory)
 app-text/pandoc:trypandoc - Build trypandoc cgi executable.
 app-text/pandoc:weigh-pandoc - Build weigh-pandoc to measure memory usage.
 app-text/pastebinit:crypt - Install pbputs for gpg-encrypted pastes
@@ -1234,6 +1235,7 @@ app-text/stardict:wordnet - Enable wordnet plugin to find similar English words
 app-text/stardict:xdxfparse - Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)
 app-text/stardict:youdaodict - Enable youdao.com network plugin (for Chinese language)
 app-text/sword:clucene - Use dev-cpp/clucene for lucene search support
+app-text/sword-modules:esoteric - Install modules with no linguistic content, in unknown languages etc.
 app-text/tessdata_best:osd - Enable support orientation and script detection.
 app-text/tessdata_fast:osd - Enable support orientation and script detection.
 app-text/tessdata_legacy:math - Enable support for recognition of equations.
@@ -1535,10 +1537,15 @@ dev-games/simgear:dns - Enable DNS resolver via net-libs/udns
 dev-games/simgear:gdal - Enable alternative terrain engine based on pagedLOD via sci-libs/gdal
 dev-games/simgear:subversion - Enable terrasync scenery downloader
 dev-haskell/abstract-deque:usecas - Enable the reference implementation to use hardware compare-and-swap.
+dev-haskell/aeson:cffi - Controls whether to include c-ffi bits or pure haskell. Default to False for security.
+dev-haskell/aeson:fast - compile without optimizations
 dev-haskell/aeson-pretty:lib-only - don't build 'aeson-pretty' executable.
 dev-haskell/ansi-terminal:example - Build the example application.
 dev-haskell/ansi-wl-pprint:example - Build the example application.
+dev-haskell/attoparsec-iso8601:developer - operate in developer mode
+dev-haskell/attoparsec-iso8601:fast - compile without optimizations
 dev-haskell/authenticate:network-uri - Get Network.URI from the network-uri package
+dev-haskell/aws:network-3 - Use network-3
 dev-haskell/bifunctors:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/bifunctors:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/biosff:fclip - Build the fclip executable.
@@ -1548,6 +1555,7 @@ dev-haskell/blaze-builder-enumerator:newbuilder - use bytestring-builder instead
 dev-haskell/bytedump:executable - build executable file
 dev-haskell/bytes:test-doctests - Enable the doctest suite when using the enable-tests option for cabal.
 dev-haskell/c2hs:regression - run regression tests
+dev-haskell/cabal-install:native-dns - Enable use of the resolv and windns packages for performing DNS lookups
 dev-haskell/cabal-install:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/cabal-install:noprefs - Ignore 'preferred-versions' file from hackage's tarball.
 dev-haskell/certificate:executable - Build the executable
@@ -1591,7 +1599,13 @@ dev-haskell/gtk:gio - Depend on GIO package, thereby enabling certain features.
 dev-haskell/gtk2hs-buildtools:closuresignals - Use the the GClosure-based signals implementation.
 dev-haskell/gtk3:fmode-binary - Set the default file translation mode for file I/O operations to _O_BINARY.
 dev-haskell/gtk3:gio - Depend on GIO package, thereby enabling certain features.
+dev-haskell/hackage-security:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hackage-security:use-network-uri - Get Network.URI from the network-uri package.
+dev-haskell/hakyll:buildwebsite - Build the hakyll website
+dev-haskell/hakyll:checkexternal - Include external link checking
+dev-haskell/hakyll:previewserver - Include the preview server
+dev-haskell/hakyll:usepandoc - Include Pandoc support
+dev-haskell/hakyll:watchserver - wait for filesystem changes and rebuild pages
 dev-haskell/happstack-server:network-uri - Get Network.URI from the network-uri package
 dev-haskell/happstack-server:template-haskell - Description: Template Haskell is available on this system
 dev-haskell/hashed-storage:diff - Provide the Storage.Hashed.Diff module.
@@ -1613,6 +1627,7 @@ dev-haskell/hlint:gpl - Use GPL libraries, specifically hscolour.
 dev-haskell/hps:build-exec - Build the `hps-fractals' executable
 dev-haskell/hs3:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hslogger:buildtests - Build the executable to run unit tests.
+dev-haskell/hslogger:network-3 - Use network-3
 dev-haskell/hslua:apicheck - Compile Lua with -DLUA_USE_APICHECK..
 dev-haskell/hslua:system-lua - Use the system-wide lua instead of the bundled copy.
 dev-haskell/hsopenssl:fast-bignum - Enable fast moving of bignums between OpenSSL and GMP (GHC Only)
@@ -1622,6 +1637,7 @@ dev-haskell/http-api-data:use-text-show - Use text-show library for efficient To
 dev-haskell/http-client:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/http-streams:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/httpd-shed:buildexamples - Build example executables.
+dev-haskell/httpd-shed:network-bsd - Get Network.BSD from the network-bsd package.
 dev-haskell/httpd-shed:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/hxt:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/icalendar:network-uri - use network-uri package
@@ -1643,21 +1659,32 @@ dev-haskell/lens:test-hunit - You can disable the hunit test suite with -f-test-
 dev-haskell/lens:test-properties - Build the properties test if we're building tests
 dev-haskell/lens:test-templates - Build the test templates if we're building tests
 dev-haskell/lens:trustworthy - Assert that we are trustworthy when we can
+dev-haskell/libyaml:no-unicode - Don't enable unicode output. Instead, unicode characters will be escaped.
+dev-haskell/libyaml:system-libyaml - Use the system-wide libyaml instead of the bundled copy
 dev-haskell/lifted-async:monad-control-1 - Use moand-control == 1.*
 dev-haskell/linear:template-haskell - You can disable the use of the `template-haskell` package using `-f-template-haskell`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
+dev-haskell/lukko:ofd-locking - Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014).
+dev-haskell/missingh:network-3 - Use network-3
 dev-haskell/monad-control:instancest - If enabled this package will export MonadBaseControl instances for the lazy and strict ST monad. If disabled these instances are only exported when base >= 4.4. If enabled it is required that the transformer-base package exports MonadBase instances for ST. It will do this by default.
 dev-haskell/monad-logger:template-haskell - Enable Template Haskell support.
 dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-stealing.
-dev-haskell/nats:hashable - You can disable the use of the `hashable` package using USE=-hashable. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If set we will not supply an instance of `Hashable`.
+dev-haskell/nats:binary - enable binary instances
+dev-haskell/nats:hashable - enable hashable instances
+dev-haskell/nats:template-haskell - enable template_haskell
+dev-haskell/netlink:generators - build the generator scripts for constants
 dev-haskell/network-data:small-base - Build the split-up base package.
+dev-haskell/optparse-simple:build-example - Build the example executable
 dev-haskell/pandoc-citeproc:bibutils - use Chris Putnam's app-text/bibutils
 dev-haskell/pandoc-citeproc:embed-data-files - Embed locale files into the library (needed for windows packaging)
 dev-haskell/pandoc-citeproc:hexpat - use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing
 dev-haskell/pandoc-citeproc:network - use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs
 dev-haskell/pandoc-citeproc:small-base - Choose the new smaller, split-up base package.
 dev-haskell/pandoc-citeproc:test-citeproc - Build the test-citeproc program
+dev-haskell/pandoc-citeproc:unicode-collation - Use Haskell bindings to the dev-libs/icu
 dev-haskell/pandoc-citeproc:unicode_collation - Use Haskell bindings to the dev-libs/icu
 dev-haskell/parsec-numbers:parsec1 - use dev-haskell/parsec1 instead of dev-haskell/parsec
+dev-haskell/parsers:attoparsec - Enable the use of the `attoparsec` package
+dev-haskell/parsers:parsec - Enable the use of the `parsec` package
 dev-haskell/persistent:nooverlap - Use OverlappingInstances only for String. Only developers should use this.
 dev-haskell/persistent-sqlite:build-sanity-exe - Build a sanity check test executable.
 dev-haskell/pointed:comonad - optional instances
@@ -1675,6 +1702,7 @@ dev-haskell/quickcheck:template-haskell - Enable additional test modules requiri
 dev-haskell/recaptcha:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/reflection:template-haskell - Enable template haskell.
 dev-haskell/rfc5051:mkunicodedata - build codes generator itself
+dev-haskell/sandi:conduit - Build with conduit
 dev-haskell/sandi:with-conduit - Build with conduit
 dev-haskell/scientific:bytestring-builder - Provide the Data.ByteString.Builder.Scientific module (requires bytestring >= 0.10).
 dev-haskell/semigroupoid-extras:profunctors - You can disable the use of the `profunctors` package using `-f-profunctors`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1683,6 +1711,7 @@ dev-haskell/semigroupoids:containers - You can disable the use of the `container
 dev-haskell/semigroupoids:contravariant - You can disable the use of the `contravariant` package using `-f-contravariant`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Contravariant`
 dev-haskell/semigroupoids:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
 dev-haskell/semigroupoids:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
+dev-haskell/semigroupoids:unordered-containers - Enable the use of the `unordered-containers` package (and also its dependency `hashable`). Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroups:binary - provide instances for binary package
 dev-haskell/semigroups:bytestring - You can disable the use of the `bytestring` package using USE=-bytestring. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/semigroups:containers - You can disable the use of the `containers` package using USE=-containers. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1706,10 +1735,13 @@ dev-haskell/skein:big-endian - When manually selecting the endianness, use big-e
 dev-haskell/skein:force-endianness - Use a manually selected endian when compiling (see flag 'big-endian')
 dev-haskell/skein:reference - Use the reference implementation instead of the optimized one
 dev-haskell/skylighting:executable - Build the skylighting executable.
+dev-haskell/skylighting-core:executable - Build the skylighting executable.
 dev-haskell/snap-core:portable - No non-haskell unportable code.
 dev-haskell/snap-server:build-pong - Build a server that just returns "PONG"
 dev-haskell/snap-server:openssl - enable https support using dev-haskell/hsopenssl
 dev-haskell/snap-server:portable - no non-haskell unportable code.
+dev-haskell/splitmix:optimised-mixer - Use JavaScript for mix32
+dev-haskell/splitmix:random - Providen RandomGen SMGen instance
 dev-haskell/tagsoup:download - Build with Download module.
 dev-haskell/tagsoup:testprog - Build the test program.
 dev-haskell/tasty:colors - Enable colorful output
@@ -1721,6 +1753,7 @@ dev-haskell/thyme:bug-for-bug - bug-for-bug compatibility with time
 dev-haskell/thyme:lens - use the full lens package
 dev-haskell/thyme:show-internal - instance Show of internal representation
 dev-haskell/tls:compat - Accept SSLv2 compatible handshake.
+dev-haskell/tls:hans - Use the Haskell Network Stack (HaNS).
 dev-haskell/tls:network - Use the base network library.
 dev-haskell/transformers-base:orphaninstances - Build instances for orphan datatypes.
 dev-haskell/transformers-compat:three - Use transformers-0.3
@@ -1738,6 +1771,9 @@ dev-haskell/void:safe - dissable effective but unsafe coersions
 dev-haskell/wai-app-static:print - print debug info.
 dev-haskell/warp:allow-sendfilefd - Allow use of sendfileFd (not available on GNU/kFreeBSD).
 dev-haskell/warp:warp-debug - Add additional debuging information
+dev-haskell/wcwidth:cli - Enable command line tool
+dev-haskell/wreq:aws - Enable AWS tests
+dev-haskell/wreq:httpbin - Install client
 dev-haskell/x11:screensaver - whether to build XScreenSaver.
 dev-haskell/x509-store:executable - Build the executable
 dev-haskell/xss-sanitize:network-uri - Get Network.URI from the network-uri package.
@@ -1861,10 +1897,10 @@ dev-lang/gdl:proj - Add support for sci-libs/proj (geographic projections)
 dev-lang/gdl:udunits - Add support for manipulating units of physical quantities
 dev-lang/gforth:check - Enable build-time sanity check.
 dev-lang/ghc:binary - Install the binary version directly, rather than using it to build the source version.
-dev-lang/ghc:elfutils - Enable DWARF-based baclktraces using dev-libs/elfutils.
+dev-lang/ghc:elfutils - Enable DWARF-based backtraces using dev-libs/elfutils.
 dev-lang/ghc:ghcbootstrap - Internal: Bootstrap GHC from an existing GHC installation.
 dev-lang/ghc:ghcmakebinary - Internal: Build binary friendly for redistribution.
-dev-lang/ghc:gmp - use dev-libs/gmp for integer operations (works faster, but an external depend).
+dev-lang/ghc:gmp - Use dev-libs/gmp for integer operations (works faster, but an external depend).
 dev-lang/ghc:numa - Enable NUMA thread balancing policy using sys-process/numactl.
 dev-lang/gnat-gpl:ada - Build the ADA language (GNAT) frontend
 dev-lang/gnat-gpl:awt - Useful only when building GCJ, this enables Abstract Window Toolkit (AWT) peer support on top of GTK+
@@ -3046,6 +3082,9 @@ dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DA
 dev-vcs/git-annex:assistant - Enable git-annex assistant and watch command
 dev-vcs/git-annex:benchmark - Enable benchmarking
 dev-vcs/git-annex:concurrentoutput - Use concurrent-output library (experimental)
+dev-vcs/git-annex:debuglocks - Debug location of MVar/STM deadlocks
+dev-vcs/git-annex:magicmime - Use libmagic to determine file MIME types
+dev-vcs/git-annex:network-3 - Use network-3
 dev-vcs/git-annex:network-uri - Get Network.URI from the network-uri package.
 dev-vcs/git-annex:pairing - Enable pairing of git annex repositories
 dev-vcs/git-annex:s3 - Enable Amazon S3 remote
@@ -3147,11 +3186,6 @@ games-board/stockfish:general-32 - Generic unoptimized 32-bits build
 games-board/stockfish:general-64 - Generic unoptimized 64-bits build
 games-board/stockfish:optimize - Enable upstream -O3 optimizations (default enabled)
 games-board/tablebase-syzygy:6-pieces - Install tablebases for 6 pieces (huge!)
-games-board/teg:client - Compile the client
-games-board/teg:debug - Turn on debugging
-games-board/teg:ggz - Enable GGZ Gaming Zone support
-games-board/teg:robot - Compile the robot
-games-board/teg:server - Compile the server
 games-board/xboard:default-font - Install the default font that xboard uses
 games-board/xboard:zippy - Enable experimental zippy client
 games-emulation/dolphin:discord-presence - Enables Discord Rich Presence, show the current game on Discord
@@ -4554,7 +4588,9 @@ media-sound/asunder:mac - Support for creation of Monkey's Audio files (APE)
 media-sound/audacity:id3tag - Enables ID3 tagging with id3tag library
 media-sound/audacity:lv2 - Add support for Ladspa V2
 media-sound/audacity:midi - Enables MIDI support
+media-sound/audacity:portmidi - Enable support for MIDI via media-libs/portmidi
 media-sound/audacity:portmixer - Enable the internal portmixer feature
+media-sound/audacity:portsmf - Enable support for Portable Standard Midi File Library
 media-sound/audacity:sbsms - Enables sbsms library support for slower, more accurate pitch and tempo changing
 media-sound/audacity:soundtouch - Enables soundtouch library support for pitch and tempo changing
 media-sound/audacity:twolame - Enables twolame support (MPEG Audio Layer 2 encoder)
@@ -8658,7 +8694,6 @@ www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
 www-apps/kibana-bin:x-pack - Enable additional features (may need a license)
 www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
-www-apps/netbox:webhooks - Enable webhooks via django-rq
 www-apps/nikola:assets - Support web asset management through dev-python/assets
 www-apps/nikola:charts - Support chart generation through dev-python/pygal
 www-apps/nikola:ghpages - Add support for direct uploading to github pages thru dev-vcs/ghp-import
@@ -8983,11 +9018,20 @@ x11-misc/xkbd:xrandr - Enable XRandR support through x11-libs/libXrandr
 x11-misc/xkbset:tk - Install the dev-perl/Tk based xkbset-gui utility
 x11-misc/xlockmore:vtlock - Enables support for virtual terminal locking
 x11-misc/xlockmore:xlockrc - Enables xlockrc for people without PAM
+x11-misc/xmobar:alsa - Use alsa-mixer to get the volume from soundcards
 x11-misc/xmobar:conduit - Use conduit to fetch weather data.
+x11-misc/xmobar:dbus - Publish a service on the session bus for controlling xmobar
+x11-misc/xmobar:inotify - inotify support (modern Linux only). Required for the Mail and MBox plugins
+x11-misc/xmobar:iwlib - Wireless info support via Wext ioctls (deprecated)
 x11-misc/xmobar:mpd - Support mpd plugin
 x11-misc/xmobar:mpris - Enables MPRIS v1, v2 support
+x11-misc/xmobar:rtsopts - Reduce process wakekups frequency to decrease CPU usage
 x11-misc/xmobar:timezone - Enables localized date support
-x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia.
+x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia
+x11-misc/xmobar:weather - Enable weather plugin
+x11-misc/xmobar:wifi - Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux
+x11-misc/xmobar:xft - Use Xft to render text. UTF-8 support included
+x11-misc/xmobar:xpm - Enable usage of xpm for icons
 x11-misc/xscreensaver:gdk-pixbuf - Include support for the x11-libs/gdk-pixbuf library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
 x11-misc/xscreensaver:locking - Compile in support for locking the display
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index ee1fa01bf832..477002ef6507 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/openbabel-python/Manifest b/sci-chemistry/openbabel-python/Manifest
index 5ded7d1cda4a..cc936a87477e 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -1,4 +1,4 @@
 AUX openbabel-python-2.3.2-gcc-6_and_7-backport.patch 637 BLAKE2B e913c1d1bc93fd8443faa20fc9d7b28b89b276f7561d4208a42abd379111d19ff26179b2fbdca946a9df38e42d31f32b68423be073611e79615dcd6ae20d8f0d SHA512 0108f7bc83e046e29b2ae0b822787f58c6930de775dc94df89ba741f41cb3873a3bd2b677c11ccad4c32172e486b8331c25492127c83e4ab8d066bd129aa5538
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
-EBUILD openbabel-python-2.4.1-r1.ebuild 2166 BLAKE2B 45ed425ebe47014c04d8f71661d0e29259d7b3d598695de0c7f0c7027b1488e70855ab4acb74b3d901f706bd58a8cb43ef7f4b1d5f927f8a16220f0cf7ffba41 SHA512 03bfaad27c45362252ebd719d7b526e977b1330e02251e8c82e0568c9f8a8759a5796dd2a22f22419d0f3465fe325d45c4f41a40b9a85edb14cd0a8ad4bed1b7
+EBUILD openbabel-python-2.4.1-r1.ebuild 2156 BLAKE2B 5d6def900a348c7d090e2caa177ca7b4a5c2dc08ed6e77bec76801b36d3bdc092a0fa31bc4ae18d4152c6391feaf35e8856cda50e4889d5c0643e25528fd53ed SHA512 df4c7d34a91ab093a39d99b342b36c9c9984e8bc9e7e18f31641873da86baef4f1141bef20cb2493287bd38e1099b48b6b212fae2e0d21eaf5b04a30943cf281
 MISC metadata.xml 737 BLAKE2B 9a5fe97df44ce22c6ee27133bbc6144132ee3775db77440adcd6c3e9c44b87cefbace4ebe17906af87f841e07deef5183e451a8c193232d2a6ca7da05c7a0ed7 SHA512 7ff97ef3f6752a8fed578676aa2cb9706b7d68e31ee22d26e90d4bbb01c10ff410b66da20a91b078293add3bcb3a3711ad180d5174368e0d588ea718ad297d7e
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild
index 270018c23410..fe6933bd9868 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-r1
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index fcffc5ef7882..69bc84fa32a7 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,5 +1,4 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
 DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133
-EBUILD pymol-2.3.0-r2.ebuild 3189 BLAKE2B b696daab150edc9c5b69e330f68d0a79bb825d39d69e6b149a90be7f12a3956525b91373f330e528178b2732b84b86f6e9ae1624c8cad48eb1580e81b4bde38a SHA512 4c4c4e94c768325728584e6c424e7c7d87e4daab291c0f6bad2c6f527645056d0b9b4fefc822543542f27431f51a1f1a6cda1ab7fb9136d0f44a11c6129060be
 EBUILD pymol-2.3.0-r3.ebuild 3005 BLAKE2B 697c52ef412f18a8088c82c6f71ef7b10ffb28201aaaf5b651cfad512ce1f3340f74292dc54e9005e5c153d50bf8d3c9de1df1a71516c5258b4a6256fc9b9429 SHA512 9f248137b6cd1c4a0233c83738597e42b43b65f1331c6a19a841a36719328996fc9902f599848d791963f41e65dc9f7c76f967dae26286488a49b5cfd13572d1
 MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
deleted file mode 100644
index 5eadc9a8512d..000000000000
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
-
-DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="https://www.pymol.org/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
-	https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-RESTRICT="mirror"
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="web"
-
-DEPEND="
-	dev-libs/msgpack[cxx]
-	dev-libs/mmtf-cpp
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/pmw:py2[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/libpng:0=
-	media-video/mpeg-tools
-	sys-libs/zlib
-	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
-	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-S="${WORKDIR}"/${PN}-open-source-${PV}
-
-python_prepare_all() {
-	sed \
-		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
-		-e "/import/s:argparse:argparseX:g" \
-		-i setup.py || die
-
-	sed \
-		-e "s:/opt/local:${EPREFIX}/usr:g" \
-		-e '/ext_comp_args/s:\[.*\]:[]:g' \
-		-i setup.py || die
-	sed \
-		-e "s:\['msgpackc'\]:\['msgpack'\]:g" \
-		-i setup.py || die
-
-	append-cxxflags -std=c++0x
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--pymol-path="${EPREFIX}/usr/share/pymol"
-
-	sed \
-		-e '1d' \
-		-e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \
-		-e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-		-e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \
-		-i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	sed \
-		-e '1i#!/usr/bin/env python' \
-		"${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die
-
-	python_foreach_impl python_doscript "${T}"/${PN}
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-		PYMOL_PATH="${EPREFIX}/usr/share/pymol"
-		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
-		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol
-
-	newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png
-	make_desktop_entry ${PN} PyMol ${PN} \
-		"Graphics;Education;Science;Chemistry;" \
-		"MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"
-
-	if ! use web; then
-		rm -rf "${D}/$(python_get_sitedir)/web" || die
-	fi
-
-	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9c195ea44f8b..16170ba6bc49 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest
index 3f8085bf2211..2aae14bc853e 100644
--- a/sci-electronics/drahnr-oregano/Manifest
+++ b/sci-electronics/drahnr-oregano/Manifest
@@ -1,3 +1,3 @@
 DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e
-EBUILD drahnr-oregano-0.84.40.ebuild 1780 BLAKE2B 69527f3645ae0b79778438486b8a3bb9e9ea0b0eaed44d7d74138d1512827049efa330c1b37aaee95ad020707973757608e12d4447bebc38060e5c6c6d560914 SHA512 1b3be7181702d78bd43a52ee4720909f28c88d5ca4bc3f5bd11397198532a7d6dfc0921bf24a0eb3fbd1afd694de9e632eaf8012daaa5167949443ee7c1d8249
+EBUILD drahnr-oregano-0.84.40.ebuild 1779 BLAKE2B 528ff3b1632a5517ce0e11574912d328ac4881f3ca448cf276cb03e8f7a8b2e5c6a9896339076c3d42a89b6dd9d978746551c05895215002729c39a8d8053514 SHA512 846767b86673a7f2f3260f32090a3dec33d59e315142fbd6689b9a1789f548ab1c71f9123dff903ed4119c816bafdec5bc8386bbb7714e7d1f1ef33707021e4d
 MISC metadata.xml 697 BLAKE2B 33ffc4e10380de68a45856ab50a4b3dafdcbfa11c9695a039c6f0ce2cfa74b287f3c130f7273def9e02d27d011aad88e866be369b7e75cbc80281bdf40c64dd5 SHA512 d534f45e3427d45837bf59465e5aa4141a1c2a005c1815a50c081b14b2cb622e8eae8614d878e79489bd7d46b874dff235c53b0b4af507ef6c7722285b36267a
diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
index 13339f3334bc..56ed48c4a1fe 100644
--- a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
+++ b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/drahnr/oregano/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 
 S="${WORKDIR}/oregano-${PV}"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7f70418c54b1..8f902852b2e9 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index 29ec3a67279c..1065c65d71d5 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,5 +1,5 @@
 DIST bmrblib-1.0.3.tar.bz2 51246 BLAKE2B e2adc970523b33c88b73451b1c3d50c218e4600e0e1019bb6fa4dbae1c6a6737bcd1661bf68b6863a1199c46f3df1b0ba36c155efe1010152e120ccc23b034ab SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248
 DIST bmrblib-1.0.4.tar.bz2 51211 BLAKE2B 4d901c085648971af0e271d5524d4fe0f0e085f9ab34cde4cbc2d7b17d1dd37ffd4051c219e769738a9eac8b11b6950c5575d1bd9b9193ef48a698560de3fd96 SHA512 579f3beaf343416c58b344a33ee94d42bcedba558b33c2b9f98662d2ffc685887617229b5f7e75acf61712fe4f03827ca4413bc08e3bd2e72f69d952310891e0
-EBUILD bmrblib-1.0.3.ebuild 423 BLAKE2B 2641bd9dfbc31b3f8ba1fc79b207126772067ba042597a906021f11db824e89642b8118e2f9ab414fd017288413e2603e5fcfba420a13732bda7d7eda45ea474 SHA512 81ce3293ee290b4c0aebbba08d3f203d5501129a13fe6b4c3733c08ba45f595ab9b8e571bcbd880599783a9e46f1170a236a23082f3cb0e07d0b8f3d5c80b74d
-EBUILD bmrblib-1.0.4.ebuild 433 BLAKE2B 95bc15a3674992928c20b4e313f031ddc427d87d08bc2438628e618d5a874eb56202c2848dafbd525c7f8e55a28d5faf1852b411a4c776482ca94050d8107b25 SHA512 45079cddd49a13a65f68cbdf9db07f6d5b2591606f85154fafdf9a5a27e0de6531c407968b95ecf4daed02410d8e1a8b81c9b831d6a4d55711dfb8dd14c112b9
+EBUILD bmrblib-1.0.3.ebuild 413 BLAKE2B 04fabbdb185f55d9b8ee1029599ada8ca9d6fc8e6ab67af917019253ecdec2583ee89e79bdb94f45ac5819804f557f00baa27566c318c76de51dd2cd75c9cec4 SHA512 56bebeb0e341bafb0cb7f7b24b5b4322c9c15c8b13ea98b16b0ae44a5dc0d76f6b81ed6d44cfd0e0b334d2722d6bf63fe2aa3461affd6e0c2f51aaf5d472c4e7
+EBUILD bmrblib-1.0.4.ebuild 423 BLAKE2B c1faf463f55358e92bd9f9bdeb175ad3e11e47330f3be985f8f6cf974ac06ed10daabd7f350c673312d9de665624f006f08e92ee90142f10cd92969e133f05ce SHA512 15114ff8bee909682384780887f7dd2227fe44e5709d8d1268db815af7240a4890f55f86d9f56154f23b148dfce504a0a8fe3a646175ac3ea1785f7a6f3accdd
 MISC metadata.xml 697 BLAKE2B 6448efc90859f836649dc91366bc8662fbccac80ee2079880078238b2c9bd7897cb3337aecc727f2dc2da2f8916e766c25bcd5703d1b0eb4b263c3e3481fffb7 SHA512 c09f4efba0b36032d60b363ff7f18a6b477f6a321c7d8069ebcc4bcd0deee1448c1230e5651371a5748cdd66c9032e8ff7c480dfa3af7a712503f3589d282f28
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
index 3211e7e10710..dbc65bf5220c 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild b/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
index c21725212608..90ffd725443b 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index f909bc05e636..e6d288a073b5 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -1,4 +1,4 @@
 AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec
 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
-EBUILD fflas-ffpack-2.4.3.ebuild 1819 BLAKE2B c19cc8094ed7be6ce175d54981fb8fc6a095e0a8011c5695a4386e964db8bb89d5e3ea9fe7f6c98bfc6d7f6fdf45f2148dfbce7d82b095a3f136cbeb8ecc36bb SHA512 dc29cdec219415e969068f685e606cdecac755297965bb3a5ead74d387916d81be30f1ccb3f36b279d99928e34b4cc384e8d58ac338867427c696cecd466ebab
+EBUILD fflas-ffpack-2.4.3.ebuild 1820 BLAKE2B 37b441dab876c538d8adad5a70d3fbb2b6502214d249967f9962487d9b5d0f6f11e3db7a7526c7bae8383857c45e47f4dca48213d53c6c0b2cc4cdb0b40b3109 SHA512 e1560c6a58118c19e60fe61ebd611f64c1b8e8c6250e1dadae539ae21c09e93c5b0a0182a60002fe6b1cb01c6f16bb5f3aab8eba39945f572445dd5b0990822e
 MISC metadata.xml 1461 BLAKE2B 0b4c7c31a7a82eeb2eaa33027ff25877a6f5be4155b0be0018b34ea848b270ceb8393ab9fb4c3a053abc870885da52e5f48589593f4ee8d37762443dbc51bb07 SHA512 f350c0d55e9de16789244d03371d7331e6f41d5c726b6964e3ad4d09d9b74ec83dac56adc5c645f8e90705f833faf31b301d8c39f74bfc976b1883775bd84379
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
index 4115dc61acec..dcbf5194f3b9 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="Library for dense linear algebra over word-size finite fields"
 HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
-SRC_URI="https://github.com/linbox-team/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index d24966087344..dd01441d01ac 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,7 +9,7 @@ DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
 EBUILD fftw-3.3.6_p2.ebuild 4459 BLAKE2B 0585c2fe679f1c849e60be3cf7ad87b5af8aac4d0e342fd064cd6d82c8c29f36fafc430222eb38de5f6bfaaa65547163d132635a818201b8f78d689aed33f957 SHA512 0f19ac77caf1a9e5e449b21498b582a7e6061ddc15754d4e626c89589477109cab56167aba8d9dd13c4729d390e713d5edf28095824a4a1b25520a6c8c1c37ab
-EBUILD fftw-3.3.8-r1.ebuild 4640 BLAKE2B 7898e96dd4fba0576f4ad4eb882bdc12e71f41342d6c5582fe82a63883231a3a29ae76f5f12530145e0b32fd7c37e99b1ea915c82723bafe7ada32d6205d7404 SHA512 4bbdcbad49f6700772137e1858aaefb8ef55426527b682d12695a2967e10030e817c9b7047843c7492e941ba9e521fd8d76f0263709f110b6f318658459938be
+EBUILD fftw-3.3.8-r1.ebuild 4638 BLAKE2B 862ae38410cdfd8850616412d5dbe835fef249d41e2b98242a7e263850aa899df85da646f21d398ba29cf202927ed04646c86bac0fa78041327bfc7ad1482f42 SHA512 0ecba135d131632f5c2e1f485154e6211adf35525f91af3f8e3c0ca65cbaae38f6725ab3e761fcdd2d1b01455b82fe09e63b175cfc1bbf17c14f4c52ae2400a7
 EBUILD fftw-3.3.8.ebuild 4523 BLAKE2B e449bb3e635e45930f18e36ca1cc2989b8d6f7bb6e53f6c937406a461e16badb64833e625327e1ef0c6a39ca8c9ba6360b2712a72e23de298bd774016e6c57ea SHA512 6ac197a894ceb0f29d4e3e22ac45cc48007d62230ee9448260c54a04d77595a7c702fd7884d7f9dd4a8b737adfe99534f268f004eae91de90dbe21e7daeec220
 EBUILD fftw-9999.ebuild 4518 BLAKE2B 41047e346e12e633d2faa45341cff1eb02959295f3000d0c5dc2b74ae366a72ef9c9b5724193c3c4b9ee2e7de4a2c76f2f19451156cae8d7ca6c201c9aab60dc SHA512 122471201bc246cc815abaf074a310ec9e91a9e3bbd9b58ceb3572114318e18f6e3def64d4e027d0022163565d35ba792daa1cc7e4b85150dd4cd7c62ec59422
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index fa52ef3aa6b6..8e21f8a5a91a 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	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"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index c13575417285..f1b1125764d8 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5-r1.ebuild 2811 BLAKE2B 94d651ca2e65b9ec1cd8d498964babd5aa0b6c8a7fafe63d07ca33f47f74e5081118e1c5838edee143832180cbfde66348e1d3c1df603355e9f4fdc0a67fb16f SHA512 27ef1bee33a0171b61bb4c300f46e7b2e754a2aa8c42a0914e2cedf747a284ec18e20a08208020f9ce04ea0124904b5ba0067108edb9fbbc40bdbf7e919c8f0b
+EBUILD hdf5-1.10.5-r1.ebuild 2809 BLAKE2B 4a17bb61658759db9d44b5d5b42bd10c84362536e440474fdc81bfe894fd21afdac83936151ffa90a2ba96faff9579eceb234d95227295de99003fa4b67617c7 SHA512 3ea6072c3a22655a1bc521408a10eaa7f4ee64390ee0bd9d59363bc4bf38b3a5d9fa885cf6b495476d15c15daa3a246837de1e4baf10819a18ff2d63fefd39ba
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index f881d9f4defb..57067a255f0a 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-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="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index f1037b098389..2186d913232f 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0-r1.ebuild 3014 BLAKE2B 7aca59efe351572829c560c70a662eaf2159625b2c90176c0b69796adfb37c8143e56b4aa2787554008984f186ce55e111354abd9972a9be3075b393031bd8ed SHA512 ea79fa55bb41ed56aafa77504d656545119244ab360e152ae39b4de6889f1ff0b590d7ef309cf5d4734ca0cd271280cf1ab1f704492e4c35dcbaace9530f85e7
+EBUILD lapack-3.8.0-r1.ebuild 3012 BLAKE2B 57e626f360ebddfe2082ab00002d0443094883de27308fb2dc16c2f962f93b357e9a0afa51256e0daf24cf8e37069b880a593812736a59e4c1def46126c68b76 SHA512 67cd9e9c732ed137601d2b95baf2efff0cf3c16059973e94e1088c63aada1207052f7bf9065e3b718368d7c065c98e0f81ca8421dda8dd17a1a2245be197cdce
 EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index ecce21d736af..dff0d45f7210 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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"
 IUSE="lapacke deprecated doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/minfx/Manifest b/sci-libs/minfx/Manifest
index 6b7e392877e6..1e7d3ead46b7 100644
--- a/sci-libs/minfx/Manifest
+++ b/sci-libs/minfx/Manifest
@@ -1,15 +1,3 @@
-DIST minfx-1.0.10.tar.gz 61533 BLAKE2B 8d50b220d8a869a228e1ab8e1eeca0351543da4ab1ca02d27d2a692d6982a950b71cb1e1241a742a891eb6aae98a9a0085260ce2c9492cec71fbe2a70785d954 SHA512 200b8b163a5e02f5c2e6935382418642a8fd6d02cf99da015fb267ad598182036e2605174da8e49421ec49fbe00f1148aebc16a7ccfc0a8b18f7a7bc09185755
 DIST minfx-1.0.11.tar.gz 62102 BLAKE2B 1a7a7be4d3a9290be84ec73786712ff99b605d72c13a0c32cd6965df3412d8a1f0de4f0bd9ebc0e4fd231b573fe8b3b9e6862586598452de1a4088cdbd2ffb85 SHA512 1eb3136f363be4e8798bc01e638777ef4713ddc33521980923f0157c7b25cbbb03762b571cea9231f64764a93085ce90b4c521b32d71845a18d5be60b8318976
-DIST minfx-1.0.3.tar.gz 57287 BLAKE2B 4df27ced9636d2b141b4e5297a46d53f0160896bb7c6b9efc90ac88e9186f8d229c72feba2bfa8445869bdcd22c8fa319814b7e078d05226d298b5c5491a5759 SHA512 c5bc696d2720df3af67cae3700fecc318848d8bf3186c64477b193cf8eedeb3afdbb2d49ad067efcd73b28d8f00c48d0a0c1dd6cc6eeb8fae613d3c235e28e25
-DIST minfx-1.0.4.tar.gz 59363 BLAKE2B e69e43e6bf59d413ec7c4f64c53646ba24f7efcdd6739c20654a2ffbce6b613a315afd01d36b639ce903348036e34aa72ba07ce0b63b83c48cfc66d9f72d83eb SHA512 cb67747122bc1ec20c67e200aedf9763fe3ca8cf1adefd1d46008df371d3b8c327864c5257467161d7878f03ab24f5d89e1dfedc42c62e1e6a88c9426bb5fd52
-DIST minfx-1.0.4_pre98.tar.xz 51072 BLAKE2B 08d42fd22640670e60155d1985a05db11de3e8bc929ebb638c8b17439969a24990c1785fbf19911dfd9aad553955b24a84cac82d5e1f5a9c29ba799c74eea35e SHA512 734ce5d6596cf4ef91ad5ccbee3bffc1bb121a448cb78eac373b412fc1aa7ba2227ee0bce108ade45d037558a7692f67c504bf5aa1d6462dfcee05cee0cb9b9f
-DIST minfx-1.0.5.tar.gz 60700 BLAKE2B 33b77c6620fb3fa2abc0390bb80c0c67ba132868ea3da5550d868d28ea56650ada6efcffb1d5e200a3b821dc7e34e0ab48c67325621f59fadf7a3705f7154404 SHA512 86b48f3cde26d141e3b9e43decd1c01a7cc78a51165e964090e0db7ea73a31fa34ca383a4f2b6df9394c1f00cc4fe4eb52b32b721d2bad7cad622e74b8aa3742
-DIST minfx-1.0.6.tar.gz 60776 BLAKE2B b9cfde680d9e3734b5dd068092d3ed2e6652bceca27c6cc7b92e22e16234211151ce1cf7f8b935fb51c05aac4302f3e86a619a945c0a093da69490f74dbacbfd SHA512 f98a64d2a34db1d7d1df5c93f89fad13ddd3f4d2d27a170c76236284276de573b543b365af45030076f4c49e9d26cc67375dfe351c830f98c1580fb0dbaabee9
-EBUILD minfx-1.0.10.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.11.ebuild 389 BLAKE2B 812a0bfe91c50d6aafc11e9091cbce103d21ff435e500805bd1fc365a439895d15d5079b48f63ba38c3f0cad269d9a62691cc59f96e759bb5d0ee41b1ef3c395 SHA512 00c4b517631feea7a1fb4317f5d0abcaf08d2422d9fde05eb84199b06730a8575d57b26d86ed614d5ceeadc1cd0f0024537ce785d85ac90a1ebf5c03d82f6821
-EBUILD minfx-1.0.3-r1.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.4.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.4_pre98.ebuild 445 BLAKE2B f8b795a653fad4a45b50346df5a824d88f422378bdf401cc451bf4ade7a728f99249b1c454822c377b519207d8f4aa77baf45f36db8a65754b8d02e32c6282f0 SHA512 1cf8d6a683d95ade1e65904015d3a426b01b7c6d87af112e8f5a73fea7ae3f07c9de20c9bc74f369f8c84183236b618e92cb96499d0f867831ddecbd61e4c69b
-EBUILD minfx-1.0.5.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
-EBUILD minfx-1.0.6.ebuild 383 BLAKE2B 5565ebc8cef685be5c37b4991d21c5010c9203d01562624bee09edbb3022f84669b57e4ad0492bd57d6fa43506a3db6d4b748ec38782996fe8c4c9fc73fb7479 SHA512 ee780e6be14e5b6ef8de6b73a5360cb8f9b7e154bd7b0fae1ce686518240c6008288385c515bdc8b4980890781d04811378762ce9f53f778136e53c962c15cf0
+EBUILD minfx-1.0.11.ebuild 383 BLAKE2B cbc41df86f45983fdca9a9680c755f5e0f44faa4f21969145c149196e26a10bbb62ff7c409748a6160f77eabb89e4616d8027ea6a35699aa754fb884afa306ab SHA512 b48b6650b4d70d2bee6e828a9b5ae7bca5f4b192adf1369a21e2ca850d846b94dfb07c5703afff9c84ce5692b8b6daab53b814d48cc46b55ec4d4f1ab936bf17
 MISC metadata.xml 517 BLAKE2B 0716933a4c886a8245b8a93d2d2e8a7378124f420a6e068b57472de3dc977aab93848b16635f162ffea8a8770e3bf9cba5b0a7a803ef1e01de03c40961f62667 SHA512 656aaca8e83634c0dd4669bc62c9ada5db7a5882eafc33cec13f20dd5429bc7a24c34641f65ecb68bf39d9152fee381747ad1f15234a9e6a16e82d1cd0b160b1
diff --git a/sci-libs/minfx/minfx-1.0.10.ebuild b/sci-libs/minfx/minfx-1.0.10.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.10.ebuild
+++ /dev/null
@@ -1,17 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.11.ebuild b/sci-libs/minfx/minfx-1.0.11.ebuild
index 00c79c67cadb..af544263d47d 100644
--- a/sci-libs/minfx/minfx-1.0.11.ebuild
+++ b/sci-libs/minfx/minfx-1.0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.3-r1.ebuild b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,17 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.4.ebuild b/sci-libs/minfx/minfx-1.0.4.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
deleted file mode 100644
index fbf89ca2eb46..000000000000
--- a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
+++ /dev/null
@@ -1,18 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-#SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.5.ebuild b/sci-libs/minfx/minfx-1.0.5.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.5.ebuild
+++ /dev/null
@@ -1,17 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/minfx/minfx-1.0.6.ebuild b/sci-libs/minfx/minfx-1.0.6.ebuild
deleted file mode 100644
index ae45355724fc..000000000000
--- a/sci-libs/minfx/minfx-1.0.6.ebuild
+++ /dev/null
@@ -1,17 +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="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 63aa2b8694db..0d594184be31 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -13,7 +13,7 @@ DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B e431a54f1810590b75d0f115bdbcd3c561d0d91
 DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
 DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
 DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
-EBUILD scipy-1.1.0.ebuild 4122 BLAKE2B 6c4d91c33b7f02a461f0b2805a859e160687d8a4e4792f3a12a44dcadfb33b056a705e836b2ef4fa9da36a41e7e79e285da6571b97e0172262b991dc5aa715f2 SHA512 0df59214221d5ad19b70ee60e965008f9ba598d234e1b6bda0c8f2cd99cf0eba7dc3a718bc32d01b3f5f194b2858fa04eabee4aa0012519ce43c322887a04b2c
+EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
 EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
 EBUILD scipy-1.5.1.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index a4576826f4cd..119210dc4f00 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.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(+)"
 
 DOC_PV=${PV}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b3cb2cb59e74..fca1e4224d62 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 20f9514a43f0..ca60f7fd531b 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,5 +1,5 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
 DIST z3-4.8.8.tar.gz 4520119 BLAKE2B 8d3d9fac61ac7d5a9d8c44323db9f67a7b24ee510b12e67867b249062cbcfe9a3bd0fa3b24c03c9eccd2aaf90451083ff5e9a9253a87c3e8e943fc5cf08a1893 SHA512 a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f
 EBUILD z3-4.8.6.ebuild 2335 BLAKE2B e980e31d4d6ab4443b7b385c66aa1a71ab062d4783e1947d1a2d9688986729a19769813e22cb7395d9a8a1a45e1fb898da1a8e6c923c8486aa8dccd601f9874b SHA512 214122932dcbb1cef0e3d3617e37e3057936b28afc7d70fff2fe08bfcaad963516d48f20fe65efaf80729f5ab070b562aa574c163f908c82b620846e5cda7982
-EBUILD z3-4.8.8.ebuild 2418 BLAKE2B 4cbbb4e4a04011772fcb0ca75d7c81d08a5e8dc532ce762e76978a8c4f13568b903f8854e5084fca819b2fc0a02a40f2633f2aa087646cb691ad0e614bd69641 SHA512 11b46c73f3269223a3a3d73dc48a25efcf31444beb0ec602ba9609b9aef75bca4745692a3eaffcde66a6cac1b5ca696d43da987e340ac5a694659e184713a2bc
+EBUILD z3-4.8.8.ebuild 2416 BLAKE2B a801aac436782933c720da61967dd4945bdd688d6385233e0540c64df72c946a08b1d3cc096805d332bf96bb87a56dcc64a5b5ad52c591bcfec0625eecc40796 SHA512 d659151554821a07e4ba9df94377b8b5a57cc326882e1373ceaaa4ff81aec9c9ba71af7ae948ea2057d308b0c64a39b90678a71a9d13da5b41157a1dd774d786
 MISC metadata.xml 616 BLAKE2B aeef1be6d9c4a94062310c6e2c3ac7fb1efe39bb608d96c143a01e9a01585f11ee25aa56d8f67d0a96d880b543882f2cb781247c034eda75e7f6f030767bf660 SHA512 aed4bbc517cc4f9e78ad3f5d50af5837757efa2985aa61a3faf40e39203179d356830a1d6fd4712422257eb244a67ae5eb5c4b2db76ab75769f5fe5e6d045a0c
diff --git a/sci-mathematics/z3/z3-4.8.8.ebuild b/sci-mathematics/z3/z3-4.8.8.ebuild
index 9d250da9946e..28e2d13baf69 100644
--- a/sci-mathematics/z3/z3-4.8.8.ebuild
+++ b/sci-mathematics/z3/z3-4.8.8.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5a6e993af0c1..6dc71a8529fd 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index c36099388ad0..ea4b5f208183 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,7 +5,7 @@ DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
 EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4
-EBUILD hwloc-1.11.13.ebuild 2150 BLAKE2B c89237f5a23853f03a955a471160a5e24c4f06eeb4f3a06f755d6a6f074460d4fde5a6496b5ee0496ef5b843132704ffa59645e12a63f49e4354de778199aa8d SHA512 7813fa58c13872af334c4e04016e91793bd19c53beb5650a6e427ed52bbc3f3eba955b69bc85d47eadd171750f6e98fec4593772bac28f8be887e111fec05764
+EBUILD hwloc-1.11.13.ebuild 2146 BLAKE2B 5db5a32ea7c1c6682ea98211ac59a6d59c3686af7b899a1745dfcd5c4aac795e41221c19e7c4441efe6ef50779ce763714bf9254d9c56b224c0f58bad3c099e8 SHA512 7e75a9513140ecfab434bb9a747f18f18271746041b45374436e0f46dad7024c7d07496fca291080b8c437ee30f198f2f7c9a498789b58ceb48862801f475f51
 EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b
 EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77
 EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index c516245e9a94..23de054b8fa1 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-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="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index d2d2cf59d3e2..b4927ce83284 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,6 +5,6 @@ DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41d
 DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
 EBUILD pciutils-3.5.6-r1.ebuild 2863 BLAKE2B 9712b7edece076efc56ca7c9c4ea562dc40891a53bde96c6588bd01045f6e8e68ac2eb27c53c79c45a0bc2df524da14e601fc27294b608ce86f7abc4fddf9560 SHA512 9f765ae9ffef2c09a3f58f823b1bd6dc9d035d40a2e86ec3991933e9d78d29b4c9123fcf865a468b7f3f6e65e17ac361143c5b6ede913072ab6204fea86bc93e
-EBUILD pciutils-3.6.4.ebuild 2853 BLAKE2B 6c3fa736ded27249c1fabd4c3e07b5e94d85058e29115be2925e01fd12e5c356e4ac8f4ac12a18562cba9db8d96da27c435429da379132ed129c4d508c9a5eda SHA512 1b03484b808856a5fff39cec7f84f1499d6d0d54375c917c4e52e2d24711cd60a434fe7d9cfcda00aa692eb8a79a025b22e92cf06584f64909616ce0ce450617
-EBUILD pciutils-3.7.0.ebuild 2862 BLAKE2B a23eb3655cd36b4e5ad5fb9c1c9ef3f1002032b55afe5a030f1f2ce832781a53c3c28a059218511fa26bbf31eb858b774dcbb2e9029cafeb495ebc64fd0ff484 SHA512 abda8c7ac9c539388f80bb4963759a8f33e3509e2dea00c4d3f49c49c50a9a2d533763730ebb1c314201d6e617d9849cc9f3ac5560374b882492ce15e899532a
+EBUILD pciutils-3.6.4.ebuild 2840 BLAKE2B 658741ae8199d1f97826c611ed1ae9546bd1487b96fc7b48c5d0b2654aa00fbe9ca1e37d73579dc2d31619d441c5eaa9511a89ff75a2c781c0f9af27408fd9c8 SHA512 447bbfb900c17d6d06f3a1206e3920385380862894ce62d580b374c727840c23903aa4cb598cc49c9eca335bcc65c5f29d339249e4dad62166cfd150dd226432
+EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B 0023904d2c9df91807ec223276dfb87c73e738f631f98eef1d61a8b3474d02be8ec7cc3026b6b58a6ec035ce847e2f83e80168ab8a435c3a1165e82b533c6024 SHA512 9d96996e6cf4d83884021282f142bd0e904d7205f3e4bb246fdfd3621ca706cdac088f391b26b69a26afff642201f0371ac3460b34b4094e28689e15ced67aff
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index 14eca374e834..0669046026a1 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -29,10 +29,7 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
-DEPEND="
-	${DEPEND}
-	kmod? ( virtual/pkgconfig )
-"
+BDEPEND="kmod? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index cc2e5824111f..5f2028a86005 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -29,10 +29,7 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
-DEPEND="
-	${DEPEND}
-	kmod? ( virtual/pkgconfig )
-"
+BDEPEND="kmod? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 22476ee71408..9bc1bf48946e 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -7,5 +7,5 @@ EBUILD ucspi-ssl-0.94-r1.ebuild 1216 BLAKE2B 16f75a1835b7ccb6a5726b9125f6fba24a7
 EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36
 EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a
 EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d
-EBUILD ucspi-ssl-0.99e.ebuild 1557 BLAKE2B f3a531cdfdc93002109f5ffa321761c6e02881720c204676847a79e0f013d77a50980ee608f412f109aca5202f820e07ebb617a4a735c39d72e400d3ec1f75d7 SHA512 29d2ec99ad7718cd980d2fc059c9dc4d663a8ce99e93ae2b694039702b14bb9f1f0c1abda2ae501a1997180c48ada32f3f2865564cabae42841162c401b6d1ae
+EBUILD ucspi-ssl-0.99e.ebuild 1555 BLAKE2B 0e2da747be61a1078ef96429f258ba5e0b3c5ffdbbf48e7fe9df7238532099488f709a17db463bad413e8397ddbeeaa2407d02d77fbdb11dc5593366d58acb57 SHA512 a8f0560f4ccc621a0d86bef53bf547ec25847396e6ed35527d71c2b88865e7e536c5469cfe17455ad7454c9c2ca997668973e3aaa9dbb69b9132ac06dddc6582
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 50b5ef4f3c93..dfb1713be473 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="bindist perl libressl"
 
 DEPEND="libressl? ( dev-libs/libressl:0= )
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index abb0de290a88..048720d452cd 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,7 +12,7 @@ DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec2
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8898 BLAKE2B 8dfc5420167557be40ab8cc6570a847689af2f7aa9c26fbee34684970922e58fe49eb4d551a2918887e7c9d756d98a7aec81fde60240e43a4c9072c67b285329 SHA512 b302f3c8cb38ac8adfde110c17989d7f5ba9dc54e9cf89b0b5c9628b1835017c2d963f0bc34bec7d7195c9d06abdba36d087bffa301c58d65d749b6fc38b876b
+EBUILD util-linux-2.35.2.ebuild 8897 BLAKE2B 9fe20b49142eeed26fb4e178196042d11c5ede2613f620b546668c7c6e65f859273c71216578d2484aeae7e18183413bd7c09ed6430f1339c9e52e7522b818e1 SHA512 57fcaa77bfdb0b4d476963526d44256b7d902d7bd9c86b88aed9e64bcb25354083228d3f59ed13d178cc9bd3de921af8e3e6c16678c4d5819bfd1f3a1832f5de
 EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index f4a7cb79bb8a..54f81a167eac 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
new file mode 100644
index 000000000000..00eacc253567
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-desktop-portal-gtk-1.7.1.tar.xz 369932 BLAKE2B 510652a0025fc27d447a0482552a0ae9c8e08f0471166466356043c026c922b1b0779053bcc7902f041f93ccd71e2e71882594eee7f4dda8cea295e419192941 SHA512 2a2326559a4ed7e44ffddc1a6881c25f14822465f5660bc806e7d8a120d66268e2987329f4bc9f7821329eea41ee96b15a39c5f7ac805a1e04d0604a88b31c08
+EBUILD xdg-desktop-portal-gtk-1.7.1_pre.ebuild 954 BLAKE2B 585d0c8aab3bd3da4367ef1a16a6f7fef458ae48197725a08e6984d3920159c0939a4a26aa3d6490e6bd78e44e6baaa073c748d639baac87cea7ecca0fcdfa7e SHA512 e1f4505340f25307ec7e4ac1ff572aba38df46e51580b738b9ed0c76a4758b2d75ab804f77a924d7cf3396d91302d0682997f90b95335943917aa243deda6a73
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/metadata.xml b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
new file mode 100644
index 000000000000..ed07582361da
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:3=
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.7
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index c269baf3ebca..6ba55342d058 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 9f81d8b4f49a..5bd3117e6931 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -3,6 +3,8 @@ AUX polkit-0.115-elogind.patch 1069 BLAKE2B 6c5a3d7d3e716a994b951181808f64d864e6
 AUX polkit-0.115-spidermonkey-60.patch 5562 BLAKE2B 8f262d682ea413f83bc555bacbeb4306cdee156cc1ee1a98ab76de20f1aeaef405e772536190eaf3a842ef365514f7b68760200e9ddb9342498b01f40f0f9662 SHA512 41d6a9e63dfbd788267b7de231161d57988b4bf90fd52fb49ac7c139a4621476e76b891ae510786611a0c3cf9914a62aa105e2a1a202d29c47a2091fe6e7e9b9
 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc
 DIST polkit-0.116.tar.gz 1548311 BLAKE2B e9761a2934136d453a47b81dd1f132f9fc96c45b731d5fceb2aa7706f5325b6499f6acbb68032befc1b21878b1b54754685607c916ca8e02a8accca3ca014b31 SHA512 b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5
-EBUILD polkit-0.115-r4.ebuild 3640 BLAKE2B 21773950fb425bcb716569495844bd8e8e967c87edd83dedefba6deb494577ba6e155673712ca1b7be3138bdaa61001ad7167db983ca1c1dafe4136ba0a8f2d3 SHA512 3205e7ba828fa064e9b53a99d31cc3fd2c44db8e896ba213c00ae5387db66d5dfe304503d34a477332353b1e47c4592ec3afa0e91323f7313115d87dfec64727
-EBUILD polkit-0.116-r1.ebuild 3376 BLAKE2B 8428b1d2f34e4ab02a95992c402886c8beb544b585c88b9205bf79527d321fc758c54233f42d7f193cdf14f09112a9d1235263ae7b833ae9fa4fc0fd836c7816 SHA512 e8c5831a5d05a77b7f6f2e7f11b556d8e6365650e0158a84e951a59008bedd66422f17e51f48c8175da970f8be423349af01914e0da08866742d980cdac268ea
+DIST polkit-0.117.tar.gz 1554536 BLAKE2B 1cf7e0ff9db19a29be626f4bea96c9e2ef8b1eab4b8287a5f1f4d2a818b86d58c1c4c4a41849d95e31559dba1b18853a31e934ebbadd8e07f94dfd58b45240e0 SHA512 c10ea984f2386fe436e58a2866e5323afc80d24f744f0ee61d966941259aa491bd96b07d911434aa731b300c3cca25b647804b396501175ab5b3c53384e94c70
+EBUILD polkit-0.115-r4.ebuild 3619 BLAKE2B 5b29fe32227148a5df98c5a921733858a77877f4675aa3b63ecb81aaaba3341a22487066d31bdc2ccd603fc0ffc57ba64602b1efaef1124476b4b5c906be9c4e SHA512 7fdc1889d96952ce59745f05c7965638fb398f46f53a72ec71db2d02fdd1b11134467c25d8ad1a5ef97d847a93cbf9c6cac42192a553b1952a65c3e116903a30
+EBUILD polkit-0.116-r1.ebuild 3355 BLAKE2B 6ac0430904eb9dea92ab769396c9793843bc047bc52167905d420ef6f703c192ca1110318b46b244b9122e6547028e6417db9ae4b7460cee304963165a2d97c0 SHA512 c59dc110588ae6f8b1a967b46b86f3993a73e6a08ddd667e944f71407572a38c3a3e1649407ddf01f360673d4252fbdf2bbfe7ea9fb281cc5294e8200ade154d
+EBUILD polkit-0.117.ebuild 3362 BLAKE2B e9867f28f2f6b6f917fe002dd0fa6714602d3b049b5cc4e86122362fe19c74ce8334bc4d20d2223057f1ad6be64e61ab716f379c4866816a87065fd29441bc30 SHA512 5520b41547f5990948b12917aedb3e2b234dc042090c1f5345fdc19cbc1bd84d137b34bf76178c946628c309f0fd3d737ba582cd8032ef1b755683a03b966b5e
 MISC metadata.xml 498 BLAKE2B 8bbfe2ee11b53b77dc26215776a87acd7cade59a5a139ada605f2ad293c569005d2bd517aaee1c6f4ea45251a0cc67f10082c96c2224d47fd84b5e1d87dcb724 SHA512 16ab1ff82daad858eb9adf7396b0e3d5845914eb7d7f1590cdea44fe1a2214043f011cd65cdde2e2195b959bae6581845bc6b4981fd400b3d8719f400f85b6dc
diff --git a/sys-auth/polkit/polkit-0.115-r4.ebuild b/sys-auth/polkit/polkit-0.115-r4.ebuild
index b55906b724da..675bff797101 100644
--- a/sys-auth/polkit/polkit-0.115-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r4.ebuild
@@ -131,8 +131,8 @@ src_install() {
 	keepdir /var/lib/polkit-1
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/sys-auth/polkit/polkit-0.116-r1.ebuild b/sys-auth/polkit/polkit-0.116-r1.ebuild
index 313fda9c1582..0dd63c22b5a9 100644
--- a/sys-auth/polkit/polkit-0.116-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.116-r1.ebuild
@@ -116,8 +116,8 @@ src_install() {
 	default
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
 	fi
 
 	diropts -m 0700 -o polkitd
diff --git a/sys-auth/polkit/polkit-0.117.ebuild b/sys-auth/polkit/polkit-0.117.ebuild
new file mode 100644
index 000000000000..550786e55344
--- /dev/null
+++ b/sys-auth/polkit/polkit-0.117.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam pax-utils systemd xdg-utils
+
+DESCRIPTION="Policy framework for controlling privileges for system-wide services"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="consolekit elogind examples gtk +introspection jit kde nls pam selinux systemd test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
+
+BDEPEND="
+	acct-user/polkitd
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="
+	dev-lang/spidermonkey:68[-debug]
+	dev-libs/glib:2
+	dev-libs/expat
+	elogind? ( sys-auth/elogind )
+	pam? (
+		sys-auth/pambase
+		sys-libs/pam
+	)
+	systemd? ( sys-apps/systemd:0=[policykit] )
+"
+RDEPEND="${DEPEND}
+	acct-user/polkitd
+	selinux? ( sec-policy/selinux-policykit )
+"
+PDEPEND="
+	consolekit? ( sys-auth/consolekit[policykit] )
+	gtk? ( || (
+		>=gnome-extra/polkit-gnome-0.105
+		>=lxde-base/lxsession-0.5.2
+	) )
+	kde? ( kde-plasma/polkit-kde-agent )
+"
+
+DOCS=( docs/TODO HACKING NEWS README )
+
+PATCHES=(
+	# bug 660880
+	"${FILESDIR}"/polkit-0.115-elogind.patch
+)
+
+QA_MULTILIB_PATHS="
+	usr/lib/polkit-1/polkit-agent-helper-1
+	usr/lib/polkit-1/polkitd"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+
+	# Workaround upstream hack around standard gtk-doc behavior, bug #552170
+	sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
+		-e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
+		-e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
+		docs/polkit/Makefile.in || die
+
+	# disable broken test - bug #624022
+	sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
+
+	# Fix cross-building, bug #590764, elogind patch, bug #598615
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--disable-static
+		--enable-man-pages
+		--disable-gtk-doc
+		--disable-examples
+		$(use_enable elogind libelogind)
+		$(use_enable introspection)
+		$(use_enable nls)
+		$(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
+		--with-authfw=$(usex pam pam shadow)
+		$(use_enable systemd libsystemd-login)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable test)
+		--with-os-type=gentoo
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc src/examples/{*.c,*.policy*}
+	fi
+
+	diropts -m 0700 -o polkitd
+	keepdir /usr/share/polkit-1/rules.d
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	chmod 0700 "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+	chown polkitd "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 733ff1a76c05..cc3001ad32a3 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 959bce713a8c..10e813d2a0b6 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -6,6 +6,6 @@ DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3
 EBUILD plymouth-0.9.3-r1.ebuild 2584 BLAKE2B 3cb69af929b16a148d9b96e3554419362469ec4626040568f7cb9be53276969bcf6977d0befd5898c42281e058c975dd193779a22c37f9b28e73aaff13524a80 SHA512 d60fb9c37007bd94a209b9e06ce34447807ea7602da19922005628ce362ec9cafe11974ac68cdeab443fc13cd2f0436fdb444f4ba14882727771b95c66cf1c5e
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
 EBUILD plymouth-0.9.4-r1.ebuild 2772 BLAKE2B d390aaa44d5720b80737ae37c9261397b3e00c721c56dd8a0a7a34d8936fa6b8f6283391155eea7158e67f3ac6de74056e40767f65932bfa7b7c3bc920f06616 SHA512 4d51fb929b95f4622598788705421ba9485b5692b3e134338e718bca1a0bceadceaddc90187e7ad4b53bd443372a1a43773d3d4c07df0c8f2d8cf8a655e3b2f8
-EBUILD plymouth-0.9.5-r1.ebuild 2842 BLAKE2B 5532186751dcab43af99688bda02adeb52b830823aa5cfc4120f86f0e7af0cab0407a78533a6ead3cd4b10e5be623de8a8d03eebd6734028743f3262b3edcf6f SHA512 c64d05ed58031b10558feaed13c201e298ff48bf88c8e594dddd6c4f47dc89278631a55ab4976ec8dd4926f7ad10193cdf77d4868c173125251fedd536061f15
+EBUILD plymouth-0.9.5-r1.ebuild 2839 BLAKE2B 6463c5e6567a553a8df19e1482b684f0d0056dff0376381e6cb1e1adc684053716cb16a8c0ca178a8cf8a6803f999c93a6b946a4db3c874cf10f7cbb764a3442 SHA512 64019cb7d34c50bc758cac98e99e0b8f8cffe574aa4c3a6dfd8a3fd4e7171d2fbd34c2ddaae5d91f2077f981deedc469cb999bf59fb4c22a1903491efb27caaa
 EBUILD plymouth-9999.ebuild 2842 BLAKE2B 5532186751dcab43af99688bda02adeb52b830823aa5cfc4120f86f0e7af0cab0407a78533a6ead3cd4b10e5be623de8a8d03eebd6734028743f3262b3edcf6f SHA512 c64d05ed58031b10558feaed13c201e298ff48bf88c8e594dddd6c4f47dc89278631a55ab4976ec8dd4926f7ad10193cdf77d4868c173125251fedd536061f15
 MISC metadata.xml 1135 BLAKE2B c2fe402798b480f8fcb790884bff76881768eb90b0ae74ef529a3a7850665f6912642b1079598c60d2010af79a77b4372f1608a71e81f08e0fa9ded75c1c37a7 SHA512 51c1ffb9a1dd25f5c2085fd4a5fa43dc9af3b10470411e4c15e7653df32f09db6b2f64795bbf0760c60206e82e2db396d05f04bc5dd92bbe945647902787b673
diff --git a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
index 3c47d67a881e..38fbd00c8921 100644
--- a/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth"
 else
 	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 inherit autotools readme.gentoo-r1 systemd toolchain-funcs
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 63d91998150d..bbaaae034263 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index d47b1bd87fef..716ea66dc037 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -5,5 +5,5 @@ DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d8
 EBUILD libqb-0.17.2.ebuild 1155 BLAKE2B 3028a41671305e4202f7535905fb0d9636659456c254a7817d26ed8f1c77210d0bf551bd86a748e5ef114055a0ca2964155bb26f119a8af5c10b1cd71addf2f1 SHA512 89420a61581c365561d5cb25601efd84c0ef331e4b8666a80e64fc4d83b106e6518ae11d98079b5a37a8e63303e11186522fa45448c4751da7f4e7e95826270c
 EBUILD libqb-1.0.1.ebuild 1167 BLAKE2B cb36195482930926022160f4fcc37636f83726daee2a56f382370341e2b9a4729e875929a1f0a014b6d46511d920727b9c72b4ca838c4bca3bb70cb70d9f0ad0 SHA512 f6fa8cd1e1d2513827bacb46898596072bc3b5c2b9369b3ed29164585a83e4051aaa82e5d691f346d7c39ba3c63bac23c36dccbcd171d725c656b6bbd55a8dc1
 EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
-EBUILD libqb-1.9.0.ebuild 1329 BLAKE2B 0b3249c521b7a6bc682e5bf66fe834f149f40d92dcf28dfd4b79ede7661e2456e9f45a9964bbd682cd93a2794b84e46d53b3899d3e794e717b146a5ad62c8615 SHA512 e293927a8cec9757fb0be1e373670495527685170c456d5c550ba7182749cdaefe05a85c4c67411a778fe34dcd5137b3c699a7519711669055073c2689232e8d
+EBUILD libqb-1.9.0.ebuild 1328 BLAKE2B c8ababd6a724d196249a05146224eb8e70e70fc0c58c7830585277cf55a384a8d18eea7a72d717cb88d107c93086d697d7f4bbd24e555d1400bc7c4a2a76247a SHA512 ddefa40b02e919296a5f6c08c0f00746d1c917499e6d8ad134c8fc884848c7207278c7f4b8e93629914dedb4f583f918da946f4f06b691ff4e83de4e540260a0
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild b/sys-cluster/libqb/libqb-1.9.0.ebuild
index 77acd95797e1..fcdb691d7d07 100644
--- a/sys-cluster/libqb/libqb-1.9.0.ebuild
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86"
 IUSE="debug doc examples systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 57bfe6f77c2f..52b5ad4f236a 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 1c258d39435b..69f57a48d97f 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,8 +3,7 @@ AUX binutils-config.8 2422 BLAKE2B 850b229c3c51c7687f303f723ed15f09d0d33730788ae
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
 DIST binutils-config-5.3.1.tar.xz 6688 BLAKE2B 3bc1b96a96b0c30e425f4ffd42f86a09e2a80cc3ad1dcf77d4b5d2d9eb3d6bc607f78dfff1ae888fe8abfe44405a1e4d1ab325aa92fc5889c18aa3187a506647 SHA512 c6d188b70935604a8a519c036dda210c20e5b6e916fab33e5026bd5c78adfff0a1aa85003759b751275576ff33471b25c920beb6b1c088115f28918389e09ce2
 DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
-EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
 EBUILD binutils-config-5.3.1.ebuild 1118 BLAKE2B 0d65e41631a4ddc28b2b6a446eba79f6e6e0b48706276d3dd057d300f0d097109ac637683343ea2e7a348b4c9768dbafa1343189a7a6c880b13afd296c7605c6 SHA512 2207b216e9c0a6ffd6bae19ad7f3c68d870882e4a69b0c1284a87ceb0368c086bc1dd4a682dc18d64da9a60824815d4c384f89f022bd3cd6d34e2182d986fceb
-EBUILD binutils-config-5.3.2.ebuild 1122 BLAKE2B 9ee6e15462dc0f57625680cc75f4dd633628d275f5a3f412e80d3ef17f6b7758f50828d70023abc85f299f41096dd62a1de6bae33b57b01ab634a9a531b2c9ae SHA512 1254ea42da314045f811dfbe9ff6ed20b2fc986bb5d9fa4680a4183beacaf59af0a6a14dd27fe587f607834bd88a4866371d49bfbfb1e808dbf864669e727b4b
+EBUILD binutils-config-5.3.2.ebuild 1120 BLAKE2B ea04d0604c5dad335e2713c038a4ffd71d84ce99dbcdaa3dbaf1cf54de29229a463e917c7ca10aae227d11130d12b2f9a83826cf80d1d3f34a0a03ae68b9f926 SHA512 72adb3f9eec3830075a580351f8e5775d79521da1fa7af07d0041cfbe542508e9fd837be4d47abebb5fd50428109e1c6d75990f33c97da0462ccadb27eb3607c
 EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
deleted file mode 100644
index 855d88b035e3..000000000000
--- a/sys-devel/binutils-config/binutils-config-5.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/binutils.eselect
-}
-
-pkg_preinst() {
-	# Force a refresh when upgrading from an older version that symlinked
-	# in all the libs & includes that binutils-libs handles. #528088
-	if has_version "<${CATEGORY}/${PN}-5" ; then
-		local bc current
-		bc="${ED}/usr/bin/binutils-config"
-		if current=$("${bc}" -c) ; then
-			"${bc}" "${current}"
-		fi
-	fi
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
index d78cb99ae8ff..43d0393f1291 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 4c1120643f4f..73071b40e852 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -3,11 +3,13 @@ DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
 EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
 EBUILD binutils-hppa64-2.34-r1.ebuild 12436 BLAKE2B 3f9c4e9e20bfb2f4537b2edd190638f7c4be134bf591be0e69dc8837f0e453a8acac9d77c84ebcc62a1681598864a1ea2c72b45679552ee819caf96465e4425f SHA512 14d59dc2c1eefdc0c2980641db00cff0629d6c205d2ede58dc844e97304b53386dc82edc9018a8634f6e546065b82872c8a4b78da562a74822c34c9aa2a77d90
+EBUILD binutils-hppa64-2.34-r2.ebuild 12314 BLAKE2B 7a1914abaa711fb2a4446529b56651b39680b315870d439bf4041de4828fc48ff70a5780dd1332dc9677b44c8b625cd199a3fe9598fc274ae4322fc08e87edd5 SHA512 3d5b043da836315294659097a9adcd2d867973156b4af9c0c95248702c98e700e84dee66a0d9e19058295715a00ada7e2e00374acf5249e526ac95bf7fcb7aad
 EBUILD binutils-hppa64-2.35.ebuild 12071 BLAKE2B eb7ce3f34eab1b847fb0b99de6aeec234ca5d0f3ba9078a20acd02ac623e8b2b8815f03d1e1ca12c492d98b450130c92178635f9bab806064647a1fdbfc306ce SHA512 ab3f9db525e8eb89f37eadaceb2d5fb13f732607c1c19ac44ac31128065e3904a09f24a983693003c1d36d69664943a2e9253c88043394a7b4f8955b3da6e10a
 MISC metadata.xml 766 BLAKE2B e03336034fccf22a9cd0559a1a78bcc99f7cec05b7e526798e739a48589d50732d1664c6d9fcffe6defcd18840e612cba1a158e557785423d4834c2c54183579 SHA512 ea6c1bc005fecf24c4673f623b6d21ded664e5999720c6b74ad2a3654c40a274c9003a2a44dd402de3317a1d3d4450bc1d3c74683b3a98557363d62e21043e04
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
new file mode 100644
index 000000000000..9fef7573cba2
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CTARGET=hppa64-${CHOST#*-}
+
+inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=6
+PATCH_DEV=dilfridge
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="-* ~hppa"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+S=${WORKDIR}/${P/-hppa64/}
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# the hppa64 hack; this should go into 9999 as a PN-conditional
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 2e00c0d36db2..48171646ed9d 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -8,6 +8,7 @@ DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-5.tar.xz 96256 BLAKE2B 3bf83ff3217e993de70697f5c8ead2da35482f4800fa1f3fafb3957a3ab68532ec78e00490263be1850914dc0c18657c94527eb8738a7a9c3233331b147ac8b9 SHA512 e10f07c677abd17063e1bac440e8624bbbb0323d9ec32a493600f4400c9401709bec05a8fc8877dc7d8705a8416d72c2d2b1f5e5c069876f7cffa743b494a01e
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
@@ -15,6 +16,7 @@ EBUILD binutils-2.32-r1.ebuild 12638 BLAKE2B 3bb6831d91295ad0e1eba8f50de8d5ceea5
 EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459
 EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9
 EBUILD binutils-2.34-r1.ebuild 12245 BLAKE2B 5bc50b188375b27e00c6ac582f7426cf7c03f42e90ebafb3b332af005cf6f22fc6c05e1b741054ffcc1b299b55c2940d4f0e6a1d744d7ae0fae0ee19e4680a15 SHA512 24ef3785bb65db9d852008e458f73c8778c2d2f1a0c21af8d83c920390b87ab760ec902fc2e69600ebf24c12e168304e4d4392c403e572d59fed37995e99a840
+EBUILD binutils-2.34-r2.ebuild 12123 BLAKE2B c57a3f471e726438ba1bf4eb8dfbbfd3f173e081f329c596b8fb2297e586304ff3b23b2c31ac4b621558a5be2c894bb861a2f04b8675b6e9fb97ff0cec784555 SHA512 a93d5d4f8333ceb7495614d3dabe591004b47e8a28833c6ed446ccc26ffc7889f3f329f01bf00777ed63e8505ac6f94a2c959d43e7360b51c22f44814bc3373e
 EBUILD binutils-2.35.ebuild 12473 BLAKE2B ca4147fba3107d9afc68365b69143cf2750731ba94331315f42925afd8411e996318f0bf03f721a45591b258768a95541c5ec3afa819d0cadaa0301ea45fcf3b SHA512 98ad2ffc53c2664d3363cd337b955b15667714bcc6046636002b86b451f7e70ed862dd359a7c439c30ea9b3047829bc2f8e8bf93a6379d86758c8e2cf0ed62bf
 EBUILD binutils-9999.ebuild 12473 BLAKE2B ca4147fba3107d9afc68365b69143cf2750731ba94331315f42925afd8411e996318f0bf03f721a45591b258768a95541c5ec3afa819d0cadaa0301ea45fcf3b SHA512 98ad2ffc53c2664d3363cd337b955b15667714bcc6046636002b86b451f7e70ed862dd359a7c439c30ea9b3047829bc2f8e8bf93a6379d86758c8e2cf0ed62bf
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
new file mode 100644
index 000000000000..d1a67675d8b4
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=6
+PATCH_DEV=dilfridge
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index d53b5fbb8542..5bcdab9a7ad6 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -5,6 +5,6 @@ DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fd
 DIST bison-3.7-patches-01.tar.xz 10468 BLAKE2B 62d422fa0654d6d3e9f829edcfb9a6f0eb5ae60997aa9362bbbe280fc95d86114ff9399586acfa94f2a52564b4f745ca778ce016f102e2981caefb96575f56e8 SHA512 2703963df71871b6e4973d79f69ee95aa6cc22c342d852f136b16d636f90285f6921064616db66f10f29dbfce884a23f79c005e7ceaaf9ccd9a2e1c749b337ac
 DIST bison-3.7.tar.xz 2601220 BLAKE2B 3ac140048baacebce47a9090e916815e6c30d9c8b0f9fe61a3724b46fbfddf5b8bf94be2bc533a718d84bdc8c73d579b5e43d576efd488a6f5b52424883bc5cf SHA512 f6c8f1522849b65046844bd51953b4f1e2c32818d8bca0b8e4a1035e72d6731d8a66bc307d4b20d1a576cac6cbe10aa1c66829112327f37938ace165e154ba6a
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
-EBUILD bison-3.6.4.ebuild 2486 BLAKE2B 7103c9d0040f68d678ac21310531ae31eb0f19531d426be4465b7f0237f03d5c9ead84303c4ace783a28a4e738f2e7690b091bcad9079937e07a6911a9d3e1c5 SHA512 47eee356bbe9ded4f6f9fd2e9c23bd5919f25e1c4962575556653f889ed87cb372dfdd63070e9f563c3fed71ddad24fe0b936233ed5f8a02d852108d546abd54
+EBUILD bison-3.6.4.ebuild 2485 BLAKE2B 2fd4e6ec10fdb4aec732845757719480565aee09c296d9cf94f668c52c07ded7070a48f04402cd65adca39afc09b4802bf8c62b37acc931bbe9839431ad4a3b7 SHA512 794c962dc66aee982d18711cf26a0383b54e3008e312a7bb32668644eb226cda855e3274bcc7e4c113832accb09fc976a045db94033381d9100800fc8338bf91
 EBUILD bison-3.7.ebuild 2489 BLAKE2B dd3eb51c04ccaf6026ec7398276ae99554f1eca449b96e6c17c62f89de289575e8335c8ddde720aecbb99cf2aca5366bfffea7b5327ac906567776dafe92dabd SHA512 c51de07a7fb665f09b7c88b19753bd3fb1c451840993ab067da2e506339f1b4d51e3157c5de863e06decc7b803a9500892b741b9829d9d3dc01aef28ae67607b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild
index 97cf0cde7a59..f28fd98ad0a8 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 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="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 81c90947c5c3..270e4d3c34ac 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-common-10.0.0.ebuild 585 BLAKE2B 6cadc232c5726eef79bb0034ae46bb4460f67e85984d3315f7344f0dd79ad50be346e73e029fd01f5d855e5986ca282076cd2138f0901a8a94dae5ffd8a79e86 SHA512 410a0af1e5683b7be75b01baaa0902f7aa8e5c1c74718a2f302f2ad622f9977d0a27abc261bca76a69a33ae6e01e332a84346bb89aea9c995cdc7db5457f8942
+EBUILD clang-common-10.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 EBUILD clang-common-10.0.1.ebuild 589 BLAKE2B 71f0090e6d67508ab556dc2260ae6f0d0aa05fedec01815b67db31884d41756c0224d5df19ad7c242a0ab24b23dfde9ba8bad5d9bf95ce5434848663bcd0b0a2 SHA512 ac2a3296c395e38f1c5ba5cbccd230a0e625995756b8a8eb6b74911f87e31d1afd069b452f51a890e74147a7a79307469185f00cce21522d0b6b60045f686e24
 EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-11.0.0_rc1.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
diff --git a/sys-devel/clang-common/clang-common-10.0.0.ebuild b/sys-devel/clang-common/clang-common-10.0.0.ebuild
index 635512f56c82..636965492422 100644
--- a/sys-devel/clang-common/clang-common-10.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 8ef7cb6db3d1..9ce9ee593bba 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,4 +1,4 @@
-EBUILD clang-runtime-10.0.0.ebuild 697 BLAKE2B 6c1e9de36ce726a3296a6fff1b546ec9d2a6c3989d53c276665bffc71c74821b4ad5e39974d9b84ca4549f56156bdd0b6bacae43e0ec0fcc9aa1d3f2666c5724 SHA512 19ecd866074495bf0f40251eadeedc97fb789f9d7b2ed587fcb585a699dac5f0edd4d038338bfc38f1432ff6b55fc67126faf0f3c594eaca6190e86648073400
+EBUILD clang-runtime-10.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 EBUILD clang-runtime-10.0.1.ebuild 701 BLAKE2B 310160c35f36aab47af12dbfd1d4fd110050738a693d73276029c4e7b7c97d772294c25580808b3a267554207fb20b242ae48ffc13176b38813c108c8f6ea73f SHA512 f98ced68b29310f99744a4b8f3e024553e6db03b8c1efbb4f83997cf079e91b86d82d5742e1b3851765961d91f4940f439fdbea55061e72952eb113175cc1f57
 EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-11.0.0_rc1.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
index 91859516ce23..04d3897324e8 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 5142f680ed06..6f01156def12 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,7 +7,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-10.0.0.ebuild 10367 BLAKE2B e9e72075a661627e31c78bd78732178a2aeeaa4235f6b284782fa59477604ed3f8792cccf83548466f53dc1783ed86f1fc3a58e70f0604379de50fe3202295ee SHA512 0134ae1d5466fc462e397411e28498055ee2deae751a43c2947175b94ab6641677b56aed635fa99db518d693f7ad0216c068797f54a8f601cc5165cca2d438d4
+EBUILD clang-10.0.0.ebuild 10366 BLAKE2B af2fc9f454038f9fbf552a217b8534d3c6fe74cac3bb58b167c96bdf3249e213dd64fc469a0f29f51a0dbf3e46c1dfdfdfb7680288df4fa13b21021d9a120102 SHA512 8e83ea9ff93c88c0d9fe3db936a8f2949413cab513ab675e936146130885ee26234174985e7616f1a830c9cb9c2b1c560f686570909115c4fbaccd7ba911ca28
 EBUILD clang-10.0.1.ebuild 11312 BLAKE2B f8c7ff8397d6dfaabf74b48835ef3859c92eb787141a2055cc50cd67497f8ab51d1b87b5e1fda4d32b6f002998410fd14d5845df943ce54900e3d7208e57c5a6 SHA512 00c19f23621dadea3b545a8d62713523935060bdb0c6c806ba357c0e216f697d82d5a3d67f98f9270b80aaaf0f0c6e283d3d792b42d333f6ec0c33918f18e84c
 EBUILD clang-11.0.0.9999.ebuild 11085 BLAKE2B 4af82afca8dc55cb314a77ca131670e9f50940e41708bd527046e6e9ec4fac02b70c75ecb470fd3c734c0ac0f9c64781080e62561a9259d710f30fc56350a312 SHA512 e7a845a7b3a3f4ecf3e12515b23b556aae05f331c17130b390661a5882cc5df301acb9aa13c714e803c0f7402feaaa78a2477e02d0e909d02ba7b0adefccce1a
 EBUILD clang-11.0.0_rc1.ebuild 11085 BLAKE2B 4af82afca8dc55cb314a77ca131670e9f50940e41708bd527046e6e9ec4fac02b70c75ecb470fd3c734c0ac0f9c64781080e62561a9259d710f30fc56350a312 SHA512 e7a845a7b3a3f4ecf3e12515b23b556aae05f331c17130b390661a5882cc5df301acb9aa13c714e803c0f7402feaaa78a2477e02d0e909d02ba7b0adefccce1a
diff --git a/sys-devel/clang/clang-10.0.0.ebuild b/sys-devel/clang/clang-10.0.0.ebuild
index 81865bfa7ba8..85fddbe285c7 100644
--- a/sys-devel/clang/clang-10.0.0.ebuild
+++ b/sys-devel/clang/clang-10.0.0.ebuild
@@ -34,7 +34,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 6d154e5c3576..0dd9e84dfabc 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,8 @@
 DIST crossdev-20200131.tar.xz 28200 BLAKE2B b1b8e283d150968339e259c48b3f066f5233af2578b04e060d5e69c002af6ffd65214c559353a8ebcf3238c2b60d0ddfa29131e26c707647717088df55f77282 SHA512 e1d18a7d69cdc0240d30e77b1634bd6b5806e1576227e4ffa394805aa217c050ced75436e9a004a35bc9bc47b96ea2f3d8e19ef530a106736f7cc0d995bee4a5
 DIST crossdev-20200326.tar.xz 28196 BLAKE2B e7c591f5a8301eea7f31ee6de1d767e3486bdd27cf4cc5ba77ed600ebd6c937392beb0aa4f2a84b3ed0bfeb3161b1f21ae82e16b0f1486145d57b6eedbebbfd0 SHA512 6b0334640ae8ecc8a4b321779ebf11330dbcc17d58320fb252247b2078ff0dec6525286c2bfd2934cc00e129dca996a201be783c351139689d448d73232fef0a
+DIST crossdev-20200801.tar.xz 28268 BLAKE2B 36f22a2d1422d5f9e27a5559a8c141462853c4dc011ec98c66d235ef262ea9408fd5054b578963fd17ef630ea63e72c068d216f6ffbea7d191d1374a6ecc4033 SHA512 331af1525cdfc66380621b764bfc63178ce962b9071408d1ee08480caad9c0e4782a8fa5e5f3500fd2ea03ccd322895cc95d80106ad9e5b97a0e09ef5d88c94b
 EBUILD crossdev-20200131.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
 EBUILD crossdev-20200326.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
+EBUILD crossdev-20200801.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20200801.ebuild b/sys-devel/crossdev/crossdev-20200801.ebuild
new file mode 100644
index 000000000000..809478863946
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20200801.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index fc06f366ea6d..cd1e05a3a9b0 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
-EBUILD gcc-config-2.3.1.ebuild 1467 BLAKE2B 7a7880cec906aab73a601ea88d79a74a27036f1120be3f656b476b1c936abcceace984cd8db0021e7425d0e415a5b6a0d50d6612a8e66f13c6b7bd1679749458 SHA512 22fed172ffdfad4eefd4ac7aaa9311ef7dca2c4b1a26bc2e35d6ae4c6647b18c14a54d3eeb1eb9ef86bd0d8264c4dfe443ffae29422e92f11bd3947331142682
+EBUILD gcc-config-2.3.1.ebuild 1465 BLAKE2B 24902450f20d7246bfbbea7b3a4bca4e5983065df853d26e54768900f4f9e99c0aa32db25839d14436028ec643d42a769118478070f2846e11876313f89fc00b SHA512 c4a86c9f10b53b978a5282121d75999db0b9452dc2c7e546dabddb725f327d20f5ae6058c18fa6d26182158b99cbdf9fef76d7c154615f90f1eee99ee7ccd271
 EBUILD gcc-config-2.3.ebuild 1468 BLAKE2B 8e21f53264dd75d7a419e940457565a9243265115f56538512f8deeea2b14cf4a703ac5d22ce69d41c7d1d5d1bed5311dc3a0057cdc8fd1f7c96c82b3cf60435 SHA512 5c9bc2b111f1a0eadb1605021291ef0b3bc266102502ca42a823befa687f1f37a7b2b70d0316b058c9036e2df4a6b70748744a6e0cd76bde13c2f3ef94f228a5
 EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
index 308d4d6e99df..e422852cc7cc 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e5ea2a52fc5f..2fbd6753486f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -19,8 +19,8 @@ DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f52
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-11.0.0-patches-2.tar.bz2 13521 BLAKE2B 4c5c62615ec98c9877e019d07a6d05c6602517fe4f639a142d8212dd47fd3a7e87b071ba6b615b7e9d5f9f07c2ae3787749028c42a61be9bcdc61c4f0c059580 SHA512 c5730f5f14702d6261d3ca4f192b4a18688573d9e696a71f4bb4ac39acc7106059d8a4835a035415829fa6d3fdfb5ba95188e4a0a2509408f18d86f2527fa94b
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937
-DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
+DIST gcc-4.9.4-patches-3.tar.bz2 27908 BLAKE2B d3dd297df864e2240e4b80b8c81266ae9a6c3acf97111a2a682c5e12df99719c57810f677ae9e8a6177c685aada7cc4cf48a2b493f3202a37cd3f36e96e3319c SHA512 8f2058b7effa8bbf5cbafd474a045763274d9cd70a381f3b163e06c3db7495a458565a94f63e8afe7640006986e787bdfcf2b36d1e3c8f4364969aaf6bc5eff3
+DIST gcc-4.9.4-piepatches-v2.tar.bz2 14237 BLAKE2B 60afc2b8f78838a5f444819401d79a3a48ad0ee2ddd09bf32da1b06dcc6f933be61951f7c6b53d8224319a5d42c6b79b299bc06930eea1ca31301a1bb0b88513 SHA512 fdca8ccc81bed856c4a2e0da7a8cf897ca9765f9b448595bbf0d5a93702d91cbf937b560ebff96e3cd820b7747dc60a6a490d78adbacca751ecc7351ada2c56d
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
 DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057
@@ -47,7 +47,7 @@ EBUILD gcc-10.1.0-r2.ebuild 290 BLAKE2B 3276b1652d29a04d31e4e6984c732f648ef0da79
 EBUILD gcc-10.2.0.ebuild 290 BLAKE2B 02d5ac3a657382fa7a1146e5d504ddd4d3ab4caf55f6e4f114a3e5bae01a41055e8ee7421a7aaa241ceff332fafa44c1bebc5bfc77960ea27f204b4b9c467e18 SHA512 e95b6d2bfb0f1297c7bc2a7f2b2cc36a638b60f2aa66dbcd499d86d2e9c9e4e85e4927fadde94a80cc7cc4a1874bf03d4dc6fd2f770953d9cca2ad25afdcdaa5
 EBUILD gcc-10.2.1_pre9999.ebuild 405 BLAKE2B beae0b515345d9a5f9f8a54883b3bb9d218d2a17a706b06e651cb30ca1566fb429990deeec9a6e2dda91f9541306bb1c83e1b79316f0239715e0a244b3a3f3bf SHA512 cf28791a46432be4f633316d75aad68dcf130ab84a0c163bf538dcb698ccfbf852df87cb222e1f7db7902a1f2d9292312e536fc733f7b042182ee413fe52479b
 EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B 293d755306b4958352fe344c58f303432169fe06b2ca9f0548a84f43311bde7d51e4507f01547c500e3797c977aaed115976f3d17f43b14cc7885642c777f795 SHA512 3c42d9eb4194b5f35180ae818c9cefcdf65bc0a3b4e3b872ce7da757e0d470be9eccf0d383ee88fbb6a68ed33c48e23eae5f5280bdbaa27361d411d67cb8e49c
-EBUILD gcc-4.9.4-r1.ebuild 1442 BLAKE2B 89d982040aeeb513b50baaae4863edf3d8419536f09e4a44d327d0bbd342c528897209ff036a99ba3fda2c75cd36931ee8f413e273e86045cafd22c5cbd8957c SHA512 156e51cc3fee5404c97e04cb8eb96ef86b885bd4c82d3cf225075fe1f94cbed11840d394bdedfadd3e1ba4396e72a312892faf5e90b5f1d94e780801f590dfdb
+EBUILD gcc-4.9.4-r1.ebuild 1438 BLAKE2B 0cd42c3a15b80146943fedbee5cccb05ae3832b53fe674a43c85a7f87fca6c1ebaa7097687281dafe2dad993da78ef5c1bfc6e3176559031ac9ac9ffae0fc7f7 SHA512 0ae3fdba2aa7f2525c28c4b2a2dcd7db973b3efde3e8467f24515739c36dcc858cd95cded2e3bdecee92e87ba5f06ac1405613c67bca7cf9be19caec2531c136
 EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 061928d67216aac304cfb6bb02f65b2ff04ee8139a005f0989ebfe75460af572b9bf997bdcdd3604267190db8b31b5d9512e4dd96c3fe92c7aa923d0dfa8ee37 SHA512 e9b20d919ea32363f5d0314ab59708403256d3a7178f41562f39cf15d223ce8fc96bab060fb10390720a244b87bced2dd0570f5e31059245d4c452050bc057c8
 EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B bdd1de3a0facba6f1ee9b0e7c8717920d0df66beb44b1b24a85f65476326e8a812d9dace2ca65e5df89fc2a94caf9c03b35fe83d6c18054e82ee751455a84906 SHA512 4990258b95bd948b1891b7265bac5bbfd5feaf1bb534596ad4c779a871dc5156db0c3286ec8396eeb0991ba5462a78a02d6bee9024967e375b23bc499bcaa3aa
 EBUILD gcc-6.5.0-r2.ebuild 437 BLAKE2B 08444172af50303d8d9eb3fc74a2d0f66a12ee6f8876b3e4963cec910da1b8f28636eed3947c097086ac3f712959db2d4da8289bd5465aaed757731e994d80cf SHA512 a65aa93efbcbb910085afbcc571a8e0133dc44ab8c3e6c022a84cf5716c4d4c113dd184a5cc8f4c8f16391e98c53db37d3cf75c556da37b82baacd4f97dd2969
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index 7580cc2b1b11..790cb126b299 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PATCH_VER="2"
+PATCH_VER="3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
-PIE_VER="0.6.4"
+PIE_VER="2"
 SPECS_VER="0.2.0"
 SPECS_GCC_VER="4.4.3"
 # arch/libc configurations known to be stable with {PIE,SSP}-by-default
@@ -40,11 +40,11 @@ src_prepare() {
 	fi
 
 	# Bug 638056
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
+	eapply "${FILESDIR}/${P}-bootstrap.patch"
 
 	toolchain_src_prepare
 
 	use vanilla && return 0
 	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
+	[[ ${CHOST} == ${CTARGET} ]] && eapply "${FILESDIR}"/gcc-spec-env-r1.patch
 }
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 8acda1f79af7..18d058921411 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.ebuild 1479 BLAKE2B 0616693236895b75ab9090530603122ab5f263ec8d2c4f6c25ad30c8a08aaa70803244446207bf819e77e5d653f4ee566a49781781c111572233d48cf379bb6c SHA512 65f9f8f9afe5f6ef5adbba4ce2afb48caebb62283bdb63ad7601136a08bbc0bfcc6f0086b6342a75cc92b96ea2a74b7257de3090af60dd1b41ce56deb32e28dc
+EBUILD lld-10.0.0.ebuild 1478 BLAKE2B b91fbc24f88a6365b543ef20b6e80398545e921bf0ea8431a3b450a77cf1fa637506513d43d023b25a665a2a9324582e78adbce0df709f237b4e8a542181fa02 SHA512 8b45bf02033c78110eef573a2d7018972527637352bf097166f7a8fe6966fea9cf934e22f7aee62a9390e859d28fadca1c74dd0bc87874d0d5a3d6a720caef82
 EBUILD lld-10.0.1.ebuild 1332 BLAKE2B 94b36b3c7390e8b8a42a8f4e4fbee810e40b8b57785495bfbe7be96d1b6833b76561f4067a42a33b543fb8c2a068decfc8f2cde3ccfc9f233795e6e16518700b SHA512 00c1c5d85a3ab526def76eaabccd67bc7ffd79cbca7fc9ef773639e259030c36fb3fb25d2e220484d8b6da49ea8a90c549f6eb6b87fd52065246511a97123f4c
 EBUILD lld-11.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-11.0.0_rc1.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
diff --git a/sys-devel/lld/lld-10.0.0.ebuild b/sys-devel/lld/lld-10.0.0.ebuild
index 8e9feb377437..69476bd1e16d 100644
--- a/sys-devel/lld/lld-10.0.0.ebuild
+++ b/sys-devel/lld/lld-10.0.0.ebuild
@@ -14,7 +14,7 @@ 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 )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 791b077cece2..fe52d351a041 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-common-10.0.0.ebuild 600 BLAKE2B cd2a3b5c8310c4cf9e02befc10b4b281ccbe5ec4e7a64ab009af60d864a9a38f70c79708fc52fe973a15a98eff3861cc6384c099dbe1ee7070678f9360bbc317 SHA512 f293184183f650c055f57e93fabc48f87f165988a2b13fd25b72eff89356d2c10bb7709ead1d40e19ac9458de5e2c2e2028b6ab7b5143461fd58f181d5d2783a
+EBUILD llvm-common-10.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 EBUILD llvm-common-10.0.1.ebuild 604 BLAKE2B fe149a945f69a83939278f76189b47786f68f2f7953c948825ca6cf8caa5e3d986a21e87f23f8549160475a36a3c9fad30724979681141316c2bd84ba44125f0 SHA512 0798acea6da50210e14c460637d5f38f7d3c18f9de13ee36e2dd2424b475f3c343c0c4d8531811063056b4682a8d20b1de881044bdf47bec1fc421996568f98f
 EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-11.0.0_rc1.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
index e6af4bcc987f..d12935e080d2 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 59fea4d67a9c..67462d8beaaf 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,7 +8,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.ebuild 10752 BLAKE2B a8276cea5371bcca4057b891e9278aa31c201b2f7197fc993214c337189e272cdbcb563fa96fa8cb940958a03e52748c9cca77040e0900233ec145948cc116ea SHA512 8d2500f79e48623d7e18194a676f7d3f24fee27e249a3b001de00c852536a73695a80314b80db65dedeb2062807603dfaa1034449476ffeaa2d4672fdcc786a3
+EBUILD llvm-10.0.0.ebuild 10751 BLAKE2B 338970325836138a0214d3e97e1b408b466052abe7bda4815edcb41e3b998a7b9df26bcf2caf457ee8b66d997b383a0f94a196a580671db4b5288b8522e48bb5 SHA512 c588a1cce4e950bdbd189ad0f44c1b9377adc5bdf041a1da4872cc2d629d79f73132f1776cee09d8e08cd799aa7bc0473915d3a3644606e3cc26f5329b533194
 EBUILD llvm-10.0.1.ebuild 11708 BLAKE2B 5acc39aeea89c56ebe9a0015b503df6513ea528dbee71931eab5f571eca3045dfbdaead324dff79038b802d00c1a9f929b81f8e136adb33f78764f8cb38c7ac0 SHA512 e727805e3e55ff1fb662b6d1cbd191541085af64967660aeec41bc6bdd4c24f700995935d1ffee995fd5caa0c3f8f371c1fc94f46c62f493f4ca966f997befa9
 EBUILD llvm-11.0.0.9999.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528
 EBUILD llvm-11.0.0_rc1.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528
diff --git a/sys-devel/llvm/llvm-10.0.0.ebuild b/sys-devel/llvm/llvm-10.0.0.ebuild
index 652d6b34d233..5abee337a223 100644
--- a/sys-devel/llvm/llvm-10.0.0.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.ebuild
@@ -31,7 +31,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 77f661f24e44..839676593fa5 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,4 +1,4 @@
-EBUILD llvmgold-10.ebuild 565 BLAKE2B c21259c184d700c6094240c77bb415473a76e071a2e395d9c5ebe0480366a2ea08b03a3a249c15876f7fee06923ecfbf05ad95f26de3de535c3411d047d396be SHA512 9677f91940122e42d3584a8bfaef3e227aba832b48341d55a9936a9fe1db0f9435ca8b1c3c83ad73aea760be2a0686327620517d6b7fb161f0e0e0e15a66f654
+EBUILD llvmgold-10.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064
 EBUILD llvmgold-11.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
 EBUILD llvmgold-12.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
 EBUILD llvmgold-9.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064
diff --git a/sys-devel/llvmgold/llvmgold-10.ebuild b/sys-devel/llvmgold/llvmgold-10.ebuild
index bed405a9b6ee..065dea585bc2 100644
--- a/sys-devel/llvmgold/llvmgold-10.ebuild
+++ b/sys-devel/llvmgold/llvmgold-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7fa0c92be1e2..72fb69564886 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 906a1c9f1833..e3e7b29927a4 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -1,5 +1,5 @@
 DIST ddrescue-1.24.tar.lz 85244 BLAKE2B e8b5ca5c89a65bed6126737125d78b2af9cdd7fe9b20f1f03636d58249d33dc08cb1907eca35c35d3ff81dd031290177084ae5dcc1cac20e79cb6c182cb894e4 SHA512 2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa
 DIST ddrescue-1.25.tar.lz 87001 BLAKE2B 45054ecb6ca12f8fe27d6b783f7e339fc11a9a3425160012e0682e39644fd3c91362ecd568a2a0b93f9f0af87fae2415b33a7c3fcd8fff2262898e8474818a00 SHA512 90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8
 EBUILD ddrescue-1.24.ebuild 875 BLAKE2B a483a5cba8aff117f0c22f88bbf3cecde193556d8f6168adee6ee6d2dc57b65246c383104df5060db7a5071ce00175d0d5978088353c05fe894a25a5ce05870f SHA512 a2bd0a8a8373e4bd4fb77c0ce1d01e2e97b69b4cfb9b7fe1451443d14b7ac5e85db4ee9858af78a40c22d9b199091a1a0cf325c0b132cf704980ce9af8288bfb
-EBUILD ddrescue-1.25.ebuild 879 BLAKE2B e90babba030601514f525ee1a6269c72ef86d56b8ec46ad4a7cec07d5f081a1eff594646e39b4b0424807fcdcfcbd4c6905f2dd0410227e3d1ae19c127c1ca45 SHA512 29f920683b56e78d0d4ea43b0f5c71955a040f5adadd13f02e2417c36bd0252491f526eb0897590850fe52c0cda4eca681aeb5e71b1ba1a00ff0215b58606444
+EBUILD ddrescue-1.25.ebuild 877 BLAKE2B 301e8dac399872d6c0974aed8a72fa4da993840f69c4f994e66b5294b653b1613b171b24bdbf8cce7cf6611149292396180763a395d6e29a74bcd67f2f998580 SHA512 e1e7a6c8e507cfa831b772e0288d324b945d50ef774a9dfcc2a1d9adecb10f1d7d7b72714a7386a9bc1d5bd9481bd29b56b77047004462e599afd84c078a94c5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/sys-fs/ddrescue/ddrescue-1.25.ebuild b/sys-fs/ddrescue/ddrescue-1.25.ebuild
index e627f217b785..6065a2da323e 100644
--- a/sys-fs/ddrescue/ddrescue-1.25.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="static"
 
 DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index c55ceaf1aa48..84372798d929 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -3,5 +3,5 @@ AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
 EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1211 BLAKE2B d78ec627dfbfdd755adebd7e046eda94dced4144c3993b291b119a2f6b5db13cf4a335c694b58b873a6ff2c4ed61c5de95aa5217ef88022f1daec14ae697a67b SHA512 ddccd84c7f12679b74924e2fa51fb28a385a54bac3d07ca1f3ab99a8b118657dc2155e6ced6f8b78b36e9f604d02adf795cede4c5741b6af0a4a68a42092f270
-EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1298 BLAKE2B 6305f41bec65244a0583e85214e91669636e9c99ed844278fbcf0eda76df7824f43c551da8fc7f95546e0d4d7e1d5059bb81db7f553bd8068ea8ee5da158ef25 SHA512 670bd378a737109f98536b15c8011356ef116e3cb570f444a150218d5aa6b476112de88fe1fff85f2d99d85ead8ef3d752bc89491e60b66e4269d3ac0e3d4d00
+EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1296 BLAKE2B c66bb03d8592403c8aefe20f9a3b3e2ea727943907e904ae53d8418ed58b681036695f197c1f8d496a34bb8f2a1d573935fe9d6745d93c4dd5c02f8321ac45f2 SHA512 93edf690f97847faa1e822b6b0833b6bae97dc7fd5324ad453fd133d34671f2b791d9a1a12042fc138ed86dcff8515eb3f418a60de82cd56851ff7282529959d
 MISC metadata.xml 375 BLAKE2B b5ab86c1adfdb8ad06c76fcff0378bc7d88bdb7510e0fa06cf3c32e5025d7bf7e151f4791e0b1bf9c76692408da5c979b7a9ea713cddf412e4c291eb2cbc31fb SHA512 4a9cb22aca89fe59e631d6a102977e8e3a6fe6f2599dddddcf7ca8eb043d2af50d23a43483cc23350d942cbbac52774571e57260820ea0448308858ed1fd45c5
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
index 52ed38b23b1e..b6c9b084b236 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
 IUSE="libressl"
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index ef4be71c0999..6423db5889c0 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
 DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
 EBUILD udisks-2.8.4.ebuild 3279 BLAKE2B d3a35670627a2cfa8f211efd0e38439ebb9b5aebf968d8dbdf3670f501d9ffac3a0665ffa85e894fb9eb31bf20240822d1650676ba2aef0a97fb873afa7bfa27 SHA512 bc3664b7a2e18c537ce33cbaf2931c113387bcf110b524b77f5ca2346c54e4d3e998accdb1cc075ae990becc09238ec7efd6543c5a2bff457710491ef2f150af
-EBUILD udisks-2.9.0.ebuild 3392 BLAKE2B 76ab015d09348290ef4e3456856e05147b7ba278eac4ddf6136f99d424226866d201ecba3fb880474f48e4fa082f33188969304a59a878a7d2094dde2dbde7dd SHA512 08c02d009d0614fc9907b55d9e065257c18a809fedab9823cffdd3b986046399d68178f94de8db0c2fac0185cde3545545a534bf42f15a753e9b25971f860705
+EBUILD udisks-2.9.0.ebuild 3388 BLAKE2B b5aa62702ee29493b78e41cb75a287f05f43a5ad58fdc86e03622fe84abe5e44e0a003467f498aac32f3a9328c5e6690a650d2993bc4d80bf8d1194caf50a2ea SHA512 43af0c0ab3b70f0972b5ed8cbdaef288ce2cc18b350ccf6e8456b3a4ae9e490931d53b1d07cba6ebc8bcc4590a3c6537c6cfc395f25f3294c2ceeb92ebc32464
 MISC metadata.xml 641 BLAKE2B 705b9b22bf911c442ba6529cc6481916d703bb43a741e731e65607be9d916be9db9b8bc75ca4b5e867ded9321f0fc2cd5d8c3c4f3c67908d639d6d6bb1416614 SHA512 b24f65a685c3d17b113467b274f2fe7acd46641e9afb9c87a6a23ff182d1b841c19540c57c92d7a346a80a077dfff9fb79ce98d564737d2af3001ed9c8f79013
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.0.ebuild
index 020910ffa396..65afdda58d59 100644
--- a/sys-fs/udisks/udisks-2.9.0.ebuild
+++ b/sys-fs/udisks/udisks-2.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="
@@ -21,13 +21,13 @@ REQUIRED_USE="
 
 COMMON_DEPEND="
 	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
 	daemon? (
 		>=dev-libs/glib-2.50:2
 		>=dev-libs/libatasmart-0.19
 		>=dev-libs/libgudev-165:=
-		>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	)
 	elogind? ( >=sys-auth/elogind-219 )
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 473b6bb836da..16b0364353bb 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b640f91bbf0204f9101801a94087383d7087bec08ae490e9769dfcf4f7f218d6daa4779087a8a0d23 SHA512 e77c3a573c2d4499df902b68909c186e4c80ba8b451b493c7e08e5e96ebe281933ce4b5fc11c201e33f27b14a02a35fd85270baf7ddece42a2fcbc6c3c421146
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
-EBUILD zfs-auto-snapshot-1.2.4.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
+EBUILD zfs-auto-snapshot-1.2.4.ebuild 1382 BLAKE2B bbd5ce2059437b6263c0dab8fbf944a349a4240e86ff6b2278ae79a6b8eb1626770a2b5cbf7e559d0568e0c30a63b2375e104f0298843accfcd32ee68fc7ddb8 SHA512 9a769f3c595890506a2501ed20a33967a5091a3aab07353189cf62fbc7be9a6136797d250f4ab655b149356238176f05cdbcbe486131d900c51f00ed3c71e14a
 EBUILD zfs-auto-snapshot-9999.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
 MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
index d8170b5cfc1c..609faf654fd0 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.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=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f99774fd573d..d09f2be88ddb 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f4ced17855ee..6dad363cc6b7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,12 +4,18 @@ DIST gentoo-kernel-5.4.52-1.amd64.xpak 61394475 BLAKE2B d34ca15f828c8e99b441b453
 DIST gentoo-kernel-5.4.52-1.x86.xpak 53172293 BLAKE2B d79c1af83246b09e45760c69e9871f1d4dd0c8da1b9a3c16e07ca000f87aae0710e4b84d64910549c2799fa784b33919f72d34f8a10938ee2344ba22823c62a3 SHA512 113ca4c9eb5704e975876f98804236fa07f32d6a66651e6f6b0f136f2e4511aceb599f04d09c519dfcb4f044db916a0cf361029918acbcc42b36fee02871c418
 DIST gentoo-kernel-5.4.53-1.amd64.xpak 61427774 BLAKE2B b92ab626b71074a2b1ca7f230f5587c3066938d094deaefed0a0f0979a7d1ad2d16c471fa28f890a92fe2ab7181755996f7301eefdd91b67eda7196eb2298856 SHA512 9fa93faedf56facdff220078640317e4e29807d3a0f6a7ab38a756ddfeba6d9bde008701bd7eae2f9f77e7041c4ad506691a3da4b83b46629074fd47a3fed43d
 DIST gentoo-kernel-5.4.53-1.x86.xpak 53179468 BLAKE2B d4bbb30028948e9803bf0c8cca511122f6dcf93d160301367b060eab6ba927d4c66636a124497ffe140eb3504fa04178e0fb11eaf7b0e5718859333a587d00f7 SHA512 7df707d5a7223e251f795656d90e73e341e16eb3edc753652f8a0ca7069395f0b6dd99662a40c2c8952b460acaabd7fdf1a3b33025a559a8c2ebec9f18804072
+DIST gentoo-kernel-5.4.55-1.amd64.xpak 61924753 BLAKE2B 7674db9b6da853e1782fef90400dec457e6a4ef701692379a50320639684cb6f877720ee6abf4a1deccf6ec1aa489324a4d7c5e8081da2bd10c47ddcd8fdd34b SHA512 d999ebd61c2c615a72053172d5ba4146fb635be7d34be659f12f5f50bd8f71dbd4de0fee3ff77ed61882783482aaccfa57881c94598dbcd1b0a6127185e20d62
+DIST gentoo-kernel-5.4.55-1.x86.xpak 53203656 BLAKE2B 4f7a52537a3f2578eeb4275cc285d4f7c695764cd4d68885627b86920b74680eba36b03f5e5d6caab3ffa2aaf1fa72812306d179b0b01bb608a400c4dee504f3 SHA512 5e94e83426d3b359935b7a7073ca1e9e6dd33b1207f9be59581f4bec5a5b74035a0cd4944207d2f3d8e2f31dc540298e02d12afafe549d311a8633a75824d6a9
 DIST gentoo-kernel-5.7.10-1.amd64.xpak 62959097 BLAKE2B 7d10cd9af73be952e521afd696ecc9cac69e855284997ffc48cfb374ef45e379be721d6d71db6e81911c797597cea54dbca92c64aa1b774be89d6d9c8d64452b SHA512 34db8816fe6f2d125cd737eee207fb16c75ed061837b8e3d67b4aa8887942aa727869a725018bddf9b6b1928d3a0e093a0f441f7c49dc17e46364c523a56135f
 DIST gentoo-kernel-5.7.10-1.x86.xpak 54968846 BLAKE2B e33923959281e22b40ca5205097938671aae0967e9a32a5c63628f2ef285b10cb0672ae2a59cbf641fea2521dab439a163e0c624ffb4788b0a8bf333db5efa73 SHA512 728d3eeb66c9bc8940cc3d745055d66c368c9bd7f133f903087b09655fd441a47ff75b48d6b2887a2d0be607de3a361c12dc8f5fb1ee58e74dcfa916dfa1f667
+DIST gentoo-kernel-5.7.12-1.amd64.xpak 63454910 BLAKE2B 6b7cd4c1070bce50ccb049285e475d00920552b2f4e11a9fba10894f7281f6a928c66f81dc19af6bb9cfe7c215a719c71fe3a9a1c0c8956bfa67283367be09cf SHA512 478a5cae6c31a1d09f9b57bda8a861f465b8d6aead7c231a08bb50f6e17c40d9f55b705f205fc9dfcf165173f1a5d2643e13cc565bc6bce51d3534e30f2e9976
+DIST gentoo-kernel-5.7.12-1.x86.xpak 54969313 BLAKE2B c8a74f8979c912a1a503b856c7fe0f8f4db05618cd9fc3fb94ddfa082b16e17621d24bdef9fc20384ddd465ec4df3ea29017bb4eded70b56e73172afdfa64558 SHA512 be88ebe1d9c79f9de339b4fddac73db1f12cedfbdcaebd8d5220747d0897360864b56fe821749d8d320eb219b05dff0d7afb2152eefdfe791b28c615d5cd69f2
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD gentoo-kernel-bin-5.4.40.ebuild 1048 BLAKE2B 72875d3d21ca44fe5ec1df461367363c1fe35f28e21c0c39d77f808feb5d63a8ecc24d2f0c2bee1e90b19a7c70333120fe4d85cfc7a83d2fa78d50afea10ccc0 SHA512 4e321a97221e8a9d3e98d23ffbc25404aaf4431c0eec956aacf57e23df271c7f26355da0cc2f3bca02c2a5788428cf354959d8c191a4df984e86327251a093c0
-EBUILD gentoo-kernel-bin-5.4.52.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.4.52.ebuild 1249 BLAKE2B bf16b5cf89aeb4cbf1df81265b67c96f47a1eb5992119755c67b2fe929a2c4495120aa0914f69d14d09db77c30e88daf463f5fe3a41e5d8a6bfaeecf2796d0df SHA512 eec7898c0548d5b76bab2190ec1714d7d53189a582cc1da9bc6255a7f0e948bcc3c8417287a829e68c04b8dc58a48a333bb4f3eef27984330ac271adf79f467c
 EBUILD gentoo-kernel-bin-5.4.53.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.4.55.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.7.10.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
+EBUILD gentoo-kernel-bin-5.7.12.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
index d6e61fa69369..7cc0170ac1be 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.55.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.55.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.55.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.12.ebuild
new file mode 100644
index 000000000000..dca6aedbd789
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 417341914d98..5144b7111b39 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-5.4-52.base.tar.xz 1777632 BLAKE2B 458c4599bcc1351963e7470d58419
 DIST genpatches-5.4-52.extras.tar.xz 1764 BLAKE2B b81e9fec54b98cbd75483a814cbf1df30d754039e740fcd72fe9aa739e6c91e13b6107d54729b0e18acbde34f77f3bc00b4fa70e0754188dc2364e02b96a300e SHA512 e8f28f9993f79fa8dbda95b9b990d47da4a598bda0fab378c3ad478aa41558302b58f050716373341483a2eea3f9be7149fa38f2170a6eb620ab2c0def1b3b85
 DIST genpatches-5.4-53.base.tar.xz 1827188 BLAKE2B af537fc71643e9bcf7a4cacd5af6a1c1aa34b50e8fd7d677890dfe3b51823e37fb6b0b9a162aa50872a61244b470078bf092acdee1b376aedfc2f2bbb22da9e0 SHA512 240039c975defddd2a9faa1601fd85aae353252fbf496cd3cc6a5169acfda4fae51664c10f375a1b4fa1cbe7a705ab71c5f27daa196da77b7b66371a5d53fa71
 DIST genpatches-5.4-53.extras.tar.xz 1764 BLAKE2B 192b382f6309fef702204b4ae60375460587933c2e3dc2fc2aff6a2524828e956efc447b084e54538d72943d92882ded3aeabcf2bf75f34f3199490140bc2f80 SHA512 d44c1daa0b4c8661fbb66b01992ae6738b54cf32040f096bc95d6c0ea8f7cfd34e4c8f5065e7cd5d2a6d9c0b418b245aad622ad230582f45ac5859c88a46ebd0
+DIST genpatches-5.4-55.base.tar.xz 2129856 BLAKE2B a9c688be16c22e0e563c0fa3c943931ef933d0114a1a98b41305d4f566fec453a4861465d5a1605835cd7277bcaee9cf5a238ea624bfb650e389960cb1dd6292 SHA512 a3f4b23d59f6e4253d6a9b113977b7ff64fba611b33244ba69a06887a9f597fcf6c87f23d7412471e77187d01b4ae736ebbb71ebb647426e09e0051fe4493c51
+DIST genpatches-5.4-55.extras.tar.xz 1768 BLAKE2B 195b5747cee6c3302bdcc2cb9b05f0cb87c367bb63e7a0afdc93127cf2844e8babf9bd378370217d57364c9a3bd0eccf01a41b40606ef1feb96ef90e9e67f91a SHA512 32bfd86dad656b6f9878df9c7bf17557cb553e540c34ba8f4fe9bd9b4d42c006a62c29d465d91a67933e27bdbf9a1e35c3b87d95166822b48bdde2584bc8edf1
 DIST genpatches-5.7-11.base.tar.xz 532736 BLAKE2B 9f5b5d8304c22cac1e081be759a6731c5902e2afc241c79dad2518083b9d56edb34f5ca2d9b39fea84cbe0e6569314e0db84eb69027830b997a6e318b6e27c13 SHA512 43bd55fef87afc5e97fc9d4d13705f6790eca5c1874fd266da2109ea0ac913e812e156cd231d67d3494f743f2263d33292770c4be9a8009e0c6f85704d77b21e
 DIST genpatches-5.7-11.extras.tar.xz 1764 BLAKE2B 655bba046d32ee61d8b026f462e35c4e58536afbfdb37de32380a253fedceeac2da42a1366ecbe0b7e156f25319f67ad61a5eb51ba762fd8958068f1f1c0d0bf SHA512 b26c720473ffdef3ac40955692660ee4645a93e2cb86a76d1583d878c3832f3c8bdcbdc23bc6838c1d0255ec86a5671d4e205cb6e99dd5a1d64405fe0081a355
+DIST genpatches-5.7-13.base.tar.xz 581360 BLAKE2B 16841cdedf5ac9fd897e6c3ea6f428a4bbde48dca1c5f6d432d1c63248d6cec9157d4f0680cf340cc08703715afb32db342aa837a978c29b1874917d13454dd6 SHA512 aa15be557a74258476d777575cbe98148bb99104f221206e5d1589dfee89ab7ed2637a4e6dd044f477e3c5b0388faf399dc7241951c37a1df405981927f9973c
+DIST genpatches-5.7-13.extras.tar.xz 1768 BLAKE2B 49f3af716da6e9029ca774056259e2f4521dbbcde9d453c71987d105b628934738eb96cd622ec92d338ed7fd9c17b0f99d82154b240258c299f1e55ecee938e3 SHA512 0cb1d9affd59a93596ea0c41f888a451440b6efd0788b47cfecbf6ee41b24685cf0b7c9ac43a0cb1375086809fc1423c3c2ef1bffa93eb60c4f653d473441d66
 DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
@@ -17,7 +21,9 @@ DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD gentoo-kernel-5.4.40.ebuild 2149 BLAKE2B 2d5c9fec557ef79c4e37584448c3d7a470156e56e97e0da57f8061ce715125fb7f24e9b522d2b7dab42ed6181af3900b8775bd19041d27d534361774ccdb64ad SHA512 2f2dcd1640a6208565fd9ec4e5d98ec9e9b4eb136e29b735b343bfa76e959ecc82a96b281d2ed3ee6be3143d4bd251e3eeb5eb244f14dc4e739885956551c92f
-EBUILD gentoo-kernel-5.4.52.ebuild 2179 BLAKE2B f1cb78565bbf68bf46c285c9b0552cd9c2cd47083b355aa80a7f155281726ecac4520aa8afa47b6534ce80d4f12c622a7de3abb90247d15d2dfdbfc24e8604c7 SHA512 ed2d77e7b0fc6c86f199a1395a6152e430726eaa52b605772127553db0ae71777768c4f928c42f16ed859644a78e074d105220abe0442a61351b1461c7a87c2a
+EBUILD gentoo-kernel-5.4.52.ebuild 2177 BLAKE2B c35732f530116968c903320773a916a30200dfb327b08b2529f4d26d34d3a02113fea100f6e7d4cd1ea63adb4376505048ed6da244619283c85f13ab5ad0baa6 SHA512 56f6ab4edf69c6f5b6815f06128d07cf5c50a96c92762bfedeeff230368d46ce33da3347a94bd4abe67404da99b4185c327aef38fac942d98fe26b4dd5387662
 EBUILD gentoo-kernel-5.4.53.ebuild 2179 BLAKE2B f1cb78565bbf68bf46c285c9b0552cd9c2cd47083b355aa80a7f155281726ecac4520aa8afa47b6534ce80d4f12c622a7de3abb90247d15d2dfdbfc24e8604c7 SHA512 ed2d77e7b0fc6c86f199a1395a6152e430726eaa52b605772127553db0ae71777768c4f928c42f16ed859644a78e074d105220abe0442a61351b1461c7a87c2a
+EBUILD gentoo-kernel-5.4.55.ebuild 2179 BLAKE2B f1cb78565bbf68bf46c285c9b0552cd9c2cd47083b355aa80a7f155281726ecac4520aa8afa47b6534ce80d4f12c622a7de3abb90247d15d2dfdbfc24e8604c7 SHA512 ed2d77e7b0fc6c86f199a1395a6152e430726eaa52b605772127553db0ae71777768c4f928c42f16ed859644a78e074d105220abe0442a61351b1461c7a87c2a
 EBUILD gentoo-kernel-5.7.10.ebuild 2224 BLAKE2B e087182850bc019737d5f48ca742397c5be336227cdb63d202afd5ad388351b185f874027a483706c6a382fc85fc295151b66f960c591ae7f7f37a602686eb2b SHA512 9db5f0dd21da1a09b52a923f25a1ee401d02dad8f4c8be53f47e5a006ef741dc4fac7c532a9972cb1939a328bf9170b722a92205341550940fdd7595cdd77866
+EBUILD gentoo-kernel-5.7.12.ebuild 2224 BLAKE2B e087182850bc019737d5f48ca742397c5be336227cdb63d202afd5ad388351b185f874027a483706c6a382fc85fc295151b66f960c591ae7f7f37a602686eb2b SHA512 9db5f0dd21da1a09b52a923f25a1ee401d02dad8f4c8be53f47e5a006ef741dc4fac7c532a9972cb1939a328bf9170b722a92205341550940fdd7595cdd77866
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
index 2466b1e909fb..0abbbfb7b584 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild
new file mode 100644
index 000000000000..2466b1e909fb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.55.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12.ebuild
new file mode 100644
index 000000000000..f0988ba69fb4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.12.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.7.8
+CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 2a0e207f15df..e23c5872cc2e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-4.14-199.extras.tar.xz 17528 BLAKE2B ac62fce202413bebc137f34051c
 DIST genpatches-4.14-200.base.tar.xz 4410848 BLAKE2B c578a70b6dba96adefbe3f10d37ce798c31a71e053c0e8f02cf8a0a2f906443e56fdcc81723a37c6163d3c8f9d43d63b2f3078db5bb36117606c9182c7c4aa1e SHA512 8a1dac09df44969ce266b1588e6150e35fb4e1449d4affaa23cc16b70ff36121c672e77f03985b7f9b99495a5e7e4d5ccaf288cb65982c8d16d6c50ea10ce1fa
 DIST genpatches-4.14-200.experimental.tar.xz 6088 BLAKE2B 61fffe9d636da74cf7add6cd2d78438bd283f2827232113939242bc3ddee9bf42c421825831cd116b72921844fbeb42890f1608e49eb52aa69a84da7b3d523c9 SHA512 efa24f83f5aab36adccda6ad695e1a4feba79ed67d66863830434a93f0adaed3611739ac60495098c941108ab231594b7a64d8018b9fbba0c13b126103c509bd
 DIST genpatches-4.14-200.extras.tar.xz 17528 BLAKE2B 2ba5b662b0c1e48f5df63f7bada78cc61881b0cd86926f594e252b7f2a777c09a723a343490d12382de88cf8baba2ee9e8a6bfb989d838b02bfd4fdf457eb83f SHA512 4c07fda188ec97f768d97e8f729e9d7ca8c865e5fb0dd36cb47363000a16ab322a35ebbe2f0e054dae090406a63dc4e11de112cfdc54687c3a390deb87eec67f
+DIST genpatches-4.14-201.base.tar.xz 4414260 BLAKE2B 5a1f01d572c2d202bc1ae8fb1cb3510abc58cb72b6e84fb41193a2416e2b3e6132d8aedf8e1369aee074ddd7eb4b4c3b625ac694ea163c87c1b2648a443b75b3 SHA512 40e6a6bcf79261b1dd2aa68e7afef88f46d0813c53d8cf3af74059202ced19024e943f1c3e1fe0b78cb8babcb0401543ac815e04c0c502ae8c226dd199dcc1f6
+DIST genpatches-4.14-201.experimental.tar.xz 6092 BLAKE2B d5c600c41ab13c9bb96d11175ed2198ab34a1660c6077cad43c620657ca52b176d5ba11a728f592a2cc446428a6a16f139dd7e77aceb6d16a903a2a1a400d79b SHA512 f84d101933957e9e4ebdca6f123772b0048350fbf7bfc4c5ae6842246b552dd5bbdff3b032056adb2866c06596c863e3292b16c26b37b2bf20366eeaaf89af59
+DIST genpatches-4.14-201.extras.tar.xz 17532 BLAKE2B a0aad64c11f2473f5f33626fe685eb173d436ade212ed7c24c31026cbcd4672a92979aa51526cf9f1fed1d0e1980a79be644adf9b3a45475634063fb28c76a67 SHA512 b632a7f85a9b5458166ce4aacf07cc3295ec494099fddb8eefa15725e5882fc57184cdeea8553c1b94ef63e958807cd7e6a34a207e5f3baa320f1b8d9b3a2eae
 DIST genpatches-4.19-119.base.tar.xz 3427592 BLAKE2B 162b414b2480bf6f2c380680b2a27fb14aa9a715e07d0af2a45433e8b20dc48c3c317c308d082d328c7312cd707adb528dcc88a0515942e4c794adf63ae916e9 SHA512 ca403e6cc5037ca4c8b25c53b0f5a60f6a006f0d7486ff32cb7e7e634a3ef34883ee96ec5049825a0c07111fcc7561e172f95c4cdbf5fb7d21c1e986081a9593
 DIST genpatches-4.19-119.experimental.tar.xz 6424 BLAKE2B 52329f89b354a12cffa0eb0fa35f237b9ae1b2bf81e0ecce3a90331bbbee7e1c4b41161286952c84ba64ca54235aa134dffd09ecf164eda3fdb7f0e000a35f32 SHA512 3db0a42d06fbee6e0a6f1afa50c48e42cd4c43365f91a800a4f99a9444db2b5030a5c367ea09409efa8d7f14494c6b8eefec47d2e8a8e14f52da040d26bce845
 DIST genpatches-4.19-119.extras.tar.xz 17508 BLAKE2B fd7ac78c365d496e3a3ef6584c2690205fe6ade564ef1c6104d9995943f32e3669d8f1bc7403792f2570db01c7afbe205e343a863a391489725cd7a82c1d1295 SHA512 153134a2f1a684a185efa3effc5e254857b79e5a07a06cbc5ae43f7d852d51fb4e920c6fd020d8eeb88a7b863d09679a90df28ce5d0c39bd77f055109824a3f4
@@ -28,6 +31,9 @@ DIST genpatches-4.19-133.extras.tar.xz 17508 BLAKE2B 8a1e0c079899ec2ecc642177ee4
 DIST genpatches-4.19-134.base.tar.xz 3720664 BLAKE2B fb09a90d57c534b68bfca584a1aa27fc7db2f28b00c4480fd5167b1211e3c4c6a6522549376d9620d79b2e278b206770562b83cb7350167239c133d4a79a24e6 SHA512 5032b2b3f334fe4774fd5cbcac43502b791d75bc2a6b239598cb87a3c350eb3e23bc517428f769728b3744b95fc59f8075e6476f152c6e500fc3578ac386044d
 DIST genpatches-4.19-134.experimental.tar.xz 6976 BLAKE2B c528a7909a751ba5c12e8b4712f15797181e510ef5657ae3d0947193fcf776a062d64ca9eed64fab3feb1ede539cb4595a4e2dfa5cf9a46a4f391b000bbb1795 SHA512 5d0a1c223af9cb86304575f9b7d79a47987eedb967208a03a407d55e19878294a187ce917a0f3e2e50320fcaac9ce7c8f04432cacfff0145212ea9bf93e347ca
 DIST genpatches-4.19-134.extras.tar.xz 17520 BLAKE2B edbd2911c50ef7efcccb63a3a02b2a3069df17ef1edf972ca53df54ee37b648b597fb2c3f7902b51c65f0401fcfc53512f44e3e49371caafe579e78e5e53be2f SHA512 4c971eddffaa2f11d269e83edc67d67e0eaa6e3720289924378c73dd5d0a519a5f8c486887e2f8c8d6c631b423f93f56228824a0f6774498bafd5e3ec6da2aa2
+DIST genpatches-4.19-135.base.tar.xz 3724284 BLAKE2B 402d5d01331ea923f488877134bb2585224d56c43f9ae5ddaa75e7ed94c321925513b5c462325ed27dadd5852db05bb64ed237d1efc4ac648e1d6dfdd2d135c1 SHA512 5e480a7d85be4f1e6a6ee04c51b5f67378ef0a76db0c78da585f90d97cb36ffcaf88635307903800915702f1e8cf048afae7f0a47c7efc552e9d2cf011c967d4
+DIST genpatches-4.19-135.experimental.tar.xz 6980 BLAKE2B b54067068de27d290b754ab9a0e8d1854f82d0395ee140007188252b47c9b5f1da0a4587522a710473fdb3eb18c23af378d9ff8964a0a2b7d2ea5cf210702cc4 SHA512 79fb39cc4da38de5c70337ac51eecddaf105b706c549f8fbeeee351f63ba1777b6b38f6977965cf649d39ae8ff99edc4e3208597944e56d86f0b71b102b29d03
+DIST genpatches-4.19-135.extras.tar.xz 17516 BLAKE2B 985d88f41cfb813a800193227903b6a5f7498296184f35a2dcfa1bff3a21e1aa3ad1f601fd37c15365336ddb9fa37f223ccfcad79d694c9141bca488b79b2adc SHA512 6df3a51fc7ceb0e09a7e27f9f47ad98a683b978f1fee6dd78e8e2ca83f7c5959141602c5ac8b4c89ed608716d099388d936219841a4edc79b29c89c16a135e28
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b SHA512 d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b SHA512 d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b SHA512 294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581
@@ -43,6 +49,9 @@ DIST genpatches-4.4-231.extras.tar.xz 16504 BLAKE2B 63cb9a28daf3e5007f61a562efac
 DIST genpatches-4.4-232.base.tar.xz 3759220 BLAKE2B 1eb7ab07d928ebc46f56b207172588786f29894222ad1162cebf1b7842d4ec83f5c2fa12fe2b1dc1a3aa27dd1d4ffd9f898a4054b7ae605e897d7a0818058990 SHA512 c79689e4ad8cdeeb6baa6147d7f5c0c68bd4275b0d60e937c2a5d2d4bcdda76e778957c911aa422bff76dae2b6aacbc12bc8ff73aa9cee8ebb4ae54165c48562
 DIST genpatches-4.4-232.experimental.tar.xz 83272 BLAKE2B 0b389b202f7d2f128fdf78ac3ab7a1901db241654800ce10e8ff6a508add414aa92060ecc882767a278a87992b409d97285117589b498d80db1b096763092dd8 SHA512 a8ed18d59db6c15ad5fc14ae612f1783b32a4158af16d5d32018b7849a926f112018c0d673b8bdc1f7b3d3542057aacabdac912d0c4729c9665f475ec2ea6fd9
 DIST genpatches-4.4-232.extras.tar.xz 16500 BLAKE2B cc50a07f00f762bd9b286d508717aa405c433d90c8cc1358c6d1322dab0fe5663fa3117205e79a3d1c703063db2a49d0b73814825e1788fdc20148c657fce1c5 SHA512 1cbf192e976d0483ade65e4989e0d290a26e7bbbd879c8f970f91d5e31df69a42ce11c17545ee3b6115fce2e46331c3d180c163d1b47c212a6451bad67210790
+DIST genpatches-4.4-233.base.tar.xz 3769272 BLAKE2B f20048ccd878db42d65bf1dc305a0aea6833a3e261b15b9702485405f4000bd5f7383ad1e286be32b988dd7db1683e13f66d127b4698d71f242037d4232d2aab SHA512 b3f1612db76bf5a5615375a8d569c53c4c2464fc08f737adfac81df055e23c454f179940c9b335af3f323d4bcebc136ddc73a9f27c257b7e9eee194e0b0b9304
+DIST genpatches-4.4-233.experimental.tar.xz 83296 BLAKE2B b760c8e0f1292a07192eb19e04a1f2a48363e24a83a570e2d31c682ece10956203938af9fd60fffc6e8ecce84abfa840e7d728beab97e151940f9f6d1b383ccb SHA512 7f8ba724b59e1ce6118b36be7b841ee7de12d4be09c9da26ce2aa607a8756482b8588dbd94bb2df077be38e050e7da62a6912616e7fbff8e322b5ee62601de5b
+DIST genpatches-4.4-233.extras.tar.xz 16496 BLAKE2B 9ec21d3e9d6e34f0ea459660a2265ed27252505331019babbb345560ee231ab55e22ac2bbe5b3862f774423173a0ea21ad38014d020e537613ac8784e2705655 SHA512 ce4265bede716efb60929f3bfd1d2d6c0d500e4939356a7a1548e9deee1de99f18b776b09dfa1b34b3054a8840bd696f3792f8350048e08bf129c10422ed1ee2
 DIST genpatches-4.9-225.base.tar.xz 4002512 BLAKE2B 2c8e3586ad499caf38e45ab80bc60c302486ccf23508e289bb9c48e9fa8bc7156c73831e4afa1d7034370c8c5c5600f7fb7a7cb8a75e326cc12396ad1b33cc10 SHA512 8c5f99afaf2aaf0016be4ab1ca76678162bd993dac1f7ff8339106abff24b024605bd816e44098daaada333ebcac04aaa960b2ab6f35f5ba464cb63e1245ca6c
 DIST genpatches-4.9-225.experimental.tar.xz 106384 BLAKE2B 9c2f06e7adb3cb818ae8215cd9b9499fea83ba10522d183e4acff04ca27455156e0c2f5718852d6058e12c05ede00760313b9b6d047b47f80b7e9c6335638d46 SHA512 02c755491e2941a6399f3ebf4dce74c2ecbe81da88dc0d361aa151131b14724ebcfddc16e18bf9fc4d882b02f478472be7be5028ad6dfb931fdbab80094fc8a2
 DIST genpatches-4.9-225.extras.tar.xz 17384 BLAKE2B 6346d0933a74224a34f78ab9df10a918d3d927fdcd8fd4cca8b5d2692442339a23b8f14942b8927b892ed1d1fd24fd7bd84f58de2739bac46e1e58848c834ca8 SHA512 bb83b8779580202897823cedc9bf60698f156f57be1f22ad18968ad8e27517ca963d7d444c04e497c73828870279372b49801b51ca28335ee990026af0b56d63
@@ -58,6 +67,9 @@ DIST genpatches-4.9-234.extras.tar.xz 17392 BLAKE2B 36c09d507f83331660bdcc48904b
 DIST genpatches-4.9-235.base.tar.xz 4164544 BLAKE2B 8b4a7b2cdffc0b0a0ece3612a6bff4e202a5988630f494d9db5f94b19415f2e380510386f4746af6e287fbf2943ec2f5e8711b96a652524fc76f59c7b765c6a2 SHA512 329d71679eb95a5c53cd9a8325d38aae121d80dda4066f9fbb92ec06eda557cee0d20625eac40be9b104d94e8b068be6508e81826bc034e3f33401453a286bef
 DIST genpatches-4.9-235.experimental.tar.xz 106388 BLAKE2B d951630a8b1043e5a7fd12b8be15194db230ff7db294834c0cf44c8399539e949b0eea6dad3aa636adec4618f622b9591eb8f99bcbc0f4e591f7a2b0a5de80e8 SHA512 49bf50ecfa306ec3935fa981fdc2f6213d06744b18436111cf5bbf2d123905cbb667604d78222953e35b5f36d6831219ef6d297d26c5bda59df23e26cc38cbd4
 DIST genpatches-4.9-235.extras.tar.xz 17396 BLAKE2B 30948f395ed6e8dcb9e2d318f029f793feffcd6e73162e6095f6963ed9ef73d1387f8465200bae13775e493f9fe9527e2880b73055ea5579c98950d83f0f6068 SHA512 3a1be79f23aefbd900be127c972868a289ee29fbc4bed3e9531f3491898b5a127d1df2dcb901dc3518cc94d3e5b38e5118c0b246117b05b23970736fc71fda14
+DIST genpatches-4.9-236.base.tar.xz 4175936 BLAKE2B eae1339aac91b76a000d821e2b0a48c3b11cd39d0cf39af4b038fbedf5802a677d472e55c7c264ac683cc4c1c15fab915e89c1e919dd6a21295f1c9d7529803a SHA512 5dfebde1c9b5574f28723d9864ad856b996c47d7184f8fe342160863859ccd225f1e182b99ce510af0f811d6bf7d693061048cebf68ea35fa2108e63185b184d
+DIST genpatches-4.9-236.experimental.tar.xz 106364 BLAKE2B b79d9d40b435484cc51b77c858a519eff4afb3b42d2e9a17198c732c473bbfc9bd8ff4730a8f06d8feaf743a4398e8d3f742943d2677e9c67eb5cf65f1036e6b SHA512 188a35e9c435c03278296e03e124f994897cd18fdfc4abb0913eee5a4abfe6f409e1b9cacf8282885c51fc8930421bc94c51525a80c3f95b1d266363349b3718
+DIST genpatches-4.9-236.extras.tar.xz 17396 BLAKE2B 6d5b4d2b2d0e9c23201557a1b620df247f57d9847490216f261736d0c261eeb4e520b436ced9df38a823c6675d9b2e105b8e4bb3dca28d70527ae31c37297dca SHA512 140600354fab7a4605a0c894d26c817f8232c7f0229b921d12ec1b253f4c27fb71180bad250f8ab176cc2c86f05fe6a6074ea5d1e47d755b901e83571a4a26ab
 DIST genpatches-5.4-38.base.tar.xz 1364272 BLAKE2B 708fff34d0e5db8971687815f936bb6fcac0049fdb8351a500c67ebb5c472c8a0ce7a8e580b20c841aa305441c849cc595735292fdcefe8b9877530f110bebcf SHA512 6accf4fc70cbf2463df6b50001bba07b3d32985451de341398a8e9f8b1281ac3ab22661b5216afdddb5072262ac238073b83231c9fd2b90b27b8cc3b9f1d8850
 DIST genpatches-5.4-38.experimental.tar.xz 6140 BLAKE2B b61bf414cf1dc573ab72ba84530c4fc6a565e0e2fe39c84b822a76dae4b708a55521d5ea0f680c92bc62a205c2939e0fa367a7c80ac2218da44dd361dfb0af20 SHA512 d3b35b54359ecb5177cb475913e847374aeaa155f28f120f2994ea09c7124c162a29dfc092489e2e044e52402df0abaf1e9179fe4fe2a363ca319289bc499c2a
 DIST genpatches-5.4-38.extras.tar.xz 1756 BLAKE2B 2e4d217bf53de074717b18748263318cc637ee85c1217caea175e7f47ffa74217b1e06a5bd19a0ba88307423d16c0a2c6c7975c8d3fee83a8d1fd65a0cbe4544 SHA512 db347a70bb1fd88ff37573ffe7bb1b03f61f7cca9b25ef302ce26e7e849bc87aa1f5b5c732fb3fae3a5efb339794be6a11eae386cf444fe50143bf46be3544d3
@@ -73,6 +85,9 @@ DIST genpatches-5.4-53.extras.tar.xz 1764 BLAKE2B 192b382f6309fef702204b4ae60375
 DIST genpatches-5.4-54.base.tar.xz 1854568 BLAKE2B 8d2eb9ac50614025d8599b265b0bef1a89af9b667085c0da017941045a8476a36757f885082d5deb29a0ab7a76698f24679639654672e8f4a94e06f34b600630 SHA512 d96942e075c28c68ef088efba9cc17fa2c537769478766787eccd08d0fb991fae0a34a250e9a0ffcab7d17b766ddf3ad8169742239671811d6d01a6850ce9e78
 DIST genpatches-5.4-54.experimental.tar.xz 6696 BLAKE2B 18b4d2ae414fbf379fd94ef50138ffd777100c187c6921ab08d291d6812290b30db77ffcd4b7702e9ea2a4213a029fa64ea4f61a5f657a73ce1e13bce15c1520 SHA512 b1025eda2b80b4c809e798e93988cbe700bbc08e92b27f79a89a91af033361f61d4e7e82e9a941980fbf5321ff3987f7d9a27eb382b1758bb5c3cef4d4095654
 DIST genpatches-5.4-54.extras.tar.xz 1768 BLAKE2B 667887f4041d39ba1c308e9569c1311c52ee024ab9950268a1e374984438352087e9bc108dbd8afde8a1d879aed96b21c3247fa168579db0e4068ff88ce3c57d SHA512 50318229f6bffa287f26458b0b3b6f8df71fd789511b3f186556353b9a8fe6bddbc3732584353cb1147a1c2dd4d883055892a848a8dbdae62f89cbbc2b789f5c
+DIST genpatches-5.4-56.base.tar.xz 1858344 BLAKE2B 240267c30bb8be8662f4a6fbb642606801b95b7b63263073747eca00b82b882563bfc8a92e87c3cafb90aab6875396992bb01dd4bc947b85a20c571c32399e4c SHA512 b60ee720a80743a97cd2db487a67c761a98223391bf596595eb764bd9e0a3e40578e0f68a38a0a46d606712fbac63269194c80325908a40cfce8a7f57d5d730c
+DIST genpatches-5.4-56.experimental.tar.xz 6700 BLAKE2B 0cd6b6129c4e4661bcaed1dd0dc8a5a8c8f6a65f0176f5672027e5a3bab44cf77a9ccfb79540e776d1b22c80d4aac02186d07eaebb2cb411d75fb5ed7d0a3a1c SHA512 c1838e4c000ec5ba336d5a2ab4a0141c43f5747d750cfa8fa41e774ac77c006c199ab355b268d98b7295901950735222e59488c3eb71afdbf67edbe1df0e79ae
+DIST genpatches-5.4-56.extras.tar.xz 1768 BLAKE2B 49b3874e27513376da3b44605ee399750482bcb4ac45b4cee39929ce3bed71cf292d8a42677f196912a313103e08af6c9189fd67a493aea284a0de69ff43ac93 SHA512 a2132e83db6e8c96ec59c7ec26280b383ddd76c7e9448cb1347004900f2471774e1e5e99ea6e27f61fb00c3cec4ea01e043ca44e58dc900ebb60ed6d69638559
 DIST genpatches-5.7-10.base.tar.xz 471556 BLAKE2B 895b76bb27d9bb8ac06514e1dbb6cb16994b6e5f7357b01efce5ff27d4337975507b132f747bf4a4508de33afb65554aa87c704766f28866efe6d4edf21b9618 SHA512 6fa423283cce5ebf82a45a95965b449aabebf9a49dfceb6173552e7cc6dfe5bdbd54817c7a3a239602fe363993b0b08005e769a350b2e4263eeac9c1eac4b13d
 DIST genpatches-5.7-10.experimental.tar.xz 14148 BLAKE2B 1a73711680c8fba7c27b567e6757faa08622fb4beef093791ea274c32be7a73ad102cbb4f278864b0badcc32edc216c4fd331fe2dbfbe4cba3606e4220bf6086 SHA512 96980f0e26f2f13d89c9e2721b8512deca50602d2fe4a60f43ffab4744d8f0c6ce5ea5baceb01da92f4ba10f676371ef2ed4ef79c8b0eb0cbc11f2614173e0ff
 DIST genpatches-5.7-10.extras.tar.xz 1768 BLAKE2B f51851b7e4fa9eaeab537eb33f09ee19247f078d302167acce077f2804a1e4ea28012f9d9b1cbd9cd0997a6e6ae5785ecb40738c5bec2dc75574c301e047ab4a SHA512 05f9e6c87f736735fc004e9127f79ad820983e59147a79e11357e49b0ff45f924b82d6b5683ea7fe7807cf8b981a8c3e8fb4b731c0fd8d8dcee1e1856dab3ace
@@ -82,6 +97,9 @@ DIST genpatches-5.7-11.extras.tar.xz 1764 BLAKE2B 655bba046d32ee61d8b026f462e35c
 DIST genpatches-5.7-12.base.tar.xz 576300 BLAKE2B 96d572aec134c26832a25e4603200a562685a3a459d1a71c9e90a6f5c1c8c6f5fec9b23ca3808adac56bde80e14a4edf57929488ec65ed7f12405358e96c983e SHA512 b142305985f7ba1dffb14b7edd6ebe27c13216efb35927fd23e53c9901981645279d984814208ff88995a10f702cb8d61d6ed93d4d63327e68a874fd7ff9f6f7
 DIST genpatches-5.7-12.experimental.tar.xz 14140 BLAKE2B 833db3c1f60fab612afe11359d90b1773e7bfd670d9fb46397988510266a78f4fd9018a34304e525e4920359a5267a11ac5c36a854633b26565fb1c9aa267bad SHA512 3bcd319c80a2139d35cdd0e668a90a620a2944e433b8e7dd1fc00818cd1abba63d0c477a0ee3c9bda37b0133eb90a97a995ff90427b4fe58247b45ba5e48efa3
 DIST genpatches-5.7-12.extras.tar.xz 1768 BLAKE2B a1e243afbad561989fe8b3665a8511d04554526cceff174bc84fd11e5b433861d999d6adaac4235ee0b81a919ba2409b93fdb70622b3d28d3146931701311579 SHA512 45da9d1e098b15d87b233bcae295c5b1c0adee9dda5f4b6654d69446e37ec6cfddb5637dcd3f5bf9235825f051a242fec9c28e87a28f692adf4279cb631740af
+DIST genpatches-5.7-13.base.tar.xz 581360 BLAKE2B 16841cdedf5ac9fd897e6c3ea6f428a4bbde48dca1c5f6d432d1c63248d6cec9157d4f0680cf340cc08703715afb32db342aa837a978c29b1874917d13454dd6 SHA512 aa15be557a74258476d777575cbe98148bb99104f221206e5d1589dfee89ab7ed2637a4e6dd044f477e3c5b0388faf399dc7241951c37a1df405981927f9973c
+DIST genpatches-5.7-13.experimental.tar.xz 14144 BLAKE2B 9bf6cb08196fff299c5dd69095b63b39e0bbb5df959ba7d69a468dfcc9d71089ab63a4fdcadc4adde593e2b528d7e0d388493398dc1b7c75a802b719227f7679 SHA512 0bf12170ef9b7455b95330cbdb422d33f12e151def80865c5b04f471b8d7d13f419a949acebcb1c221907a23ffc1a72b100fbe6c7d59db4fab87c2b5c02f7668
+DIST genpatches-5.7-13.extras.tar.xz 1768 BLAKE2B 49f3af716da6e9029ca774056259e2f4521dbbcde9d453c71987d105b628934738eb96cd622ec92d338ed7fd9c17b0f99d82154b240258c299f1e55ecee938e3 SHA512 0cb1d9affd59a93596ea0c41f888a451440b6efd0788b47cfecbf6ee41b24685cf0b7c9ac43a0cb1375086809fc1423c3c2ef1bffa93eb60c4f653d473441d66
 DIST genpatches-5.7-9.base.tar.xz 422996 BLAKE2B b642f97c554acfed1c360ed0a39e8dc926717bcae6d8544e6a8cffbcca892dd489709ef8490b409128a33612b74df7d57c35a10a8f4f6ed4a711bc26cac31293 SHA512 470d95d5964426fdc976f45ab66d03395f9597a5090b2f452607acce6baff5827dbfc385e033125429db4d8d4e32a7e356c3ccfac149c538c604cf331286c2f0
 DIST genpatches-5.7-9.experimental.tar.xz 14140 BLAKE2B e1ac516ae635fc5ad797bf785dcbb188be8c6b13ab3228ca10a328e73fe0f45dfbd3ee596d8aea4298788e480133bab453e72a1bb78e40043a254edf6bdf99d3 SHA512 eec7e825f368e956aac97e9031cb5c8eb3f607a44dabc1ff2ed4d5c65e65e8a59920fed78e1c019af9368a45200dd1d16f71c8e8f223ed9171ff1e084f07b0e0
 DIST genpatches-5.7-9.extras.tar.xz 1764 BLAKE2B eb8d437e2761aa350548643ef39beaf73cd7935a0c2028b44edaf9d93c833b7050d11b66e540731708911df971f4bf4b947a89eeddcd9b49278fe1afceb16753 SHA512 4dc6cf6c181756aac4ea0bdffd571e64d787a592d5878d4c90f1f76e34beb3726e94d070b2138b68124ebd01de43b09595072c5f737eb6181d283edbc85d30e9
@@ -96,28 +114,34 @@ EBUILD gentoo-sources-4.14.185.ebuild 730 BLAKE2B 055933012d82956d06157db02cecb1
 EBUILD gentoo-sources-4.14.188.ebuild 736 BLAKE2B 7b016c17a05e35247c53d07fe794c067f837245788ca63baaa130ec1bca9b24aa0ed4549c137def24579a0429d9a919942acc0080962dc31b4b8be115fab2d3a SHA512 6b528cdffdb953e8fef883c9544a192dd986a8e04ef51333b62f03e373a479f0c369e15ca793f69d68cee48e955e4a1ec80f7836b88fbb36b2cde5ea50761523
 EBUILD gentoo-sources-4.14.189.ebuild 736 BLAKE2B f82bfffe1c978b0f5f5fcf0860c13506b1481df6441c9cdc77d358eb95a1fc11a40c5be0c24a539bc6f1a0d92d7cb651246c4b2407dcf928f4d204dd5df43d5a SHA512 41b723696f55f694b9bb5663d3714acee24cd698b07ea1e569425b722c5571d89dbaf6cebfe63920c466278b45073703a3ff94ba7bdfa1ee134a21f35d6467cc
 EBUILD gentoo-sources-4.14.190.ebuild 736 BLAKE2B b5fadfb5147a92f00917716880a7ead685fad07d2891a0b0f363123221e77c0d16e9833b9bc49f09c8ce3f1c2c688db0cea6563152bc05a838f4e192b05ded18 SHA512 d5a2504d05145057b1a4cb7ec50e59459be0e00f5cca7cf3d01d1b5d577945ccc019b604e529eda43b6fac446bcaec4b0d6354f5a5efab565c8f69e4edaa22cf
+EBUILD gentoo-sources-4.14.191.ebuild 736 BLAKE2B 914568ed18a75ce271e523b680554eb6f7045b28ba23e1de1b7f8e246a797a1dffc9ef2c966362d10601e566386ca336daea7211ca98d55da2e86d8dec09137b SHA512 7875fec8573bdd02045d0a858df96577755b91312dec49f212d4fcded46c5fb11b9bcc52f567e810fccd632af813eef7ae81654d1f1b0910a15764e6eccb513c
 EBUILD gentoo-sources-4.19.120.ebuild 729 BLAKE2B 293fd5c4504c7514cafa76da359835ed16ef486a3260b8530d2017636d9ccea4b25e498a5934c757d11cec3f04232c66daaff57fa53724dfbaae42f4de3dd7a2 SHA512 2f78ee6237d86516b4e27c0927e96e5b99c82fd8b9548b16f7b93e9e4e6d6998e2d6cf410b2457e5211d5767dec4b925c4e552c0740d260656c6f62b65b08627
 EBUILD gentoo-sources-4.19.129.ebuild 730 BLAKE2B cfb4dfcacfbd15945d4990c23342cc97759c4d9a9a480e99964b045f8af2b0e3957ae4ced08ee294579755ec4b2ea864fe4cd5461c12cea8c04c990e81f5a022 SHA512 7a5b183017703855298b6485b9babbf044ea7d51e7420cd55d4c4b1af6f546d0556531c5745e3550931d2cd0d35999588814ac785644958586c10a356f94b27b
 EBUILD gentoo-sources-4.19.133.ebuild 736 BLAKE2B b34defb637bb5c7b284d6632051c43a4962e8f2159de0e4992e45bb9323180f92e1070b5e07b94d4d014f1ccb32e0873aaaf54695f70264f22d9cc4490ff43dd SHA512 45f9999bea7d37ce63da361a000cf0baeefbca272625894f4223d15784220b373f23cf32c4793337463b4b15901e8a13dd6433454c6ad36cadfc35073b2686d0
 EBUILD gentoo-sources-4.19.134.ebuild 736 BLAKE2B dc4d99c91d265cfefd326c70050c7c803f9d4f3c21e32c573ecbdeee741c9c277cba496538b0174b1e5a592260159bfe5f0e4dba0a25637c942e34917a5d28f0 SHA512 7c5561f235340974214c8ce97ba4d559b24abaab0407e317150490db4345b84afa465b7df6b7e57cfc202eff72486a80aa58f27374e1a9f2875a9a487a24deb4
 EBUILD gentoo-sources-4.19.135.ebuild 736 BLAKE2B 291608fc437bdff1340b1e5497a1175ae26993758b002b473a227edabb2c95034d4cc38ce29c845e549ff8a5280ec8df56e7c1493db4c2612902e3eca4f0caa0 SHA512 b3c4020d21ff5f8b87b758d67f541ff7c0c0f8b42f182e00a7f6985cb0d9eb7e9ae825e7b08dd596f7c48641b917568351d8eec782f6f0b25d96b2c504bda7a2
+EBUILD gentoo-sources-4.19.136.ebuild 736 BLAKE2B cb38eeae93ee77ce6df592c3f6babda0c8ed44b57b8201b4d9b224775a3e881687fc78a5aa23133f0d8233b987ad3378b2ee8d3d1542e1018a82aa240a4e1cf8 SHA512 817f55c2f461e63543cdb86dbbc844a3a827c0354db7585c4238334c9d7c1c7aac28944ef603e425bd1bb0053cb77fcc58324bed0ba8c601994f23cb7b60f5f8
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.228.ebuild 730 BLAKE2B e0b5fd63d11f098ee2cd35f92b74c46eec12b5134825bb7c99f9e0a3c6082c34aac36ca40b172048e6c1c93a9ff1bba2abacbe2eb6cb86831c8883ad7e5de129 SHA512 ec14fde115db161fb72b445baaa98a53cc24235813c49990ec0726ec4f21923fa25112c6ea4f68c88c739256bf6a55058bdecdd11573441f476e78e05d1584f7
 EBUILD gentoo-sources-4.4.229.ebuild 736 BLAKE2B 098d95c43bb0cef02351d13f5f94c4e0a059e44937e1ec5dfa7b999d076695b5fabea1b9fac0ba56854480621ce84ff89a771bb5bcb21d23bdc1aa5513a22f80 SHA512 c113f6e8e3f192e9eba4f720f72addbcfd773f9f3ac02daa59d047f64ba79233094492faea634c02af50728d1ca9271996178da009dd165b00917691f17fc9d0
 EBUILD gentoo-sources-4.4.230.ebuild 736 BLAKE2B 1ad2d8ddbffcb41a4392ddececd202c33dc9582c33fbd0b94d03b93e625ed382b2405caaef3d605d59359ab09daead5c6653f6bb89e51b82724171c1c47356c6 SHA512 a6a16b369bb22b3334e0a695391292ce7d5811684a485c07f683c8da418318a8d19e6ff31e54960ca44481d3eb96a9612b97dd8de27fd41a5b76c2c96fb543ab
 EBUILD gentoo-sources-4.4.231.ebuild 736 BLAKE2B 514b91d74db34b7d7145bb61811495b65ad20137b3c4511a5b43e3159c6ebc4bcc2daad3c7f72bde0ee2e86d4f8d495e36e1b726b2a48b239550b2fa930a363c SHA512 d9be2d2f60d187d0189b3bfae322713d7ee4913d16330675aaf71aaf5eaa334eae10ff7783f8e72f424394362600b885e1338b70177b90c4c3b89ce0950625a3
+EBUILD gentoo-sources-4.4.232.ebuild 736 BLAKE2B c40ee5451b9d026358dee16ec82ed009950439a7d7e929f9ed6c1520eac9241d510fb3ac435037c2fef49247fda5ff9e6e49a2da15790cce8e19d1c7cb64aa62 SHA512 88b7a0fe58b6a2c637be24a07a0f34fdc11ccdf73a39c6a3ee93477d334e137ad6771672d1e5b392d060e94f59415bd24ad227e533565e88a825cf1158240db9
 EBUILD gentoo-sources-4.9.221.ebuild 729 BLAKE2B 2f47985d51bd1f16d0fbc8d52c4edf02713ad7b8f47d230a324faddc958767f9fad93accf89c6089ffa268dbec27f61934055446b62603d900fc40814cb9ca29 SHA512 5ddd789e363975fb29927d5567373fdbaf852d324ee55ee2734970cdbb9c8d61c3f23417ab7dfe6b466afd7b12a528712f34b36b4a12e317c3a22bbd1d416f5f
 EBUILD gentoo-sources-4.9.228.ebuild 730 BLAKE2B d22725f48b0aefede033019c7531d8988fd2e5f88d0c7ba9a87c892a4cd3ed2033ef02981d36f0af7bb737e335ce8b96adadab2aad7d3fc27ad06e5d6a848450 SHA512 7b0e635a6d2c46910eb8184a4e9b59a56a272ccb6a68943b0dfdac4e254874b9a05700137576c243e670b8335d9d39747d1e28b961c12426893e35bf63dd60d8
 EBUILD gentoo-sources-4.9.229.ebuild 736 BLAKE2B c40ee5451b9d026358dee16ec82ed009950439a7d7e929f9ed6c1520eac9241d510fb3ac435037c2fef49247fda5ff9e6e49a2da15790cce8e19d1c7cb64aa62 SHA512 88b7a0fe58b6a2c637be24a07a0f34fdc11ccdf73a39c6a3ee93477d334e137ad6771672d1e5b392d060e94f59415bd24ad227e533565e88a825cf1158240db9
 EBUILD gentoo-sources-4.9.230.ebuild 736 BLAKE2B 9defc311a0836787565bdcb96aa2b1fd74ff9dc6ee1c6122b68591fe3415cabe429bf89cbe2b826bf03be56da1bc7351418ad00ea8cc329ed0192b7aec55474b SHA512 fe6cac5fc58ba492de3e5c3d54196314d101a03ac175336c8b67864921c83c4f4846610dffc138444b44f76f64ec1deb7324ad7fc034a8443802502291832455
 EBUILD gentoo-sources-4.9.231.ebuild 736 BLAKE2B ee36b3b82766df47b170dff005c048e8a6e98e5f2196a6000b2861fa0247f39842e2933ec9db09c9ccf1beec568f0aa9cafebc8620ab59fd65a79e60a058aaf7 SHA512 88c4962fb77cb003b1a4996dee0d5a0f220574d8cc981e68b79eb850086e67a3fab693ab7b942c9effffc044012c2fdb546435be77bb40347dbaea8a1d6b574b
+EBUILD gentoo-sources-4.9.232.ebuild 736 BLAKE2B 9215adad10c213fccd2fb16c96ec4dab78fff787b158ae46304868a91b7f27de031b688bd3dcd0733c8e0958b9d2d5cb3849914eaf544a87aa31a6fe458767fb SHA512 d1bb42bc41f885baa747213122569e93e0b351e291cee6d0e1bed9c038b0886d8adccb110f7893b65a4006e218cf90290713591847c3b03fb8c9430fd11be510
 EBUILD gentoo-sources-5.4.38.ebuild 728 BLAKE2B 6546a7a7b36a8947452844ff1b1fe0accaa15f75b298a3067c8d01ca88da2dcb376806918ad69d15b000b8d42078f2d49d5601d1e3a866f8fe540cb233c3f46a SHA512 a2e7a90ed18991b3e9bd610b6427a801a7df65b03d165d6addb51a3400c97fa392f6e4c07e7ac86bcee01825db3b120bd112d36a056c3d26a551dc3278a83bf4
 EBUILD gentoo-sources-5.4.48.ebuild 728 BLAKE2B a8d098b32c0b6ed06bee0fbbdc62e75f58b103363fd4d231649ae056e63f34a5046b3229040190c8dd572d7757851b22e00e53f843730e6d5c85810c63ef259a SHA512 32446c128a7aebb8ab043ba8dd668d1ba869970082cfc5451d6bd93d8b818783dc2e14718c838cce3a4f510bb7bcaeb08ed426290fd118a55f96cdfd8cdf08df
 EBUILD gentoo-sources-5.4.52.ebuild 735 BLAKE2B 7d90dc1c9036cb73b8c95ac0ed897bf4e66b5ab109a0549949841c2b27651cc1520c91c00c5fe329dab4954d9acdb69ecc5b6d876ae65c421fd6447358f3c4ca SHA512 2ef97344936166a41466b44167edd7abdd0ee22e62e54639d008b1d2adbf30838e44e8a2847b93c18166d7256e1b5fa732ca163c39dd4982fec4d1a171d34bf6
 EBUILD gentoo-sources-5.4.53.ebuild 735 BLAKE2B d37fcac201cdaa366483be0ef4e5587932db083232c72b21ed0561c94af77ca7dd51cb0b0938b46c56f7cda78912f57191efb37bc214b415d069101afd4a19d4 SHA512 cf9e5ae60a0e87246aa9cb527af7938da218e219feb9b1f8a078b0a74bac9455ce5d8f52661f213c2d67382d73c9867806c9f62b24967fb095aa47eb16187c84
 EBUILD gentoo-sources-5.4.54.ebuild 735 BLAKE2B 8a54c850c598079c7c40a6eb985af2e1f7b3f43698b309d8e2ef0635f51206878d295d90e0f7f30b8402882bcdfaaee0954ccb12a2d72779ccdbe95b1f957995 SHA512 ab13d9a53b62bec423cf6e103c3e2a49d6a427158b06ae55eb45c030e74f6fd0212aec20ec5f98a2041e2c42c2a48f3762adb139a7dc8b8bb8b338bbb3c02c82
+EBUILD gentoo-sources-5.4.55.ebuild 735 BLAKE2B 6f04eefea9356daf6cc196d51266915c4a3cf50f7a099a5d4e2d424ee12d56cc21047d664aa99d522c55d79e0b9b2828ce76366393b4447296960d3c05f5cb78 SHA512 a19ba2dc3bcd8874048e0b87c60ef0031f0d85d00cd6f40deecaa31091f62403e7e7ffb25d93f49549f216d7875837e3e81a45f7b1001ce8bd48b310fe71ef10
 EBUILD gentoo-sources-5.7.10.ebuild 735 BLAKE2B c1fa9fc96f79777419b7c3989ff2d04a217c4eda7c5f3709e63258e9bf00eba1d33ef8c866dd0609cfecef769f9656f651a72ccdd801ab7f597005f6fd4edbe0 SHA512 d0532b0f6dfd6e596520cd10928289dbf080183e8ba387717f58deed9c4d741c85b8fe772ba7ccbf862e199727ffdc4f63e825cdb95d1dc5e65d11c7c6deccd1
 EBUILD gentoo-sources-5.7.11.ebuild 735 BLAKE2B 07f85b3f10c5672309f71378fe3e8f63009000aaf5fed2ee7920ae09884f03fb69fe5ce70ef193b2e97563c5e69cdf81c9459b86e1a0f53005b02e1b6045af61 SHA512 b6ab9ad0a6813678aaa7cba37783d06885a0a1e221bd66a4f5a514486b4d23100941d07e5fe06ec93c3ca2c98c55e670028675430597f6899c086e4457ea056e
+EBUILD gentoo-sources-5.7.12.ebuild 735 BLAKE2B ca4969bd3812fa181b282d913834d910d0f194ae5964c641f1a7657fd15c97dd1e749f5a0712c7ba20e3f16127b864ddc949ee860009a31776dd86d7e383a492 SHA512 1f2cf508c1e5662dc3f432b6ae17abef9e312beaec92660c1cb0e54da3dc625c2934099649632e835f84350cbf5c848c67b291fa4cd342b65f636902dcf6b4e1
 EBUILD gentoo-sources-5.7.8.ebuild 734 BLAKE2B a7ad4915d3a0c8ca61d2ffbbfa4609cc0c4c34c4caee6337e3f0264d6e12e2509b52d2c8df5364442970361f672789bf46e2da384366abb3af2a845f49e06c3e SHA512 64b716182622504fe4c5743ca3b036c3c4cfd6752eada73b9297a9bf1ba40dd363214ff0c61fef58a672b09ac3c1da7f75306dcafa292cc9a1f905abf20236cb
 EBUILD gentoo-sources-5.7.9.ebuild 735 BLAKE2B a4c81e4c51e567f272c4dc12e6311280480989115ffd545e64ce14a8d958f41b1537d42cfa9b619e349fde65595ea056b0111525f750145dfeb0e3afb11705e6 SHA512 95c165ed8521e66dbe01acf16b7b61ef3b88ea980ba5e64b60855d06a0bcdc1a4ad6c5d0bdbe230031ae7d421681b3cfdfd17046f1ca8379c4895efed13d80dc
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.191.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.191.ebuild
new file mode 100644
index 000000000000..1b961f5337c9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.191.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="201"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.136.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.136.ebuild
new file mode 100644
index 000000000000..3276c4c83ac6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.136.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="135"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.232.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.232.ebuild
new file mode 100644
index 000000000000..1c7355749754
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.232.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="233"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.232.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.232.ebuild
new file mode 100644
index 000000000000..171c05d734e4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.232.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="236"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.55.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.55.ebuild
new file mode 100644
index 000000000000..be392e52acca
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.55.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="56"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.7.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.12.ebuild
new file mode 100644
index 000000000000..fea2b7a2ad81
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="13"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 79d10f59cd14..852dda0cd968 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -7,11 +7,15 @@ DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c
 DIST linux-5.4.40.tar.xz 109535980 BLAKE2B 4857f032d5333f3c16f0947f51d6fe632527cfd78e6c556b62f5356848ef3280244eef7ffaaa136589b10e151aad3087593f3518fd0fc6958d4647b786401169 SHA512 c8785d30f7b88f3a6e565789974ecf1a055900ab4b66e358070547506aecab57b5d34afb77140cb2aeb803498c407d34f7fc11c29fbba00f6d4dedea8dd8788a
 DIST linux-5.4.52.tar.xz 109563772 BLAKE2B 32995d32bfc9ee5d6a5669941897890fc765765f8a141740486f4ad6000fcdd4e4c7f3e9c8fdc7357fba70947cce99d493e8657321c0c836c4930075eacec7eb SHA512 ed0eac6cc07f9e3bc455c82f1594fb0a5310430d3abc3cc2058e1c75af7608aa1b6f70790573873d7e9e4fafdd17cd0bdd5624c6eed5d51dd1da12a873d78a8e
 DIST linux-5.4.53.tar.xz 109574076 BLAKE2B 3e15c19449149415e560cf2b602fec20d60d2b35187283edb4421e4909c3fc8d9c734eba60e7fcca6f3694feb95246cb7295b57e96773fc8d69b8a5ef14e55be SHA512 bf0c0164969ffe52792c15d24f630cb33cee60801252fb6e45b751f5cf6cf807dc8c97c77caff6fdc53d754b87715f27779978f0f5ecfb83836f9a8342f21615
+DIST linux-5.4.55.tar.xz 109570356 BLAKE2B 87ae06ef810727428acd8d7b823309c71b36d6cbf4614e3230d632aecc74bfc45cc7b363a77062f26073dae3d5199200908e21a64e276bfaa66e71648a3c91fe SHA512 6ce15984395698b28932ab1d66165e491588fd924e4880e4dca2c5665b636fb271b8028dd23354b81640ce7e12989807a71360144cb87708b7f239e021b2b56c
 DIST linux-5.7.10.tar.xz 112722840 BLAKE2B 5b76a6b99ea0b1e38278db62951147edd2f0dcbc7c28d6fbf955beaa25344c62ee5b4d8c1c80e9e980a44d77b31dfc152b7e1d0fe0e57f5968f25b0d8a6d2dca SHA512 9568f87d593ae56dee4c7b8594f495a9c971558a3c73de8bb27336877bd5e71500ec08d880c5854e52ce338775bb9c30a98c1b9cdb789dbedba95bd3d86362ca
+DIST linux-5.7.12.tar.xz 112734632 BLAKE2B fb8f51e370f420a6f18329945addb05df3c264d06bcd7f03b6a9582ab2a13f843cd3ce99f6ce39546f882775ef473f335185ea54f38aab03e8956ae946f1e28f SHA512 8630936f2ea67fa4eaeea759f91dd71e35c294947ae6f71953ac3d99e5f93971f8c2b9e0eb18b09a35a3993e7ef648ca17160600aa07ea24f3beed44f3ed5a75
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD vanilla-kernel-5.4.40.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.4.52.ebuild 1870 BLAKE2B 7cf840af250a2ed65c0dcfed9753b5f6825c963fbe38e95323bf3895083a90232904ecf5fa76b34f757a2931bc1a26e8891cdd9841b6aa537fe75d3efb5df10e SHA512 0cfe61e4da8892959c1a389ebf37c9bcdcabdfa7e424bbb84d98a8730b9bfd950f8049589f4915c7afbb2d9d348582497c1efa5ec2b95aa3182969f14401a036
 EBUILD vanilla-kernel-5.4.53.ebuild 1870 BLAKE2B 7cf840af250a2ed65c0dcfed9753b5f6825c963fbe38e95323bf3895083a90232904ecf5fa76b34f757a2931bc1a26e8891cdd9841b6aa537fe75d3efb5df10e SHA512 0cfe61e4da8892959c1a389ebf37c9bcdcabdfa7e424bbb84d98a8730b9bfd950f8049589f4915c7afbb2d9d348582497c1efa5ec2b95aa3182969f14401a036
+EBUILD vanilla-kernel-5.4.55.ebuild 1870 BLAKE2B 7cf840af250a2ed65c0dcfed9753b5f6825c963fbe38e95323bf3895083a90232904ecf5fa76b34f757a2931bc1a26e8891cdd9841b6aa537fe75d3efb5df10e SHA512 0cfe61e4da8892959c1a389ebf37c9bcdcabdfa7e424bbb84d98a8730b9bfd950f8049589f4915c7afbb2d9d348582497c1efa5ec2b95aa3182969f14401a036
 EBUILD vanilla-kernel-5.7.10.ebuild 1904 BLAKE2B c9b79828a629481941919526dfc01415360a769f7b62196f8636adccd8063abba0f9a168a1f7511975e9f4da22bd3d614175004155e1e6f86729aea1c1cf9926 SHA512 82ea44db216e918c552254a85fe2d45f7cad66d7381548ee2f4540c5dd87207cbf58985993f34adf2cebb5ed5d35b9c53e0541be7aa965469707e9d9c9afc921
+EBUILD vanilla-kernel-5.7.12.ebuild 1904 BLAKE2B c9b79828a629481941919526dfc01415360a769f7b62196f8636adccd8063abba0f9a168a1f7511975e9f4da22bd3d614175004155e1e6f86729aea1c1cf9926 SHA512 82ea44db216e918c552254a85fe2d45f7cad66d7381548ee2f4540c5dd87207cbf58985993f34adf2cebb5ed5d35b9c53e0541be7aa965469707e9d9c9afc921
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild
new file mode 100644
index 000000000000..751244a438b1
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.55.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild
new file mode 100644
index 000000000000..079fc98c2af1
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.12.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.7.8
+CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 04d5946c5982..21ae8bd5a18d 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,16 +4,16 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
-DIST patch-4.14.190.xz 3774232 BLAKE2B c9785487601d6212912454ae5380865c16b0e211e2a0ce27598e946a48486cf6bd5986e22bb3cc17a1c5ca20a7e6e5258aa8dfe0902f58f249ff1c272de7ee85 SHA512 4498bcd1e06150df44b4faae041f2f4e55193bd190511a75e32fe4733e02562c259cba10e8e55b86f767102ddc1bea7c66d56da95566dd61154a92c44b7428c4
-DIST patch-4.19.135.xz 3269016 BLAKE2B a050e0058a62495d6ee78c72797dff092fc5eb27f6a3bfc2e7b3227869fd255b78feb3b47c8d3be0555a40f8f2f88e769b1a2390519109a69b67288fb82554a6 SHA512 5e69f2a36718f3fd2cc0a75cc7a0d3e67c52692af3c917c97ed248840191900257650e1d3fa0ca49365e071b4b20331dfcaa3cf5d390623af622b416618516a5
-DIST patch-4.4.231.xz 3240736 BLAKE2B 75b0c92171ec12571a704f817c2d020f27dd945b68481936c0d3cd9332cfa44447aa85630f60685805477cee61c8c6ed894b70d5651afea1b8784a28eb0d32f3 SHA512 05884136475aca92e212866908afca8a5fffdfe7d1127fc64a5b60dc638955e92c94509d483d7e603ebdf466d85646083fc7ef468a60b4c096d48d5a38786f81
-DIST patch-4.9.231.xz 3569296 BLAKE2B 295b162a1200c3c252a9a48d374c268f7d98cc932e4709d798456d4cdc62efe084ecc650eac1aa88d7b1075c278433cd371fdd439fe128db204e89f78d74e1eb SHA512 18153594f325d4bb533322e2a418185ad3ecda93227ef75c35a6e04ddf4d5baeda1069abc6377fc59fb0ca80012e184b8a4500dee0bb23a748f74c06dd729843
-DIST patch-5.4.54.xz 1730872 BLAKE2B aa736c718423c7c6f884b9a76fdb1b24ed587d9b2c103c39f312ae1910510f592c43bb41d4273904878f5aa40e907674bc162466f719250ef38923ad896cfde8 SHA512 bd365f01e5aace4fe6322d7ab7d93df93779c1e1520e650d39fd49802dc3554b89c889830d112e19b6ce531d00bcef77f55f4a4d36e5e84224a11a1205e43789
-DIST patch-5.7.11.xz 555888 BLAKE2B 3d353e87d43cddbd6be4e28f2852645f4565fc6bb16e9e30367b0af09cc5a1dbfb49a5b067ef9e9fd9c2709d3422822b8fa2cb99f3f5c175cde43e2317a14b69 SHA512 1200b91a83d43fab4e5b1a6a9f412a6f5bc4facf11a797c4bd98aafca82bd8be8045ee4af4ca4aff0921288c30256a452045b82c07bc55dcf67d6d5a25948bf4
-EBUILD vanilla-sources-4.14.190.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.135.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.4.231.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.9.231.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.54.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.7.11.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+DIST patch-4.14.191.xz 3776372 BLAKE2B dd170473835bbc271b453c212ceb3961dd93f3ce2fa2979658fbe02bb67176760504d02357c213dc30ce1edcea4c7f2a146621a5997975888748be466e0ac7fb SHA512 3a432513b9923a9bd50834b5da925548d23d3c5f12326342c4a5e4897ac0ea90d9b83813ae479a3c276a49c201ca03602b917723c0fd3610de1d6780714714be
+DIST patch-4.19.136.xz 3271180 BLAKE2B 48808d0f09b86e8661358d1baee514e64c0afb20b14cb63f3bf67a70e9899dae9f5af16242feff1a4d27437566acaa8366cbe96693535badf83cf95fc2b287ff SHA512 bf5e5a5b914eb626d7f34ab6fbcca562661a9fce1ba6b5d1bee4543c56921ac3b7da77c8fb25ea8a85712f75ba2db16e9c0faa5a41bc7eb84a66204e00c9fe84
+DIST patch-4.4.232.xz 3248784 BLAKE2B 6e7d45e6cb82a69a0b6478c79c1305182362a254dd4c11405fbec0539aa588c125b27e5fc52b2362ddd040d197aff4b8cd20b4076481ef27765a726bc6a80fc7 SHA512 ea6998c902bcab227dcc75d3c2d96ba48591f74491c5e8d48ca4da55f1cd23a98f9d7ece4bb0f6b2ae59f3aa32e79a27b084c62dea738774f4f86d793b658bbf
+DIST patch-4.9.232.xz 3578076 BLAKE2B a1573d0953607b53fa4cab7246ec38da7d9dd4d45aab7bf8b46b54fc460f57b5de2a423d3fb8784ed1b9d6c753a6d6e7842739d010ac82e009b954f0098fe187 SHA512 4058a3f6dcdd11a89fda652f311a5bdc9d64484a735d334fcb604ef8b71fa9fda373433d14bfc6680065c0143c55d571f20d8bcab078742b5eb3eedb81e27810
+DIST patch-5.4.55.xz 1734156 BLAKE2B 05db55665f5b6a4c94625bbf2ec0ebc45e8fad656894ced8b0fd633862d9c54992716c5a86b364e6cddadb5211e867a94d8599d7fb92d5e66d887ad73f9aff45 SHA512 fe4860d328b1c1c0d663d75937fd73a2e9f3fe1bb956a153f89d9549ccf3b51116091055aa0a379cd35f38ee5e9cc422d29edbcc7413cd0f1f945410bbb5c4a7
+DIST patch-5.7.12.xz 560248 BLAKE2B 31ef37b88285a301287dde83247693e7b08d13f553e80d66f3d035a6eced17e9314b1b24a6c6537f470d4dc9cb734fce893c97a054e8ec7406ae2a50ed1561b6 SHA512 86bbdd23e0ace2273ca03868a3414f943c9e7759945ee2c6c7171acb286e25366137ba4d9a65c89c3dcca12b03e1c32c6e9fdcbd5f6a85a4025ef00ae65a1c28
+EBUILD vanilla-sources-4.14.191.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.136.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.4.232.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.9.232.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.55.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.7.12.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.190.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.191.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.190.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.191.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.135.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.136.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.135.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.136.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.231.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.232.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.231.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.232.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.231.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.232.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.231.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.232.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.54.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.55.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.54.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.55.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.7.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.7.12.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.7.11.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.7.12.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5d51f89e5f70..6b97249f1404 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index a4f01cb6cafe..0f43debaf69f 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,10 +1,12 @@
 DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
+DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
 EBUILD binutils-libs-2.34-r1.ebuild 3694 BLAKE2B 26b6971b41cedd7a9cc13b5782cc845c81117ddda176fe757e2fce315cbcca3c466e080d8bc0a017ad9b763f8efe4871032d33d928d59b116d930396f46042bd SHA512 0e86a001fd345759cec21d20c5e99bedd8111a7704ef9555756e65f4d6aa7e11dbd3cb391e22462d8705afa1363bf2a937e8727d5bc1abeebe8535aff848cdb4
+EBUILD binutils-libs-2.34-r2.ebuild 3572 BLAKE2B f952d9612e34cd837c30e929bbb5a77e304423f01ea0cde86412812fa1b951c61d2f5aa9f720fbefb9ede9b2660251e81de59a36625ad64630ba1bc751b0c9a1 SHA512 8bb277dc39b6177797b98c0f5eb79f9cf116cc682c05e4dbd2ed93f9bebd2c5ba4dcb85df7155a9ca3ed64a25b4b0563e7bba8a1beaa05f7f86fa6baed28581b
 EBUILD binutils-libs-2.35.ebuild 3573 BLAKE2B 23f988a36b4e7334644d5a17efb566140ef430aeee100e235f85470fe9c9a318d6804440f20d4da0858a118128d456ef23434bf08fc5ffe7adff228a02c69a4a SHA512 0d0cd1c97bf4c97aea8905dbd23a964565aaa43358553b282f62bbbc05122a93410d59f3ef06bfdd975e7f4e556d239a5b073b97d3969c4d8bdf5ab03ecc8f42
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
new file mode 100644
index 000000000000..953c5f6dcfa1
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=6
+PATCH_DEV=dilfridge
+
+inherit eutils libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV}"
+IUSE="64-bit-bfd multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_install() {
+	default
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 061b12723743..9e029285c54f 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4553 BLAKE2B 9a9bf2a896846042a74f810493a42d58a35dee3e3597f35767ff96026a15061b25fdc19f635d4df67add497414ec7080ec33b7d41e49581d0290d65a6750ba45 SHA512 1169a5d3e1790c241cb87d3ab219d9c1b4a09806cd6c9207e1d839997235ba2039e9a50d8715c7f651a1e2663cc56d21594f2a931e553627893ce5b6e0223b91
+EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4552 BLAKE2B 5b4130f8f81fa91932b4c814bbbd3b8c3636f881c097463faf2914ecf3d9eab8d741130fe99ace77faf7c4180606f9e0785acdc037c2ca2226f220b925e0fc23 SHA512 b17034bf3dd2596a07c78f523c2ed64329f18086f7d5ee2861793a3484b1c5c6a7c890820ba2e1cb4e64497d88ca39308be84a7751812789fccb16542c1097a5
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4506 BLAKE2B 0f3d65941cad595661d1601af70092150a21ceeeafcf96825caa9b8d4cdef34eb3f9b0eacedf3d55fbf94aad14091b8f50c1aa7c4134ae19e37c7a2bcf853642 SHA512 02b3ac613c225c0b610497bbc003485208f0ca301962f38ab1324ec8f01a192d96c9d7cb17ebcb7c7d45e804eedf4592a5a9338d6eab7cd071ff41eef75f68f2
 EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
 EBUILD compiler-rt-sanitizers-11.0.0_rc1.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
index 7db95db88e48..802b49fc4517 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index e7ae480caa04..ccad62d9bf3f 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.ebuild 2919 BLAKE2B a825944d0aff4da61cbe3c6cd5bdf889f5e0c355e242d073c770d11e63796b47590d984c4a6c5698ab5c8c51da15dc46902541570b0d71783485b1ab6fd94e17 SHA512 e870e15d06886434c0d566fe032248deca36037b6a0e105b775d9f06b3fe36299b1289a02e6cdea54c66fa5fff49be66dee5f06ce0618332f685002c27bbd2dc
+EBUILD compiler-rt-10.0.0.ebuild 2918 BLAKE2B b815aee19b40b970d1331e5e5c71ffe7b9279b900b3392fbfd627b661214f0a6d4e8e4818e24a3a781c2da768f42bba2f44d5e84fadbad7dba669a94bb9132fb SHA512 79b57e3f8af6f135300441670dcba927843182518c070d6767bc3c866a9fdfdd0bcf9be14c4cd5a1d9d51cc592a443c0c02af635942d7e30bf4adef34d558c45
 EBUILD compiler-rt-10.0.1.ebuild 2775 BLAKE2B 216c7c154b0afe7ee0863d05f13b8a4da030bd2f81d2f7bb3960325a9b16da3385aa1f1bd2b091860686a5162cf23bca83a99d378fc5c2804322f3b28eb48579 SHA512 d523f56eb105fda013c775c422564d54545532a991af6ad587fc147a74270b3add6859602df81b6e5fe521d35f725722a788c288f43290bee95255d8c3c4d182
 EBUILD compiler-rt-11.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-11.0.0_rc1.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
index 4ef5302979a3..a4a199c2ed96 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index c1c4cd55280b..9886fecb6ea9 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -2,6 +2,6 @@ AUX libblockdev-2.23-avoid_bashisms.patch 1760 BLAKE2B 37cdc9ca0a002525646f6a9de
 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
 DIST libblockdev-2.24.tar.gz 905838 BLAKE2B dcc31021d72c2a4f92d8f70387537ec409302e85a9bdb338a09449b02318113d40cabf7fc2f6b4aca819400baccba69a9f67a616b30c744cf843eeac785875e4 SHA512 92b7d734ea2cefbb67e626bef369d6785ba2a4bbbf09a4f59345febe977bc32319fb44f38b3c3177b8652abbc1f87b6cc76d41fdd2d70783c1c168049bdcb1d6
 EBUILD libblockdev-2.23-r1.ebuild 2634 BLAKE2B d1260e7a462fa469ef96026b57073f094ba270a50166f59fc4727686946f15cd50cee2bfdace38c763bad4035c25e4496da6a42883227d237a5bc7a1c5d6e655 SHA512 2bd2d27d1e052e906ac3f0ca27a45590d45be55d30e4f7af485fc9580d7dec2235bba49730dddccc7bf6ec46d5df489b15cd9f3d7606fb1deab9a959d033a799
-EBUILD libblockdev-2.24.ebuild 2602 BLAKE2B ca29008c167d0a29cef91f9f79edb3b5d3be46adba210713d2a2022f876e6ed683296d7bbc90159ff49417bd6d629f26c5126b98118c7311b7c85c4373950cde SHA512 42a94be55e00037feb4fd74ca5c0e2641bba26c5aeab0170714d2d4bcfb1cfa76e6743a569f7b82b4b407e4c985ea730d593215e4e920b5c98b2d62154bf19ef
+EBUILD libblockdev-2.24.ebuild 2600 BLAKE2B a8edd6eeb0314b94bdb357a56cccd341a792ef3d2864b998ecf815c14febf4cf0cb19d22dc7755c790ea9f2afceacbc3765378ed9e867448c06b19a738620f0b SHA512 70a64d9aea74d54944eb018e3cfd924d2ca1b17155571ec9c2664eb9035cc0806f68c8a831c8ae690c4c4983c46276a2b3c925d39c50d2e56f5ffb1bd6dc58a9
 EBUILD libblockdev-9999.ebuild 2606 BLAKE2B f4780c6c02ca95eca1a1b8968c0a28741f06e785e7c7f920d8d9b7dd27f29f1f932e07037db6873a872bba840b522d39e85c034a87929515744562892d236ccc SHA512 eb41e982a8e9607fbd0272aced19f3fecce0a35486cc841af45f4b000eadc1551d0a131d7ac1d480747b38ad0be67b23c216be9d959ad19bdc37721580ce2dc2
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
index 0656c5548dbe..2f639b6edef3 100644
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild
@@ -19,7 +19,7 @@ else
 	#MY_P="${PN}-${MY_PV}"
 	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
 	#S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2+"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index bcb36b0f411a..6eb02c14eb40 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -3,7 +3,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxx-10.0.0.ebuild 6081 BLAKE2B 5c08a792f3759c89e82eb6199c19791f26d2782760e607c47d42ddff9f189f2c4d4cab6cf7e55f3696f69e88b9fa68bf6f931c470164257aced734367f5ad889 SHA512 dd63017fed8ad0c708ceef6667f5a969445611c0cd78eefbd9054e29c29ebfec0127d09a5015ec3aabf516b4b01ce935051a744716981ebc45d577e66325f1a1
+EBUILD libcxx-10.0.0.ebuild 6080 BLAKE2B 51e502d81dfd67727be527ed485ed932893cfc321ba49259873dade51218a4278b20941c14a970d995b80e71e0307230ec9a6107bb0b0a8003d92c00ab419834 SHA512 f1c43ea15b0f894586c032813b9ad5cc07f41bf0dce1f84e246212a55aaa40b377819665fed2d46eecafb16f0f138aeeee5903e2925b306253dad5e8571e9068
 EBUILD libcxx-10.0.1.ebuild 5971 BLAKE2B e4d7b88fd26c592fc449c52c367a740bbb83764312b60d5f789fdc0f8cd8068fd07c0873e6079e75556091171988d28a35091a99fa5226df739ccc0bdc526bd2 SHA512 47ee0620bc89d4e5b647b660375eb33c1fd4f74d033df4509c4e35b87a4255639dd1e8e28b6991df3d166610199bc54247a3c904489461fcd2193b294ea04f18
 EBUILD libcxx-11.0.0.9999.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
 EBUILD libcxx-11.0.0_rc1.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
diff --git a/sys-libs/libcxx/libcxx-10.0.0.ebuild b/sys-libs/libcxx/libcxx-10.0.0.ebuild
index e707e720c07a..2fdacef86681 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 89f894c10e64..62a8a9d4215f 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxxabi-10.0.0.ebuild 3391 BLAKE2B 7ecdcdac09b6960492f5327f121de74ff9317805f6b6d97c1b1fc085feb1b76235137ffc7a7f8824f404c3c7b924e905718accc751affba0b35a71cc3ba0740c SHA512 7d1cd07ed877270f2e82e4a6d06b05724a094c7360c786af092895cbeca6668e063b5564046c59999e4a311bc5054604e4dbe67282f439a5324747a0086c0551
+EBUILD libcxxabi-10.0.0.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 EBUILD libcxxabi-10.0.1.ebuild 3242 BLAKE2B 75a91dbc67b0033c9a81479d8a364226b439fc15d72bdfa95b4385b6152645950ad330264c8bf779f1a79e9a1884cc7dc3010f7aa40ac7030f4732015d694243 SHA512 2a3eacc76503381558fae5987481e8a708cef274b388553162f8c2424d1465f1cff6e336bcbebeb4a79377c92236069cc4ddded8c518b394776ed844b315bcec
 EBUILD libcxxabi-11.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
 EBUILD libcxxabi-11.0.0_rc1.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
index 19d80ae0dacd..0812b96e62d8 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index cc26aa870339..638295c2875f 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libomp-10.0.0.ebuild 3014 BLAKE2B ee54cc523774600f1143a2601af7b407843569e080304f9bb3a2c33532eb8c1cf089a9543589a21edf8c141c48c446d4b94a066c39cc2011128af278cd51ee82 SHA512 24959476f293060f6d5215bf5285e2548768b614d4d5a44d5b7b1aa04707d21366dda53afa4c55ae69804490042dada415fc4c2fb66022c08793e703c895256d
+EBUILD libomp-10.0.0.ebuild 3013 BLAKE2B cebd2bde8d98f6b4941f8c5000295424ee995ca2601224ae0ba535ae3fd327065688d481a498953450364b7725d60b4beea386f859660cac70292882365b8d79 SHA512 1938aff720e1e87fa290076f204feab09eaee1ff6152e65466fc1905a7afb03064a51ed39d3653d17ccf06a68344e2662a148d6913f7eb60797ded593146b8be
 EBUILD libomp-10.0.1.ebuild 2898 BLAKE2B d29654544c5fdf2f2a8724d66547c73f4fb1d0292a78c93e2d0ea3a074d4deba7717db2dd7d311e2c26c4d9d92a0c6e031402894a1afe6769017ee3235875b7c SHA512 19faa4324b1e79ec6e116f29aa25d9aef777a410241c572c1610fbaf8f7ceec56267cec1a3ec7ccb2d3e734fca633848c5029b9adcf3640a78368361a2365d3d
 EBUILD libomp-11.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-11.0.0_rc1.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild
index 09535cc0427c..3e9988c75e68 100644
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index ab36a488a777..11e0f74b3221 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,7 +2,7 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-libunwind-10.0.0.ebuild 3357 BLAKE2B 84d38d45171f2bc47c60df38ef33f86c511e5d7583fa3a08c8f1a337642bc99cc1ac48cb8f20ce4d00e9a74b721175bc3ee99042accbbca66f6358a0b665e77b SHA512 978099a90e8a1fee52595060f14a0daca3c25f9c9c8f558cb893cede457fedc4b3bed87c30219e6a70924c83bf4295039da00436760f9b13a1db9ac9d746c719
+EBUILD llvm-libunwind-10.0.0.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 EBUILD llvm-libunwind-10.0.1.ebuild 3190 BLAKE2B 2d61b9d911316c426585e671bdee2644ed205db842d9ae2b19641eb3412ace66721262d378b86f430c5206f67d988b3e6b6cd1d5736e1712639de6d9c5b986e8 SHA512 5dd0f352201601b2ee6d357774266e2e5962f77f888680e51806679645082134d21169eecc5d67687982cf3f1c22c7ee04e2b4aa6dd751d0dfae5ab3adf75bac
 EBUILD llvm-libunwind-11.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
 EBUILD llvm-libunwind-11.0.0_rc1.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
index d881f81fdf3c..782f15e8964f 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index beb3c042df2b..7d980347b404 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,4 @@
 DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
 DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
-EBUILD timezone-data-2020a.ebuild 5134 BLAKE2B bbefd7a68861d2fc2fc2ba573ac0e6546f90c6a3021cce3f86f291ccaf9fce16f0a6a87684046304c8a05931c80d80440807414ca9ff5d553bac2e8261bf6330 SHA512 d110ec4f2eff01b16633a71ab246ab6ff71bb9881676b946643e5cbc7232fa9a6ae15be9f947a07243e47de72451546ccf62e8ddb0c06c316e0c9194a209262d
+EBUILD timezone-data-2020a.ebuild 5200 BLAKE2B 3db29450f1cd759b3cb5cd1c8f45dd8ad4663aad1928c10bd3d81220f650ca76f859e6d220759cffcbde9d36f3e203264ca26793318b69fcb93bbcbabd50387f SHA512 9c2bb39c24a32a282abcaf345ef87f41fcaf8ed878ab6e5a2d814d982c8ffa9bb9b0b8f0081f1a2494e2862a11dc79d6df6e2abda41070cb12743e330c83a505
 MISC metadata.xml 658 BLAKE2B 29b5600fabd796a8f9d284fbff175493a1527e57de2f81934483cadc7a3eb33800cca9d48f0002d8b426383bad1689f1259ea7a9c93fda3fd23deb13ba6d43ce SHA512 c7cf8a401e69d9550a94f8f0649b1096949264434285e085379f92cb6a2d72948a7f771803c665ca166db64e98ddac3aa24834edbb174c0305a1db90bc448d3a
diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild
index e508d234d92f..04def569f2a5 100644
--- a/sys-libs/timezone-data/timezone-data-2020a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls leaps-timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9c7fbe55a7bd..b22b58fe6875 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/cron/Manifest b/virtual/cron/Manifest
index b08ed2c45567..e0ba3e2eadb4 100644
--- a/virtual/cron/Manifest
+++ b/virtual/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0-r1.ebuild 391 BLAKE2B ec5003087b77fadde6fb8fc4596cd2f840cc70c6823d303a1593bf32c12ca29b7e5aae85fbf44b9dc429051bae8cf300d87620ce275cf9464b249ea3a40389e9 SHA512 ab1e6c01c24c223cd9a675356dcb55772b8500f218abbee1a4a94eb546bc5bbe9cf06dac493cd7853ecd6f57f76eca6515f17ede6800838dc52c4919dd89b26b
+EBUILD cron-0-r2.ebuild 366 BLAKE2B 386ffc0e331fc139697907995d3016daf54f09ca2941e65ebbc987b47c4066c46f66d325d9059505409887da6249309c8986d431ed904fba4b2bee35856b8856 SHA512 13e892cb9e88e2ce56fd3a0606a99c62137e21d0f6db149ff371a23f39572893d7539b07ca287ca901a1f14ff63d507747c69243c5568a9af7bbbe9cfbdadd85
 MISC metadata.xml 253 BLAKE2B 1d5af623950024db87f3016a93014ce876894828c8bac85ae8b157f8e2851ca96384c8e195c9693e09e7a76f4fb7033ee466057b930198a6416135eebbb6a8c1 SHA512 66f53c08df7430d7052861b4c483e36d54db4d937be2fd4e3a6135d36992e041aa88d60205b47c3749b54c36925ca4c45c88fa7b44fee283de48ab8aa75b738b
diff --git a/virtual/cron/cron-0-r1.ebuild b/virtual/cron/cron-0-r2.ebuild
similarity index 93%
rename from virtual/cron/cron-0-r1.ebuild
rename to virtual/cron/cron-0-r2.ebuild
index 915fa84fd263..9d5be4ee1061 100644
--- a/virtual/cron/cron-0-r1.ebuild
+++ b/virtual/cron/cron-0-r2.ebuild
@@ -8,7 +8,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="|| ( sys-process/cronie
-		sys-process/vixie-cron
 		sys-process/bcron
 		sys-process/dcron
 		sys-process/fcron
diff --git a/virtual/perl-CPAN-Meta-Requirements/Manifest b/virtual/perl-CPAN-Meta-Requirements/Manifest
index 1b3aa089ce6e..f55fea238dbb 100644
--- a/virtual/perl-CPAN-Meta-Requirements/Manifest
+++ b/virtual/perl-CPAN-Meta-Requirements/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
similarity index 86%
rename from virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
rename to virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
index 6c1e6cc23f97..8765d8b273ad 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-CPAN-Meta-YAML/Manifest b/virtual/perl-CPAN-Meta-YAML/Manifest
index 344344a81bc9..cd373e40772a 100644
--- a/virtual/perl-CPAN-Meta-YAML/Manifest
+++ b/virtual/perl-CPAN-Meta-YAML/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-CPAN-Meta-YAML-0.18.0-r5.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-CPAN-Meta-YAML-0.18.0-r6.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
similarity index 86%
rename from virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild
rename to virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
index 6c1e6cc23f97..8765d8b273ad 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r5.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-CPAN-Meta/Manifest b/virtual/perl-CPAN-Meta/Manifest
index 84ceedf678b5..7042faa9e5bc 100644
--- a/virtual/perl-CPAN-Meta/Manifest
+++ b/virtual/perl-CPAN-Meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-CPAN-Meta-2.150.10-r3.ebuild 681 BLAKE2B 69a84a7e5ddd40defdb732e703f3f5c191e2dedfa08681e14e328f4a81318ab98c6434a9d628f0da17a2d8ce3381c86353f0a710bbc3d4730e978179c928fd89 SHA512 f73c07ace215c371482e4cebf6c9f63f7dc1f20a32fb20bcaf37270f30b4562e6bb6fd36efa186206bfee4e7b8bde876b82fde5fa774caef881d0c468e912d41
+EBUILD perl-CPAN-Meta-2.150.10-r4.ebuild 702 BLAKE2B d60df9ef24a52706de91f07b20f7a5c2f016c86d13ea9cb6ddb0d6a593819079a437ea972fead410263c8ce7bea3f70a9982bbfd21c86c40a251a05b6ffa2253 SHA512 5760932ad413a178c1bb502b73c0e9645dbf2374e3e457f6a18cf9ced16172e81eba7efe43bd7ed56a8c8c4238478dc3ef8ea07c0be1a4b181a6a124dbf76d30
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
similarity index 88%
rename from virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
rename to virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
index e55e40216946..fbb0081b74fa 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r3.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index 2e39d3325359..312d0437602f 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-CPAN-2.220.0.ebuild 409 BLAKE2B f292beb5071b8cbc6d732fffd1519d5c9af755fe941bd3a1f250e03fa60cdccd971206fcd1c386407f359647cb43fca24e233ec8a1829268a06f813e40b5ad84 SHA512 33203b8c0c2a02ee79054affa4fa44af520d777c582f49b572e5e18ba6b6f2a972b5871b6423784bdf809827a94965c49347628a145bb7e89cb3967e6953cd78
+EBUILD perl-CPAN-2.270.0.ebuild 418 BLAKE2B 51d9fd3417e226a91d6d1fc343a614f662d5de6b9f6df5e046236cc7b7ac6c9671bdbd46af1067bc0970074565d867ec8b1077fa850127ee9be10e13b059a053 SHA512 c8a6b79ffec0da8490812d31bdcd8b1606cb65fd2711186f74e48c1b9ad80a5a89a2c196bc9992d8483c687ad5006e27b14d1b064660d49d75f194b51ded8dd9
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild
new file mode 100644
index 000000000000..3e7b88be17e3
--- /dev/null
+++ b/virtual/perl-CPAN/perl-CPAN-2.270.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index ea4c428bdb09..604a5d6aedce 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Compress-Raw-Zlib-2.93.0.ebuild 560 BLAKE2B 0064b70a3d45aebe396eb503695d83819e330e6648814606ebca35e94c7782507bda3f2fbb4d6e6adfdcea92de0bc3df1945e85ecd8442696592905577504a9c SHA512 d3f9ed8e6af3e299de295ff6926c01437d40590c78c1710948b70c2b6d2e16c29cab40549c9f17324f770545fa205a9905487280ef5a9236789db15af610005b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild
new file mode 100644
index 000000000000..51faf24eb1bc
--- /dev/null
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.93.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-DB_File/Manifest b/virtual/perl-DB_File/Manifest
index cab56233a29d..1f2a2b0f77c4 100644
--- a/virtual/perl-DB_File/Manifest
+++ b/virtual/perl-DB_File/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-DB_File-1.843.0.ebuild 452 BLAKE2B 3fc5dc83695c9e41853bf18828f2ba1739025ffe3bff9246b31f65d64bbe251c36a2fc3bcdd743728130f6010c46feac4b07833f916dcd15c35cb6ab06bc7a02 SHA512 cbcb732d4f400fbe29e72325241a6f0daec90aebaedb03979858080135402b5b558d995174e598c35c6511014df163802a105eef80ec46dfc0aadb6f508909ae
+EBUILD perl-DB_File-1.853.0.ebuild 461 BLAKE2B 856e32641c5834a8fa868ea1a9b8bb5f2b7e86782399dedf7b3e62816cf65fdd677367d41112bcbb2333a5b360fd3ca6662ca12505b03d6a4f7c6b1ba86dba64 SHA512 593935693ed1b3b9c6b121cbaa9b153fe76cccf3d8234b8706a3d90b173d053011571aa5f1af43536a516a8c2faa712b8d25f12ec12ebcd200b549a2fc61c949
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild
new file mode 100644
index 000000000000..d62ff86dfb02
--- /dev/null
+++ b/virtual/perl-DB_File/perl-DB_File-1.853.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32*[berkdb] ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index c7644d9d9df1..14c5cd4a5e6b 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Data-Dumper-2.174.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Data-Dumper-2.174.0-r1.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild
similarity index 86%
rename from virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild
rename to virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild
index 6c1e6cc23f97..8765d8b273ad 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r5.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r1.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index c24f768bad5d..46bd971b5041 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Devel-PPPort-3.520.0.ebuild 544 BLAKE2B 4d77e258f7d35ab7003cbe1c7126ad93a215c3d1dceaa6a28b32526251cfaf3faf19abd7cca41a783c5afc5930d8a4deba344c9ffe4cf54ca3d7ea98485db23f SHA512 9acb32583fb450c271fbdbabaa9f1bf9556191792900005cbbd31f1e81c3b9d3a31b966513542dbe3321c3c00b18782d9c4a11dfdb9f31981809719ba7dabcc9
+EBUILD perl-Devel-PPPort-3.570.0.ebuild 553 BLAKE2B 8a9d12319f46260204d53e10940e1b615ffa1e48fb022ab7606beefb289a04163e3ffd62c44ee4786fbe0dbb136e42db676fccb085e8aa7bb445b7fa7d547d56 SHA512 76fcd99a678af7e695335fbea600de22facc394c1bd208b4cdfe4379a359a99685b8ca99da4269d661127c5ad972e91bc85f54d2a7d4d1b913adee969820e746
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild
new file mode 100644
index 000000000000..9f390c5765f8
--- /dev/null
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.570.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest-MD5/Manifest b/virtual/perl-Digest-MD5/Manifest
index cff1fff6587f..8466a7f922f8 100644
--- a/virtual/perl-Digest-MD5/Manifest
+++ b/virtual/perl-Digest-MD5/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Digest-MD5-2.550.0-r2.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Digest-MD5-2.550.100_rc.ebuild 560 BLAKE2B 0064b70a3d45aebe396eb503695d83819e330e6648814606ebca35e94c7782507bda3f2fbb4d6e6adfdcea92de0bc3df1945e85ecd8442696592905577504a9c SHA512 d3f9ed8e6af3e299de295ff6926c01437d40590c78c1710948b70c2b6d2e16c29cab40549c9f17324f770545fa205a9905487280ef5a9236789db15af610005b
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild
new file mode 100644
index 000000000000..51faf24eb1bc
--- /dev/null
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.100_rc.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest-SHA/Manifest b/virtual/perl-Digest-SHA/Manifest
index 28e105defb41..d9696b79327e 100644
--- a/virtual/perl-Digest-SHA/Manifest
+++ b/virtual/perl-Digest-SHA/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Digest-SHA-6.20.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Digest-SHA-6.20.0-r1.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
similarity index 86%
rename from virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild
rename to virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
index 6c1e6cc23f97..8765d8b273ad 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
@@ -8,7 +8,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-Digest/Manifest b/virtual/perl-Digest/Manifest
index ab8237b11117..5f77cb1413cf 100644
--- a/virtual/perl-Digest/Manifest
+++ b/virtual/perl-Digest/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-Digest-1.170.100_rc-r9.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Digest-1.170.100_rc-r10.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
new file mode 100644
index 000000000000..8765d8b273ad
--- /dev/null
+++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-Dumpvalue/Manifest b/virtual/perl-Dumpvalue/Manifest
index e0cc32623bff..f05b9603bf45 100644
--- a/virtual/perl-Dumpvalue/Manifest
+++ b/virtual/perl-Dumpvalue/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Dumpvalue-1.180.0-r5.ebuild 409 BLAKE2B f292beb5071b8cbc6d732fffd1519d5c9af755fe941bd3a1f250e03fa60cdccd971206fcd1c386407f359647cb43fca24e233ec8a1829268a06f813e40b5ad84 SHA512 33203b8c0c2a02ee79054affa4fa44af520d777c582f49b572e5e18ba6b6f2a972b5871b6423784bdf809827a94965c49347628a145bb7e89cb3967e6953cd78
+EBUILD perl-Dumpvalue-1.210.0.ebuild 418 BLAKE2B 51d9fd3417e226a91d6d1fc343a614f662d5de6b9f6df5e046236cc7b7ac6c9671bdbd46af1067bc0970074565d867ec8b1077fa850127ee9be10e13b059a053 SHA512 c8a6b79ffec0da8490812d31bdcd8b1606cb65fd2711186f74e48c1b9ad80a5a89a2c196bc9992d8483c687ad5006e27b14d1b064660d49d75f194b51ded8dd9
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.210.0.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.210.0.ebuild
new file mode 100644
index 000000000000..3e7b88be17e3
--- /dev/null
+++ b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.210.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index b11cb5f10b14..94fd2c5badda 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Encode-3.10.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Encode-3.60.0.ebuild 560 BLAKE2B 6867eaeca2f34369965d5450a51bb7c39996b3ac75e117793ab5e56f3d4e208ed16bb71a62476d89d46193f8aa8a5845e2de6758e5f53c607abaed9c96d05bfb SHA512 136ddb243e839274100b967bfce86053844ecfd461dfaf6e8651f6214f59554ce95cb3ed71f0370e3b968029cb460a43222a8e4fe687265061e6053d04f76205
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/virtual/perl-Encode/perl-Encode-3.60.0.ebuild
similarity index 59%
rename from app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
rename to virtual/perl-Encode/perl-Encode-3.60.0.ebuild
index babee4ae5969..759d8cbe316c 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.60.0.ebuild
@@ -3,17 +3,13 @@
 
 EAPI=7
 
-DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
+DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
 
-RDEPEND="app-admin/eselect"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vi.eselect
-}
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 21f4ffbf9e62..d0d49ff1a67f 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Exporter-5.730.0-r2.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-Exporter-5.740.0.ebuild 560 BLAKE2B 6867eaeca2f34369965d5450a51bb7c39996b3ac75e117793ab5e56f3d4e208ed16bb71a62476d89d46193f8aa8a5845e2de6758e5f53c607abaed9c96d05bfb SHA512 136ddb243e839274100b967bfce86053844ecfd461dfaf6e8651f6214f59554ce95cb3ed71f0370e3b968029cb460a43222a8e4fe687265061e6053d04f76205
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild
new file mode 100644
index 000000000000..759d8cbe316c
--- /dev/null
+++ b/virtual/perl-Exporter/perl-Exporter-5.740.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index afaf0de2d01e..a8766454519f 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-ExtUtils-CBuilder-0.280.231.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-ExtUtils-CBuilder-0.280.234.ebuild 560 BLAKE2B 6867eaeca2f34369965d5450a51bb7c39996b3ac75e117793ab5e56f3d4e208ed16bb71a62476d89d46193f8aa8a5845e2de6758e5f53c607abaed9c96d05bfb SHA512 136ddb243e839274100b967bfce86053844ecfd461dfaf6e8651f6214f59554ce95cb3ed71f0370e3b968029cb460a43222a8e4fe687265061e6053d04f76205
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild
new file mode 100644
index 000000000000..759d8cbe316c
--- /dev/null
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.234.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Constant/Manifest b/virtual/perl-ExtUtils-Constant/Manifest
index cfb169d4aebc..b08f6ed99649 100644
--- a/virtual/perl-ExtUtils-Constant/Manifest
+++ b/virtual/perl-ExtUtils-Constant/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-ExtUtils-Constant-0.250.0-r2.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-ExtUtils-Constant-0.250.0-r3.ebuild 572 BLAKE2B 4e02d07e2d9ea234ea27488c5917fe77e3df82ad09b490ea897f1fc4ad95aff81a248488a67c4bc962cd873b13ef77d10963e94a03d245473abeac91c66ff976 SHA512 0b56ce664d63051456e871cee6aeb49b556e8dc1d7b55849098e879d9626dc5896b2042e78fdce3956badda39757d9eb1405c70a268ad0a1ae15fce8b5faadb2
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
new file mode 100644
index 000000000000..8765d8b273ad
--- /dev/null
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Install/Manifest b/virtual/perl-ExtUtils-Install/Manifest
index e22dc4a2f2f0..9a3ce6e68173 100644
--- a/virtual/perl-ExtUtils-Install/Manifest
+++ b/virtual/perl-ExtUtils-Install/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-ExtUtils-Install-2.140.0-r2.ebuild 556 BLAKE2B ab63870653baf1e461107cf4a2e7a256118d97bdc86ac896cadff381fc5ca512179fe4226ef5bf57b8ede9039a54a079d25f3d3c25f49a3973c94dace66c9fcf SHA512 ab078665fa829f0b843cd6f8081ff04ca7a60c512323a91b880dad3507923816e6df75da970ba4ffd095528992f490a55f3b44dc29a5bd6d81cf9ac7e73a5fd1
+EBUILD perl-ExtUtils-Install-2.140.0-r3.ebuild 577 BLAKE2B 3bd4d4e5770cfce335b62bd0ad86578c8596091fcfa2eb51de33bb5e1a2abe88e364fe1a3c389963b2737f05b3550bd5f5bdd7d07ab6119f913c3a8181ee2722 SHA512 e3f4ac151502849177a026c6ab4eda0ace5c1d219038a566257aea261767a812d2fcc1159914f9eeedca364a83fd3d6fb274d3638c47aad8f5ee5a49a60d7f5f
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
similarity index 85%
rename from virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
rename to virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
index e90a5abcb130..729d8f81a8cb 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Virtual for ExtUtils-Install"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
 
 RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 627dc218fa5a..419b856c3383 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-ExtUtils-MakeMaker-7.440.0.ebuild 560 BLAKE2B 6867eaeca2f34369965d5450a51bb7c39996b3ac75e117793ab5e56f3d4e208ed16bb71a62476d89d46193f8aa8a5845e2de6758e5f53c607abaed9c96d05bfb SHA512 136ddb243e839274100b967bfce86053844ecfd461dfaf6e8651f6214f59554ce95cb3ed71f0370e3b968029cb460a43222a8e4fe687265061e6053d04f76205
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild
new file mode 100644
index 000000000000..759d8cbe316c
--- /dev/null
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.440.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Manifest/Manifest b/virtual/perl-ExtUtils-Manifest/Manifest
index 8b60f2c64029..448233fceab5 100644
--- a/virtual/perl-ExtUtils-Manifest/Manifest
+++ b/virtual/perl-ExtUtils-Manifest/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-ExtUtils-Manifest-1.720.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-ExtUtils-Manifest-1.720.0-r1.ebuild 572 BLAKE2B 7d8946eeaf08ad5ee59df67d65048f1d0858f5f5bfd6782e6bdccb966d8a10b21cbd638e39c6d02f57248d18b685f28b73e7530dc65d29ba1df18e044d500d49 SHA512 9bcf8313fe20acfc3d798aebf49e2fb71f2a735d29af8dbf9926a1bfbddfc31cc546243638fda639e62462352b918f77780ca66c672458696f3c2fc59ff02790
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
new file mode 100644
index 000000000000..53b8d6439751
--- /dev/null
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index 39992b12ba32..c44f31d942f7 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-ExtUtils-ParseXS-3.400.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-ExtUtils-ParseXS-3.400.0-r1.ebuild 572 BLAKE2B 7d8946eeaf08ad5ee59df67d65048f1d0858f5f5bfd6782e6bdccb966d8a10b21cbd638e39c6d02f57248d18b685f28b73e7530dc65d29ba1df18e044d500d49 SHA512 9bcf8313fe20acfc3d798aebf49e2fb71f2a735d29af8dbf9926a1bfbddfc31cc546243638fda639e62462352b918f77780ca66c672458696f3c2fc59ff02790
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
new file mode 100644
index 000000000000..53b8d6439751
--- /dev/null
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index a1f428063fd4..767db1804ddd 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-File-Path-2.160.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-File-Path-2.160.0-r1.ebuild 572 BLAKE2B 7d8946eeaf08ad5ee59df67d65048f1d0858f5f5bfd6782e6bdccb966d8a10b21cbd638e39c6d02f57248d18b685f28b73e7530dc65d29ba1df18e044d500d49 SHA512 9bcf8313fe20acfc3d798aebf49e2fb71f2a735d29af8dbf9926a1bfbddfc31cc546243638fda639e62462352b918f77780ca66c672458696f3c2fc59ff02790
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild b/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
new file mode 100644
index 000000000000..53b8d6439751
--- /dev/null
+++ b/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-File-Path/perl-File-Path-2.160.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 340485b656c3..32e41208ec30 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-File-Spec-3.780.0.ebuild 551 BLAKE2B bd7d7f40d70654f4e26e2872b74094b7b824771f8204ad3ffd6bea9a02b86941fd00fa5292daa4616c225aafcc73d1efadd0d3ebdadc2fbd696d895610de2557 SHA512 d50dc79ebe573898034c6d250f7eb9cf481e0b07739193d5ff03ecb51757aef47e0beedec1fc98e556fee628c679e5308d0985897a1feaacaf2a7fac9be31de2
+EBUILD perl-File-Spec-3.780.0-r1.ebuild 572 BLAKE2B 7d8946eeaf08ad5ee59df67d65048f1d0858f5f5bfd6782e6bdccb966d8a10b21cbd638e39c6d02f57248d18b685f28b73e7530dc65d29ba1df18e044d500d49 SHA512 9bcf8313fe20acfc3d798aebf49e2fb71f2a735d29af8dbf9926a1bfbddfc31cc546243638fda639e62462352b918f77780ca66c672458696f3c2fc59ff02790
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
new file mode 100644
index 000000000000..53b8d6439751
--- /dev/null
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild
deleted file mode 100644
index 6c1e6cc23f97..000000000000
--- a/virtual/perl-File-Spec/perl-File-Spec-3.780.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-
-RDEPEND="
-	|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
-	dev-lang/perl:=
-	!<perl-core/${PN#perl-}-${PV}
-	!>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-File-Temp/Manifest b/virtual/perl-File-Temp/Manifest
index 78e9f4e7a9c9..943575bba9ee 100644
--- a/virtual/perl-File-Temp/Manifest
+++ b/virtual/perl-File-Temp/Manifest
@@ -1,2 +1,2 @@
-EBUILD perl-File-Temp-0.230.900.ebuild 529 BLAKE2B 30ced260a1274865478eede6aac2f0f2c610d192986c1a5f27b69464b08389a024abcc6af9bb736812898dc1dc4b81f0c81d3fd42b9ca9f5098326e71f593254 SHA512 77630082a1c5d7ce46bf3559fe4f1c9835b8d353315353c6f30a38add5427abcaed2eafe11d27a887405414924d816467870d3dd4bca8767f01ba9256413d722
+EBUILD perl-File-Temp-0.230.900.ebuild 552 BLAKE2B e4b8bc451dc99dee995ad86272300f574db51058b62cef97a93e1489eca517c9f0e13888b6c591e2f7674c7801595f96603c08a4290ca4636cb9fa6b02888757 SHA512 98ea060d4127ebdb017bf76a1b303f6a136b1ebcac9cf5ba0ac2f32823fd2baf373365422831ce53b0f5c391cc2c26afcc98389cf9aa69428a56f9e21fe9bbda
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
index 0a50c3ac727e..f5923ef2fda4 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
@@ -12,4 +12,4 @@ RDEPEND="
 	dev-lang/perl:=
 "
 
-# this is the dev-lang/perl-5.30 version but we need the security patch
+# this is the dev-lang/perl-5.30 and dev-lang/perl-5.32 version but we need the security patch
diff --git a/virtual/perl-Filter-Simple/Manifest b/virtual/perl-Filter-Simple/Manifest
index 39b7be3c41bd..0099e9a83b53 100644
--- a/virtual/perl-Filter-Simple/Manifest
+++ b/virtual/perl-Filter-Simple/Manifest
@@ -1,2 +1,3 @@
 EBUILD perl-Filter-Simple-0.950.0-r2.ebuild 556 BLAKE2B 26c03e1d510b8161ed430c92e00f3b344e118b1e823a5494568ec259a7bdfc47b4048645d17f9c31fae3e62c9c8ef77dbe306604f58e2c902f906a1675ebf5cd SHA512 ab9c3127389008c32a7673dfd68906d59963e9c6f8598ce15c55c564b69b8c53a977e2740ae799d09e4f4fe3c408f739bc8c6d9919465c261e2c910431aad8bc
+EBUILD perl-Filter-Simple-0.960.0.ebuild 565 BLAKE2B 432699c5a60c25d0018a2f0fdae51cbc1a3d06b1f8c72f04b68c4270e30a905debc3578e573e9065c6d0a172839de0c2f41bc08e09ecdcb43fdaaedaf5139d26 SHA512 ae8b96ba3c1c14c2f3be628d6f4307140eb8c0e5aae91f04ad225d3e82a7f122563c5ae654088be7a49f1f30912e322fe5e6f175702e613a5042a1a0dfecf62e
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.960.0.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.960.0.ebuild
new file mode 100644
index 000000000000..8d5d7457ef36
--- /dev/null
+++ b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.960.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for perl-core/Filter-Simple"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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"
+
+RDEPEND="
+	|| ( =dev-lang/perl-5.32* ~perl-core/${PN#perl-}-${PV} )
+	dev-lang/perl:=
+	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/python-backports_abc/Manifest b/virtual/python-backports_abc/Manifest
deleted file mode 100644
index 73752ca1e9ac..000000000000
--- a/virtual/python-backports_abc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-backports_abc-0.ebuild 484 BLAKE2B dba25ba1b5596a5a78a64356947b77fbeca0313d0bd8ae8921f3f1389e90f885ec287653ba2217f9a3dd1bf7294fe0dad98a30cf9ef6cee1ad9fa81c3dcf97b6 SHA512 02a5aa033695a562eaad30f29baf4d06163051fdaabc9e07fd694443698db1eabc9fce5ced885712e9cebfbf1a363eb8820321565de6f78b1dff691a9e0eca13
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
deleted file mode 100644
index 305dba0f0590..000000000000
--- a/virtual/python-backports_abc/python-backports_abc-0.ebuild
+++ /dev/null
@@ -1,16 +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,8} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for the Python 3.3+ collections.abc module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/backports-abc[${PYTHON_USEDEP}]' python2_7 pypy)"
diff --git a/virtual/python-enum34/Manifest b/virtual/python-enum34/Manifest
deleted file mode 100644
index 823df6cf5b1b..000000000000
--- a/virtual/python-enum34/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-enum34-2.ebuild 539 BLAKE2B 76967c1f1a8cc9ace82d0f7a3170fa1bc36b830a6d8d8089fe9c73456768e2d1c62721e39c1f3df92c987d206dba998ad70eeb050f0a78f1ab5a45f2fe1325e6 SHA512 429152f17b6a3386056e33806ed397c2692c16deb5f0e735bcc05cb33e795f7675a3d2fd75923640d678599a942b890c8159e04ccb81bc39601b615e3c305b47
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-enum34/python-enum34-2.ebuild b/virtual/python-enum34/python-enum34-2.ebuild
deleted file mode 100644
index 5bccfad4b48f..000000000000
--- a/virtual/python-enum34/python-enum34-2.ebuild
+++ /dev/null
@@ -1,17 +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 python-r1
-
-DESCRIPTION="A virtual for Python enum34 module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' \
-	'python2*' pypy)"
diff --git a/virtual/python-funcsigs/Manifest b/virtual/python-funcsigs/Manifest
deleted file mode 100644
index d8a292c6797b..000000000000
--- a/virtual/python-funcsigs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-funcsigs-2-r1.ebuild 576 BLAKE2B 98c63ce822e989e07692b575dae1977f3464d5ce76518fcca57902d718b38de07d5423858fe703583ebc21bdf8b81b598555efac8bdb930698d151843a739506 SHA512 1c8daf3986f98d2e990339d17f813d9740825ef2cb1bd7f0ad9a9b9dea957f911cc2a4b79c62c97888c230ac49e1492ce572fe80cb0874665f9630374c977646
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/virtual/python-funcsigs/metadata.xml b/virtual/python-funcsigs/metadata.xml
deleted file mode 100644
index e24dd86faa2a..000000000000
--- a/virtual/python-funcsigs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-2-r1.ebuild
deleted file mode 100644
index fb0b154c8020..000000000000
--- a/virtual/python-funcsigs/python-funcsigs-2-r1.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=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit python-r1
-
-DESCRIPTION="A Virtual for Python function signatures from PEP362 (py3.6 variant)"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '>=dev-python/funcsigs-1[${PYTHON_USEDEP}]' -2)"
diff --git a/virtual/python-futures/Manifest b/virtual/python-futures/Manifest
deleted file mode 100644
index ebb7c4ea4f62..000000000000
--- a/virtual/python-futures/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-futures-1.ebuild 499 BLAKE2B f00cf215270ad168927c4803e8f703feb668e40640eaae5e8695b9de1e5d341c86c7099064e46ef869ace291e2a4f437999544be09b33a971caf5d5cb3c31376 SHA512 74b3bd4bbc5ff41dd59b33b1e766b73542b786185c5c42a3859698c3688ab5e8d14f563fc8224d46f506ac72b1a5041d7b944a4b2ace9b9ce483dade5f2fa9f3
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-futures/python-futures-1.ebuild b/virtual/python-futures/python-futures-1.ebuild
deleted file mode 100644
index 17bf2d2d28fa..000000000000
--- a/virtual/python-futures/python-futures-1.ebuild
+++ /dev/null
@@ -1,16 +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 python-r1
-
-DESCRIPTION="A virtual for the Python concurrent.futures module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' python2_7 pypy)"
diff --git a/virtual/python-ipaddress/Manifest b/virtual/python-ipaddress/Manifest
deleted file mode 100644
index 97c6c1d8c619..000000000000
--- a/virtual/python-ipaddress/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-ipaddress-1.0-r1.ebuild 589 BLAKE2B 4861059b1b853a4c30632424b5a278de5990f20ae5e75bf6b7dee2d795ddd39f740bf3d7ce8a3114b2815a2683bfa2222ead7f66cbc3e26e02db81a442461b9d SHA512 36b53d820fe90853c0ef637ab9f8d2fbba86de5fe6e7626e1954600ba464cf13d592aafc2c6fe93a5ac6c7290626e4e9a31f90997863b4a5123341287cc00388
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
deleted file mode 100644
index 40fb68429b88..000000000000
--- a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
+++ /dev/null
@@ -1,17 +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,8} pypy3 )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for Python ipaddress module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' \
-	python2_7 pypy)"
diff --git a/virtual/python-pathlib/Manifest b/virtual/python-pathlib/Manifest
deleted file mode 100644
index b4f505dd18bd..000000000000
--- a/virtual/python-pathlib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-pathlib-1.0.ebuild 459 BLAKE2B 35f4f428dfd615cbfbcb02406ba0a643599c19b4209ef41a4bc3350e503c4fda826855751d56b2861162fd3c827967a942de1b96c06e3997b6a0fcab327f286a SHA512 386bdc253d7960a249ff51f579cfc1c2a291408b390baa6f525aeddc66e8774ca89cc14fe52239bec6233b9fe104c8c3034293c6d3525692cf51845f388505a1
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-pathlib/metadata.xml b/virtual/python-pathlib/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/python-pathlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
deleted file mode 100644
index d925f31d1952..000000000000
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ /dev/null
@@ -1,17 +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 python-r1
-
-DESCRIPTION="A virtual for Python pathlib module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' \
-		python2_7 pypy)"
diff --git a/virtual/python-singledispatch/Manifest b/virtual/python-singledispatch/Manifest
deleted file mode 100644
index d44adc2cb00a..000000000000
--- a/virtual/python-singledispatch/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-singledispatch-0.ebuild 518 BLAKE2B 2aed45ba1f6a57c5ead8835bb4a8ae03ae9a17f38591e799b03e46929811f67f49850c9eb4959d7473de3b2b61eb12973e565d6c0cfdc3bf9830a7d1e1fba639 SHA512 d5eb8b4ebe91ccc443189789ce50dc1e69bc0161d6fd78dc10aac5790bd06677096cfddfd0d17e89bf9828c32000c43626ed99754f821aeb8aadfb273258d74a
-MISC metadata.xml 386 BLAKE2B 2a6a959db0caa9e906f7ed96958366ba41bd36b8640d2ccf685faf50d44be723215773b4f056882ccc293b4b41025aec4b12586332ccc70b830d7f45fd57a1af SHA512 ba80e7786de3377de21e2511dca3bbdd8af41f5b6ba2976423bf83dc8ad1ed7f14165cc52538f33c5cf6a2086181fcc3b3f191480bd93b581704b11b93a00739
diff --git a/virtual/python-singledispatch/metadata.xml b/virtual/python-singledispatch/metadata.xml
deleted file mode 100644
index 3ef008f49a9b..000000000000
--- a/virtual/python-singledispatch/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>timo@rothenpieler.org</email>
-		<name>Timo Rothenpieler</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
deleted file mode 100644
index 0c7929b6859e..000000000000
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for the Python functools.singledispatch function"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' -2)"
diff --git a/virtual/python-typing/Manifest b/virtual/python-typing/Manifest
deleted file mode 100644
index 6c8e84aabf68..000000000000
--- a/virtual/python-typing/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-typing-0-r1.ebuild 501 BLAKE2B 14081680d6233647ee393d983ebd2829c534a555c8e18e2a83bea4f255689b65362049c810645e37abe1417e378605fb1ec5ab1f4c6dc84188491ba62c8d994c SHA512 8f2ae7c250784263e35bc32cef698919036723080cd7d33ede013f08072d775ce76b6777eb19ff4f893c3a213ef7401f55a7767bc7a1512fe85b18790ed51a1d
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-typing/metadata.xml b/virtual/python-typing/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/python-typing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/python-typing/python-typing-0-r1.ebuild b/virtual/python-typing/python-typing-0-r1.ebuild
deleted file mode 100644
index 1c55e22f7d2b..000000000000
--- a/virtual/python-typing/python-typing-0-r1.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,3_7,3_8} pypy3 )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for the Python typing module"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' \
-	'python2*' pypy)"
diff --git a/virtual/python-unittest-mock/Manifest b/virtual/python-unittest-mock/Manifest
deleted file mode 100644
index 76224531b455..000000000000
--- a/virtual/python-unittest-mock/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-unittest-mock-1.ebuild 497 BLAKE2B dd7c40fa149ac091561084a6bd14e5045af9084a89b66c3b47eb0949abb0695a76bbc47a4c84fc92dfd991d7e2912004a8d2e30a167a7b7debebe6641ca1b3ab SHA512 d91a067709de37de30690d9b008731eb2c31acde6cbc426e763c4b4d4c8029b805092860874a300bda12fc98869779887929b844dfe3f4cb2c6b79f9810c83b0
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-unittest-mock/metadata.xml b/virtual/python-unittest-mock/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/python-unittest-mock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild b/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
deleted file mode 100644
index 4b64d9ec0767..000000000000
--- a/virtual/python-unittest-mock/python-unittest-mock-1.ebuild
+++ /dev/null
@@ -1,16 +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} pypy3 )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for unittest.mock with mock fallback"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 15bf5a964381..68e83ccb2b07 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index a36443fea9d4..76115b2b3753 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,7 +2,7 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
 DIST mod_wsgi-4.5.13.tar.gz 679121 BLAKE2B 310a6a56495883439fad4a5ee7b30e749aaec4131bc039fd378018c30c9b61f1cb2c8b0ed6339c4a9cf556571e2713ff356b04007f1e2a10bcac52ddd5e5d14f SHA512 94bf6ae0d76ece67682a8ca3b7f202bb08a1f3e09e42c33f52b561a57ac8265ca2f5431f839bfe731eb014f279b0d865fd007f14a4839c934d372390d24a44a2
 DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea257295ecae56c0d3e87c4d15743ea4bb0275ae94a6168912ff27fcfcd06eec823b8332d19895ed803ad6164da77b SHA512 5f1526b74ea59c8ef897b49b1b2f2de42d9d0144277fd74f9f8e1f3e0198735f98ec30f726883a3192d0ed33a4013232cb2adf8db9d817b4de0198890eaa7044
 DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
-EBUILD mod_wsgi-4.5.13.ebuild 829 BLAKE2B d51fc6c41ac9e5762a90c53b166f61c12850104cc6cd84564f23983e71ff0d8e921a57f3b9c266f76127264b61645ef69018f2ad77d78d89ab16ddb7a30e091d SHA512 af12e71126137d37ee2343d3954223398c7dffbb57ba4936665f15a0af9c4bff810bd522bb8379c496f88922c0554eb7a998bc6ff2b1d12aeba963f32c13eccc
-EBUILD mod_wsgi-4.6.5.ebuild 839 BLAKE2B 715d6e2e4b756050a723f579b82a805b0cbbd0e090ed58ca5db6ac394154e1cf80849fb912101affdc2aeef4389b3a6635124926e8c58b6b5dd740b69b100458 SHA512 e12c51ef37642deb2652b71eb6f030add2e0824c603e113eab4674315daaeef6ad048b9facae2fcae4e7c309249cd4d6c358c3d3cac45ca89904b025d1cac184
-EBUILD mod_wsgi-4.7.0.ebuild 849 BLAKE2B 6a5e372095918f7e1d822b539a38ee313c36a402d5749ba7b8d5d73651714d14e200dc38a8aa1dcff03ff750ea45507caefd28645de66553b823026d4688736e SHA512 e63c20222065ceb7ec7aba012e8e1a9865459f30d10423f2a1d06c2398336ea627124ade8ad107beb0cac37fc15667f32d702cea903f7ebcfb43f03220565d78
+EBUILD mod_wsgi-4.5.13.ebuild 819 BLAKE2B 186d7c0e8d7842708b466b3ec1a450831925dd3e167393c52e1cd9a8207d852848833431e06f3febb73dd7ee6a3d501d82110aa33c47057791059fa766d7bf41 SHA512 cc25d276d9fe3937a3ae0a1d8e41d2f5eb8d439aa77c7e67a45c605aaec7ea16948fcbd5087adaab731ea8899cebc0fde3e8c035b224a01b725128261b1f011c
+EBUILD mod_wsgi-4.6.5.ebuild 829 BLAKE2B c49a4777ecfed2cae09bb02dd8813346c2bb7e662ef3eeeadb3d786cb5ea0afcca149ff251fef51cfc729cd771d79b14be2c9799897215a43c1c7c4ea857dfa9 SHA512 258d9423ee750ab1904583d3ccf3534b764986e7de9c9806f1dcff7c012f48b583efc5c265ca6557e9a4da2ad98712e8c46cba630bee9b29cbc0ed95a3ebc5c7
+EBUILD mod_wsgi-4.7.0.ebuild 839 BLAKE2B b647de594d4eaa18a99402346c3fb549d15fa474f0d8144a880bf17cf0f3d714a4cc3a7724e1db0cc78d1f845102d7b3bc2f7cca5b1937ac0352a7311a6dc2b0 SHA512 ffaacb13a03e8ebb52b138eccf2548fe6173c37c726a097798ae0cbed17c2044ae9c534aa20b8985e8aeeca09f53ac799cf13eecb8e01e031e76cff4a8455b23
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
index 133181c02a6c..e6f016aeca98 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
index 932deaac9770..ff0433a90fcd 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
index e1a5e203bf0b..d9bc10e0b825 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit apache-module eutils python-single-r1
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ab6a114e2344..66327db75f4b 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 4d49a966deda..5cbf5861dc8b 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,12 +1,19 @@
 AUX bugzilla-5.0.3-leftbrace.patch 821 BLAKE2B a63ba2d824a4742bbb3848b74c01bf2a1c1e49c3ff813372da5b77dccda5d45888eff6e0dc9579ab4b2d9002db6fc42fc5f487e2d8ee8765c06433f73be6a30d SHA512 f60c570bdf2b8c7dacc5022ac859b09ef9add572eba31676be497319edf1f8d1789fe6ca6dab53f5d90ca4244f547a9e5b17fbe8bd92182e5db4777049628272
+AUX bugzilla-5.0.6-leftbrace.patch 575 BLAKE2B f65d620eced64b48243bad5116ea6addc49b84a70def7bb7e46bd73ee23ff38b00c9d83b6e88871f0f6e549c00156f4f4b38c351a2bb05e16a4a58c466a61f07 SHA512 e4cee7f75fa80401acb3f000eb73aabb81a862a24152568965f8c0216a0298932b943000713adb713818c349934880942c31b6ff641c255753312a4ce4061d55
+AUX bugzilla-5.0.6-perl.patch 557 BLAKE2B 10dd18e87cb0ea7155bd9bd75c41ace70d2c8227c2296e92cebbeee8beec623944a29a3a0821a16caceae466e274bac1a7e61ed71ac7b22c01d65279684ef61d SHA512 73ea0cd2a3339fc3dd9499398c3b93c49cb79d05933b25d07ed5905f4ebea45cc1962c5fb889413522e380e7659140acd0cb487f29404b8404133daf1adae21a
+AUX bugzilla-5.0.6-template.patch 795 BLAKE2B 89a83ad619aab60b1e6ec4199906687f8297c846986e913a92319476d56e08df605c86fdcd2e5af9970471f7c2363ad43acf4c78a77c92515117d063d32617df SHA512 a16d6fd055e551dd7fbd15e8a72472b5d18efc7fa685a60a8ceaae462edcce7a74190f1e824c78fd5aca368c22076eb88e49724cfcb2a208d6553348fdc6066b
 AUX bugzilla-queue.confd 94 BLAKE2B 5d5a0e6bfada763c19bcdf15e9c556440e6eb1fef45469f0033bdffee338ef602b95989a8fb39572a452549a6c981e59ad7503e4869e1e3936a4c4a5ac35d3a2 SHA512 ea43eb5a3ace6bede21f9fc96c9560fbb6e24180303feeb717202715f23e785c923838e32730988c4a166a78af529c9535ca47356b31da8cd2e434ea4802b42d
 AUX bugzilla-queue.initd 1253 BLAKE2B 68464ac8184bb224ddeca047c1476c887a32d56ad75cf1978f20bb3b7381c510dc63b33efb2788e21e0ca449e76dc2384505e5db7c5a908aca0cadf319bfee97 SHA512 9e7277c06a07a15f2470b7ea42529c309c32783f192b0703d6b7ea6e1078a116cd2b220413a059bad2c7f5d362876a1207a2f9345c5dee9e28c8175055297e64
 AUX bugzilla.cron.daily 115 BLAKE2B abe56dfecb3cd7eac956750aea9bd8284d9e954df99158f74f3bd0443231a57034e6e21bb6bc7dbe1eb69bb297f59c0563ccde678d66ac6f152861b5321cf55d SHA512 12703cd0f18172ebae4ce57b9ad45c70388a2355ab65751aded718535711be3a2ae45099e5c6f8f488397b5a9ba54ae75c680413cd845d64a5747015713cd2c1
 AUX bugzilla.cron.tab 49 BLAKE2B 3d16a0caf647e28f8bfcf90ca01b8889dc5990112aa25f3099afb716c5ab6f631ef3275056cecdd40c7123c681311c5f00e0554a12ce184740f7558c30180b75 SHA512 e864e543ca9c3526fea765aadfba7d2194035f27b0855b584a7253d82d0ec85266320941d3d1ce12d11d16fb0bd258ddf4678ad8e97d86790c6ab31ad367cc67
-AUX postinstall-en.txt 670 BLAKE2B 1b04aee08ce7fa84e75590374397bf96e9cfd12c2f98250f5ec870f6dc01323b3285542bf0e94558a597540841dc35954c81b4dd1244cdba41c1d3687f8343f8 SHA512 2e30fb234d6d86372e7f8b6dd48050a5061fbccfe8420212ae6cd8c4dfc07442de47e2f3e90f8690f4b12ca7702524bd90b4b8fbfe18e8659a04ca11e876a3fc
+AUX postinstall-5.0.6-en.txt 1292 BLAKE2B deaa9f4c11ffff9f34e0beedbf83b47a568aca86892c63c7a2127fce891168b1cbe8d1ac7aacddbd7fdce48cc8fb6f9530a230a93fde9c726143be3548aa4cbb SHA512 7b7928f6f4b9ec1bf4c565311bebdeb8ec9190d7a3c94a7cb243ca1c0a80c43e6ec1307f7f97d46f480a4aa4f82dded9df4f9894be3f54c1753e937746c1b448
+AUX postinstall-en.txt 711 BLAKE2B aa6686243f6f96b03405458d9652fa63714d754fd64ac413fc5dd9f188d9d548004cc5fac2861417eae6f332b2571fadfdefb4d508d04ec88cb7d84a73e2e342 SHA512 fba41201e16cc3bc002e569b50eb77d2a17a38ef299f19055dd234c6b828b81a138105f66590f6149dc7f22b45f9612f689e42897bc01c9eaffef64f57935d1c
+AUX postupgrade-5.0.6-en.txt 544 BLAKE2B 43b2aa5673de0994ebf33b7e2167e7e91a77cfb7f5b0dea5c04590bd5f97027cb733eaf1ec8b1f209fd2aec690719e383de460b4dbf42f5e18fa5f880010cfd4 SHA512 7f9a0aeda0c665c8027fd71b0a317863dfd1c0a705371de34bf77c31ae0da562a39b101379313a227d1883e5df74c99f16f8b91b69e050c749fc30c9499a0a33
 AUX reconfig 349 BLAKE2B a733307066d91e2c4df0969a3bee5969df51bf72ef0a7a343cf453a804ac474c7d0dc7d43dd89e54a2ec60579824ce495e3062829c05583363bbbe6c1743569a SHA512 bde5c8b728d9f40a8c7b6ff4df683b415c82729ccb95f3652500f6b0274bf7e2471ced0480813765d9c682f43d7de3baac7ab5b27a9a25525393c5c13270b6b0
 DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01 SHA512 51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
 DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548 SHA512 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
+DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af SHA512 8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de
 EBUILD bugzilla-4.4.12-r2.ebuild 2916 BLAKE2B 0c53ce6a900b767b022da559440deffa39c3fbd06bf24d033926ba0ca68306fa7eee905c64ebe8e5b8d6566a8a94a13f809444cbb96fc83b2446ddae5c2e0ad2 SHA512 f82af8cda95d78f7cd49fb6069cf16edda5c2edc5276e00efaa10b50395c29a0da2de94b5f156f722a72cee59292864426e02cd05e89ea57a0a9ca1288cbed0f
 EBUILD bugzilla-5.0.3-r2.ebuild 3094 BLAKE2B 148d88c1a0030194f1900aff351d69f8a9de97c9d6f6076f6a51c6932069d2c83271264c9dd0001f51571b29326cf330d624a89bf3e442f18d05fbc7fe6a71f4 SHA512 aedceffbb1435f28cfe7a67da7430e6349e8d05fb064bf1d6040e3cb373fa9953f5f3447a5785232a83b1c6c087d0f5d94c5031a682510a5161972f96f8e8c7f
-MISC metadata.xml 392 BLAKE2B 7988b93af36ffeb2841c4a7b3d4dbe41533347c3847d41a999e7b00ddb4e11cd738defe96a95a51c5b6f7416f2fbeaf78ea47f3eb3502c5d02f964d1e3cd8c3a SHA512 e0893f3ce807576e90bdddfbf8b19bd32665fa40b288d01126ecbc402d2867b512f26afb5a62e8ed3bd0fa9c749a7f0e2e90547db5f1078274b4e0653f1d0fc1
+EBUILD bugzilla-5.0.6.ebuild 3579 BLAKE2B 332de2208a2217dce97b519d5a455492441274568e55cec1a4f763bffa4646ba05b9cdb4c54c6b2b7425189661bd5e2e6a19788a813b4241e540452d6f6d3180 SHA512 8021a6891a5e6a5c725dd4180cf6a748f87f72cf027e22a9536a6555c5c81e45b76883b8d0497ff4d59f5e29b466535ff563d7f7712548b8e99f4798a75c36c1
+MISC metadata.xml 619 BLAKE2B aa5d322388a2f5532a700c478b7e1c5043ba121afdaac833d1bb470eec02c21f8c3fabd0f11603de9dc56d59f1fd24649ab223c7a8f6bff379d0667a8ffcad46 SHA512 dfd88236c168eff47e9d7cdab851158a5bac6796b31b0b04d15e45796010d8858f444f6b9726083835e3d87740f171b237a16f7c2fda4600617e6ac52f2f0bf9
diff --git a/www-apps/bugzilla/bugzilla-5.0.6.ebuild b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
new file mode 100644
index 000000000000..b9d651ea973a
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
+HOMEPAGE="https://www.bugzilla.org"
+
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="apache2 doc mysql postgres sqlite test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# sorting is identical to upstream MYMETA.json, please don't change
+# These are mandatory for checksetup.pl to configure bugzilla
+BASIC_DEPS="
+	dev-lang/perl
+	>=dev-perl/CGI-3.510.0
+	>=dev-perl/DBI-1.614.0
+	>=dev-perl/TimeDate-2.230.0
+	>=dev-perl/DateTime-0.750.0
+	>=dev-perl/DateTime-TimeZone-1.640.0
+	virtual/perl-Digest-SHA
+	>=dev-perl/Email-MIME-1.904.0
+	>=dev-perl/Email-Sender-1.300.11
+	>=dev-perl/JSON-XS-2.10.0
+	>=dev-perl/List-MoreUtils-0.320.0
+	>=dev-perl/Math-Random-ISAAC-1.0.1
+	>=dev-perl/Template-Toolkit-2.240.0
+	>=dev-perl/URI-1.550.0
+"
+
+RDEPEND="
+	${BASIC_DEPS}
+	apache2? ( www-servers/apache[apache2_modules_access_compat] )
+	!apache2? ( virtual/httpd-cgi )
+	postgres? ( >=dev-perl/DBD-Pg-1.49 )
+	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
+	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
+"
+
+BDEPEND="
+	test? ( ${BASIC_DEPS} )
+	doc? (
+		dev-python/sphinx
+		dev-perl/File-Copy-Recursive
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.6-leftbrace.patch"
+	"${FILESDIR}/${PN}-5.0.6-perl.patch"
+	"${FILESDIR}/${PN}-5.0.6-template.patch"
+)
+
+src_prepare() {
+	default
+
+	# Get rid of the bzr files
+	rm -r .bzr* || die
+
+	# unconditionnally remove pod-coverage tests
+	rm t/011pod.t || die
+}
+
+src_test() {
+	TZ=UTC perl -I. runtests.pl || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-${PV}-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-${PV}-en.txt"
+	webapp_src_install
+
+	if use doc; then
+		docs/makedocs.pl
+		dodoc -r docs/en/html
+		dodoc -r docs/en/txt
+	fi
+
+	# openrc service file to enable mail queuing as a service
+	newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
+
+	# must be executable and stay that way upon upgrading
+	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "Graphical reports, new charts, old charts" "dev-perl/GD dev-perl/Chart dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph"
+	optfeature "Move bugs between installations, automatic update notifications" "dev-perl/MIME-tools dev-perl/libwww-perl dev-perl/XML-Twig"
+	optfeature "Patch Viewer" "dev-perl/PatchReader"
+	optfeature "LDAP authentication" "dev-perl/perl-ldap"
+	optfeature "SMTP authentication" "dev-perl/Authen-SASL"
+	optfeature "XML-RPC Interface" "dev-perl/SOAP-Lite dev-perl/XMLRPC-Lite dev-perl/Test-Taint"
+	optfeature "JSON-RPC Interface, REST Interface" "dev-perl/JSON-RPC dev-perl/Test-Taint"
+	optfeature "More HTML in Product/Group description" "dev-perl/HTML-Scrubber"
+	optfeature "Automatic charset detection for text attachments" "dev-perl/Encode-Detect"
+	optfeature "Inbound Email" "dev-perl/Email-Reply dev-perl/HTML-FormatText-WithLinks"
+	optfeature "Mail Queueing" "dev-perl/TheSchwarz dev-perl/Daemon-Generic"
+	optfeature "Sniff MIME type of attachments" "dev-perl/File-MimeInfo dev-perl/IO-stringy"
+	optfeature "Memcached support" "dev-perl/Cache-Memcached"
+
+	ewarn "If Apache is the chosen webserver, please consider turning the apache2 use flag on"
+	ewarn "Not doing so may result in unexpected runtime errors"
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch
new file mode 100644
index 000000000000..efecc0a07d0f
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch
@@ -0,0 +1,17 @@
+Fixes unescaped left brace in regex to pass test 010dependencies.t
+
+Fix by David Denoncin, based on the 5.0.3 patch
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=228444
+
+--- a/t/010dependencies.t	2020-06-09 21:21:28.049161109 -0000
++++ b/t/010dependencies.t	2020-06-09 21:21:07.059161235 -0000
+@@ -71,7 +71,7 @@
+         $used =~ s#/#::#g;
+         $used =~ s#\.pm$##;
+         $used =~ s#\$module#[^:]+#;
+-        $used =~ s#\${[^}]+}#[^:]+#;
++        $used =~ s#\$\{[^}]+}#[^:]+#;
+         $used =~ s#[" ]##g;
+         push(@use, grep(/^\Q$used\E$/, keys %mods));
+       }
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch
new file mode 100644
index 000000000000..540e70bd880b
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch
@@ -0,0 +1,17 @@
+Fixes a Perl bug making checksetup.pl fail 
+
+Fix by David Denoncin
+
+https://github.com/Perl/perl5/issues/17271
+https://bugzilla.mozilla.org/show_bug.cgi?id=1588175
+
+--- a/Bugzilla/Util.pm	2020-07-10 07:18:37.329165376 -0000
++++ b/Bugzilla/Util.pm	2020-07-10 07:18:55.869165262 -0000
+@@ -106,7 +106,6 @@
+     # |U+200e|Left-To-Right Mark        |0xe2 0x80 0x8e      |
+     # |U+200f|Right-To-Left Mark        |0xe2 0x80 0x8f      |
+     # --------------------------------------------------------
+-    $var =~ tr/\x{202a}-\x{202e}//d;
+   }
+   return $var;
+ }
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch
new file mode 100644
index 000000000000..040eaf734a8a
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch
@@ -0,0 +1,17 @@
+Fixes a simple typo in a template allowing tests to pass
+
+Fix by David Denoncin
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644655
+
+--- a/template/en/default/pages/release-notes.html.tmpl 2020-06-09 21:34:41.845822737 -0000
++++ b/template/en/default/pages/release-notes.html.tmpl	2020-06-09 21:05:23.515833860 -0000
+@@ -45,7 +45,7 @@
+ 
+ <h3>5.0.6</h3>
+ <p>This release contains a schema change to the flagtypes table, allowing for many more flagtypes.</p>.
+-<p>The flagtypes table should have been using a mediumint for several releases, but due to a bug in the schema migration code this never happened.</p>
++<p>The flagtypes table should have been using a mediumint for several releases, but due to [% terms.abug %] in the schema migration code this never happened.</p>
+ 
+ <h3>5.0.5</h3>
+ 
diff --git a/www-apps/bugzilla/files/postinstall-5.0.6-en.txt b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt
new file mode 100644
index 000000000000..5c60465deb8f
--- /dev/null
+++ b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt
@@ -0,0 +1,30 @@
+0. Bugzilla has been installed into ${MY_INSTALLDIR}
+
+1. To finish the installation, please read
+   https://bugzilla.readthedocs.io/en/5.0/installing/index.html
+   https://wiki.gentoo.org/wiki/Bugzilla
+   You will need to run ${MY_INSTALLDIR}/checksetup.pl
+
+2. Please read the Release Notes, especially if you are upgrading:
+   https://www.bugzilla.org/releases/${PV}/release-notes.html
+
+3. Please note that Apache2 sets AllowOverride None by default. You may have
+   to edit it to process the .htaccess file provided by Bugzilla. Please see
+   https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
+   https://bugzilla.readthedocs.io/en/5.0/installing/apache.html for more info.
+
+4. If this is a large project and you wish to enable mail queuing, you need to
+   emerge dev-perl/TheSchwarz and dev-perl/Daemon-Generic. To enable mail 
+   queuing as an openrc-service, create a file named bugzilla-queue in 
+   /etc/conf.d/ with this one line 
+
+   JOBQUEUE_PATH=${MY_INSTALLDIR}
+
+   Which defines the variable used by the openrc service file 
+   /etc/init.d/bugzilla-queue
+   Then run:
+
+   rc-update add bugzilla-queue default
+
+5. For other optional post installation configuration, please read
+   https://bugzilla.readthedocs.io/en/5.0/installing/optional-post-install-config.html
diff --git a/www-apps/bugzilla/files/postinstall-en.txt b/www-apps/bugzilla/files/postinstall-en.txt
index 9b6a8798a640..e8d8093fdb2e 100644
--- a/www-apps/bugzilla/files/postinstall-en.txt
+++ b/www-apps/bugzilla/files/postinstall-en.txt
@@ -2,6 +2,7 @@
 
 1. To finish the installation, please read
    http://www.bugzilla.org/docs/${MY_PB}/en/html/installing-bugzilla.html
+   https://wiki.gentoo.org/wiki/Bugzilla
    You will need to run ${MY_INSTALLDIR}/checksetup.pl
 
 2. Please read the Release Notes, especially if you are upgrading:
diff --git a/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt
new file mode 100644
index 000000000000..9b1fab718b61
--- /dev/null
+++ b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt
@@ -0,0 +1,10 @@
+0. Please NOTE: It is impossible to downgrade bugzilla. Prior to upgrading 
+   you should always make a backup of your database, data files and lib files and 
+   read https://www.bugzilla.org/releases/${PV}/release-notes.html
+
+1. If you have bugzilla emerged with the vhosts flag on, please refer to 
+   https://wiki.gentoo.org/wiki/Webapp-config#Upgrading_an_installed_webapp
+   or https://wiki.gentoo.org/wiki/Bugzilla#Upgrading to upgrade your bugzilla
+   instance.
+
+2. After upgrading you have to run checksetup.pl to complete the upgrade.
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 2901e955608a..70124d7a597f 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index e9d503c6c57c..fc667732b1de 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,33 +1,11 @@
 AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
-AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.6.1-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.6.4-no-pip.patch 652 BLAKE2B 22612628cfa2ca10303a4328ed3c09bb7859c84eda1253330639e3b3576470b34b62bd775b2888043f7d01fefff746cb044bfbf0851eb0245009f46d42c2ab5a SHA512 a331b155ee9bed9a77bfd50eb2008f7281294fe16d280a4d7dc4ecc91fcd014a7cf581a7c9d01f02e2085fb6858bb377029906fd1fcdc042610c0bdda5464537
 AUX netbox-2.6.7-no-pip.patch 1062 BLAKE2B c134503d9c65bdc82147dcf045b69531276c021d650842b28407ed92ac6c7811e98be83b73279f93db2838e2edf7c651ab4e2a43f5421487029c708edb5a6f8f SHA512 e0ac02fcb65a5b7a0e199ef1d82993f75018fd45779bd073b3cfa75b18c221b17db390d5f6a81545505771effa5cd7aabfc96da107b3968b8f7e2a8bcbed9ade
 AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
 AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
-DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
-DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
-DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768dc05c9280f94c23368336752034b8ede591ed4337f6b65ade1db7fac740533c3c2d932043172cf296ddd2e3f8a SHA512 8cfe4384ed4ad682ff5268e83d72716230683e86e858c857fd694838227a8b3eddfe02c1fc39b00cb36b33519d8cbb942dd4008544943e8b8f7f2d5904c10e5a
-DIST netbox-2.6.12.tar.gz 2463692 BLAKE2B 38386569b651e516cf587561f06c11be0d0e6bb9b5e664ba2403367693d29961e1379b7b0754bb2379b9af636aba03d8c9d1b611d607a2a234467b25a956bd35 SHA512 9ebb540541401a3e81a10a2345b54053c8bcb73c4e217732b2d07badf40d08bd3600b50ada13e83fdf28db447233d710b4cf0989d978117cd16a1f7220b40e4c
-DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a
-DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
-DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
-DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
-DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
 DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097ddd67c8e4586ee2a3ce5a81e4fe98a71f574ae5c732190e03e42fd4cab2f781a30622e79d5e9ea4db7c86de263 SHA512 87753ce955e296d9605e44d5f0df58c14876ca8feda3245dee166fba8a51cbfda7def8da39663570cd0e7c9195cc163d9e877b59027ea1161c7eec33702a3ea4
 DIST netbox-2.7.6.tar.gz 4949672 BLAKE2B 1847e5a05493f55ca777737c11b4751bc63183d693f742c7f9b9e5d6a498fe786a60619d40394473488881e6ef922a343cacd796126b8c618158eea9ab26216d SHA512 065e9c4338fb876ac626f5dec5c98ba2ee798b2fd6d4d8a8d4e57fff4072c649e51a1db633c2718be9ca10b362e7ead9b70655fa77ae6da9f01706e60135e306
 DIST netbox-2.7.8.tar.gz 5587481 BLAKE2B 9b524ca7acc1d650402a72aa65f75d7205cf29a3a5cfa9256ff47d12f240fc38903a6db76b8cee2b923947f6e31b124ba0bfdfbf4385fb6fd027634b3b8ba675 SHA512 cce73b9bbd79725e4af01a9265c0a9f14a1ac708186123c1a90f267149157a0c174cd32d5e56875b5fdb55ef87b2ec668ec542b1d3a01256544065d6a0457b54
-EBUILD netbox-2.5.11.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
-EBUILD netbox-2.5.12.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
-EBUILD netbox-2.6.1.ebuild 4449 BLAKE2B 24567d71dfaeeea03349cfa21ce894eedf2ef5ee982163d2e1b26fd589fd57ab8861284f7a3bd0e67e22d276c380e5d3afccc34eb542334c801797bb29e48dc6 SHA512 673f8f45083827a69f5997affc1d688d5e907e7946a5ec9bb91d339735b3f6fb05333ed02d43e5d08c5bbe4ee6cdb1ee5893f0440b7c1ebd62433b0153cda79e
-EBUILD netbox-2.6.12.ebuild 4419 BLAKE2B 6b6d44d739de39dbd0ae9022c2471d7deb246f51d8f20c7550fe3a0f5c83bcb2d0d7cfd253dd4117ae9d18451ec46947ac3a6dae343b4eec888b502b069cd0bb SHA512 562710d0d8733fa8c3e44b58e420b7fbd6d101ba567a00dd04350d27f0b40d98b208b0aa45fe8e2b158f2e55887830aef2b02205b730ea6c48310a18e8349481
-EBUILD netbox-2.6.4.ebuild 4457 BLAKE2B e13c5ee4a071dfa2b75f22b9369657c5e4fad707fa88c668a91eec55b31a5f00c8c7932de57c202157c8496527e189299095f0654b0fd81abb2299db16efbc12 SHA512 6d8614ce6fa21c0c1126f1bca90eeb96cd872bf7d2bd6c0525eb514584eff02b067104a4a67fc77b012a2f548edf87446188a338c6e984814dd97a65d1a4cbc8
-EBUILD netbox-2.6.5.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
-EBUILD netbox-2.6.6.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
-EBUILD netbox-2.6.7.ebuild 4457 BLAKE2B ca5c253c76db4596ac10d782f4d6e51f479e67a4db4417282c6a8d8e976df9930f1724eb5a38bd1d91a2afff8cc10ea76ac71178caf95bfef007e808e657d36c SHA512 dd70ecd8158c2dd8fadc2efe44f8f90cd38bdecbbc229cd299019cd7ae9203b9f3882383f338a7bbc188b97b0ea53a9a4b6e9d7211cf1f72c62791949f16252c
-EBUILD netbox-2.6.8.ebuild 4464 BLAKE2B 920519600bd479d04b245dd011397acfb994a400af5d1bd4de443eddada71dadd681bf76dc682f381159509327f1440a81764efe22ca27f25178bbbfb9946769 SHA512 76003344da3f5d981f688889a7f83670ae4e1acf3cec631bf58493f0260ca194d3160cb22f39a598e8596d7001ca018d5364c76fc6c80681f144f40ae84df55e
 EBUILD netbox-2.7.2.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
 EBUILD netbox-2.7.6.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
 EBUILD netbox-2.7.8.ebuild 4485 BLAKE2B 9042ae90733096d06a97eea263b7fbe846efaa9f88cccc3f0598c7efe0ea8357f06b9a6730782f010b409d3c5744c519037770f143ef43975c77c8ce219c74b1 SHA512 526b1fb059ca62952a828f77bd56639b28b457a94753dcca5ae70925e24b7a6954a6e5a0f6ab7e186e2bf0853576e92cf64a50ce7ede8b86926984db2ddd6e25
-MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch b/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
deleted file mode 100644
index ba281aaea5d1..000000000000
--- a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 793e72cd..8490d713 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -10,16 +10,6 @@ cd "$(dirname "$0")"
- PYTHON="python3"
- PIP="pip3"
- 
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
index f53806a22836..c36c37139fad 100644
--- a/www-apps/netbox/metadata.xml
+++ b/www-apps/netbox/metadata.xml
@@ -5,7 +5,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-		<use>
-					<flag name="webhooks">Enable webhooks via django-rq</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
deleted file mode 100644
index 64de819ea055..000000000000
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
deleted file mode 100644
index 64de819ea055..000000000000
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
deleted file mode 100644
index 04c487ccf5f5..000000000000
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.12.ebuild b/www-apps/netbox/netbox-2.6.12.ebuild
deleted file mode 100644
index d6676c7aca58..000000000000
--- a/www-apps/netbox/netbox-2.6.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	acct-group/netbox
-	acct-user/netbox
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
deleted file mode 100644
index a060ba59442d..000000000000
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.5.ebuild b/www-apps/netbox/netbox-2.6.5.ebuild
deleted file mode 100644
index c9b078880e56..000000000000
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.6.ebuild b/www-apps/netbox/netbox-2.6.6.ebuild
deleted file mode 100644
index c9b078880e56..000000000000
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
deleted file mode 100644
index 748180d6cc27..000000000000
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-apps/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
deleted file mode 100644
index 233c4920008f..000000000000
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/netbox-community/netbox"
-SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
-	)
-
-DISABLE_AUTOFORMATTING=YES
-DOC_CONTENTS="
-netbox is installed on your system. However, there are some manual steps
-you need to complete from the installation guide [1].
-
-On Gentoo, the configuration files you need to edit are located in
-/etc/netbox, not /opt/netbox as shown in the installation guide.
-
-If this is a new installation, please follow the installation guide
-other than this difference. Also, if you need ldap or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  you should also add the netbox-rqworker
-service to the default runlevel and start it.
-
-If this is an upgrade, follow these instructions:
-
-Stop the netbox service. If the  netbox-rqworker service is running,
-stop it as well.
-
-Next, run the upgrade script as described in the upgrading guide[2].
-
-Next, check for new configuration options and set them as appropriate
-for your system.
-
-Next, start the netbox service.
-
-Finally, if you are using webhooks, start the netbox-rqworker service.
-
-[1] https://netbox.readthedocs.io/en/stable/installation/
-[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_install() {
-	dodir /opt
-	cp -a ../${P} "${ED}"/opt
-	dosym ${P} /opt/netbox
-dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
-	dosym ../../../../etc/netbox/configuration.py \
-	/opt/netbox/netbox/netbox/configuration.py
-	dodir /etc/netbox
-	insinto /etc/netbox
-	newins netbox/netbox/configuration.example.py configuration.py
-	doins "${FILESDIR}"/gunicorn_config.py
-	fowners -R netbox:netbox /etc/netbox /opt/${P}
-	fowners -h netbox:netbox /opt/netbox
-	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use webhooks &&
-		newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
-	keepdir /var/log/netbox
-	fowners -R netbox:netbox /var/log/netbox
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	local r
-	for r in $REPLACING_VERSIONS; do
-		if [[ $r = "2.5.10" ]]; then
-			ewarn "The home directory of the netbox user is now /var/lib/netbox"
-			ewarn "Please adjust your system."
-		fi
-	done
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 341d5ea709c0..0d33b588d3b0 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bd0733f3aa90..f5e232e805ad 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,12 +5,12 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
 DIST chromium-84.0.4147.105.tar.xz 845167500 BLAKE2B 53dc3658d1d206864b20b4a9e6f54d321332a765a6d5589d241103e2bd84af42f264386a928e220e332d867f4265ae617c7669337c05b106f9a42bba2cc019f8 SHA512 23cdd8b49c3276b16f1b4753fadf9f428720f0a95a3f567d189ba0e8a231d7bc1f62e96da6188645243eedac15ecc554b97e83c1a63aa647e7946cc1ba015a8c
 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
-DIST chromium-85.0.4183.39.tar.xz 863788052 BLAKE2B 76551471aab570e6484b0dae31191f2d2aace5f360353274a265f205b7c24997b75c6d32b15ff0e34dd0c31edb70491f4f5f7bb8fe331f8b110fa77051572d54 SHA512 23ac7d6d96a6abaee565b791d75b03fa0b9ff9f3a8bd8f4c42896f345530796485d756ac96f97e566f4c9d054ca3fa9b14d5dc774533f50e5a9e1ea5669d663b
+DIST chromium-85.0.4183.48.tar.xz 863832848 BLAKE2B 88e74f085591b7d7a21a3cd5fa5e12ac381d346492f5774a8a4aecc9c6af453270acd61447009c7b7749c3e8fc4f7b4f064749aa398b18372f8265baecedaa25 SHA512 d2886f6acc6a5afcd03deac7ad82ca6f99f527672a2e0cafaadc467edc98306584e26796c1a9a097ce2880bbee68d05982df12a1c31c34d52b1c1506f4fbd7fa
 DIST chromium-86-patchset-1.tar.xz 6588 BLAKE2B 7a01189d7bf55c3b48b6ef377bc364dfc59ecece9669b127af74c01678ba39ee8893e4dfc7eafb8c5550365975fcd4baca33894ef2346d980249cede6e03c0bc SHA512 30a1417e7cbe1a674c240b976f1ceee00fa2140e9857e13a2767b9de652fd9e93bdac151a076d4076a0bd7ceb6fc2b391b41143668121a21820fc8c9975f0958
 DIST chromium-86.0.4209.2.tar.xz 869377072 BLAKE2B e6dbb88533278c9a55f45facd3cbb03a8457ece7bc981c1a426c863cf0f717b189aa288b09607d0aa1be21de7d5f178500979925f21e0fcc7dbf8418b14b5a11 SHA512 1bb718a8e167266b54f37f468a4312b35fc91e230bff9681a945be85ca0bbdbb63670cdb1f87ba460eca1cd7393e4f6a6337468e7ca657c7b580656c2d6a059e
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
 EBUILD chromium-84.0.4147.105.ebuild 26743 BLAKE2B 3f0ffaf3d51258e9e3896a9faa82d672323284c8c65984c39cb2b2720bcc7fbf70ee01b103c999bad0df23bcfd8455a18e4d3f18485c3dc37e86583653ddfc5a SHA512 6b9b38de086c854289c169dd35b52004957e950a6b8a07997cca989a1be1fdef8c60d25de5095259da9643547101e2f41095b6463c27ebb92617cd83a990da98
-EBUILD chromium-85.0.4183.39.ebuild 26543 BLAKE2B e364be273e69cc90ac2886da3f99cf8ddc9e02e8c60cca7f33b6b9fb8d83b506eed3305dd51cda64ed67f76fd53cc1516a0d41788bdcdced0cde962d88aa5c55 SHA512 a00bffa2594d39f585586f2e274b1bdc8ecc9840d98de55a05f3bb5e4ece56af0a21700b8961374758b813f7a3dabebbd636038562b61754f2d60057490c4aa2
+EBUILD chromium-85.0.4183.48.ebuild 26543 BLAKE2B e364be273e69cc90ac2886da3f99cf8ddc9e02e8c60cca7f33b6b9fb8d83b506eed3305dd51cda64ed67f76fd53cc1516a0d41788bdcdced0cde962d88aa5c55 SHA512 a00bffa2594d39f585586f2e274b1bdc8ecc9840d98de55a05f3bb5e4ece56af0a21700b8961374758b813f7a3dabebbd636038562b61754f2d60057490c4aa2
 EBUILD chromium-86.0.4209.2.ebuild 26928 BLAKE2B 444a479be2b4be867fe39dbd84b7446eb08a56b36888e41972299f33f2fdb3c4307ec1278afeecbe7e8a8973fc500e603a31e5ad10328f9af0c6f0e71c03a4d6 SHA512 67b3ddbab5bc5e00d380b6e4aedea615dad80ea91cd4c4d174f256063fee574b5086ecdb4b54315a14e3d298f2347c20625eefcce5d211853f954d8a977e672a
 MISC metadata.xml 1726 BLAKE2B a7f72eb8213b17a6cd885940e732456c87207370d4f29e3f80b5a58d7c367e9df2b97b7a8763f035f57e53ae9d9e14fe5c8d7427d52b036eb0703568e8b59501 SHA512 dade58f1481fcfa848392e8ad4f781c20d7746987c589dc29f7bda2986ce46d9c6928756128ec9fddf8a58cc3709fb848fb86eb48abd0bafe224738aeaeda6dc
diff --git a/www-client/chromium/chromium-85.0.4183.39.ebuild b/www-client/chromium/chromium-85.0.4183.48.ebuild
similarity index 100%
rename from www-client/chromium/chromium-85.0.4183.39.ebuild
rename to www-client/chromium/chromium-85.0.4183.48.ebuild
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 86e51a228526..58c8582159f4 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -4,7 +4,7 @@ AUX dillo2-inbuf.patch 313 BLAKE2B f3924f38da743bc843142106853b4fc704a9ffc8efe8d
 DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
 DIST dillo-3.1_p20181005.tar.xz 907520 BLAKE2B 1349ca1de53b294b5c31088ce36b3f9a86c3e628cfce41fa4fcfa30a3b4d9ed05b0be836fbc2ea2f2c37fce3ff28b17766d0717949d1ec66430149049751fa50 SHA512 1accbf200bd17a04d3b758037e11b0c21924c93d7857fa5c880af471cf180d45d5c772c6d800b4b899cf5b43bde640d28b37ce82fcf6b916c9adee5800e57d29
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
-EBUILD dillo-3.0.5-r3.ebuild 1299 BLAKE2B 376c5b594defc23ed28d97f1c48d74d84d99d8d54f182cc106b8345cfba9f9b0c7530afde73814cec69b53e324e1b78321f25034c4d66695cb0770596f89384c SHA512 bbd538a50036d3f6232323a44b2755dc82997001c43a5f754b35520b177870f35dc4c7ffc58af094a1349beed6290a4cd976ff12f364908148e7b26d566f64df
+EBUILD dillo-3.0.5-r3.ebuild 1296 BLAKE2B 3fd55701f5553a1cb28a42440d36d1d126ffb89060cd0cbf177071740eb51676a71393962a01a0e4b6dacec442ab64689e85622702dca1b62f7532c70079642d SHA512 5ff735312e31f554e932a227e9a06448fe98c4a7d519d56a8ecd24bac5b87edf40b4922d0f3da1b0be3e43642a1c606ba5d1dada4004f25b5758c43fc057f00a
 EBUILD dillo-3.0.5.ebuild 1295 BLAKE2B a125005c5a89b9b265f6fe047e1e033b36e4d73c39e3b9ae90c954ebf0066e390eb217c65ad5c062cbe09029c71ba8ba5891a9cd436eed8ab7fa3e5095941893 SHA512 3b4c8e1c0a0503fc926e21441e878dba0e8a94db52548caf56ebc68d6305d61e771a70b02310b332e89d34e3e85e2821399ded117ea40819c67d3e39fe9779f3
 EBUILD dillo-3.1_p20181005.ebuild 1199 BLAKE2B 09e1bf6a220bc19a03f79c54b0d7f49bf345aa9d53424f691e4b2b4967a0fcad7eca6af17b6927321522af4deb3599936e88e333723d968b87bb288e4a1e1ffa SHA512 e3683e3ac46bac4947a1a87a2aeacb01647dddcf9b5fdea58fe0bffc4db6f7a621169f4180d41a3760f6c8ca0ed8a750202853e487b7f22af3f400cb7ce888d9
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
index 956787d22bf5..acaa5183fdd3 100644
--- a/www-client/dillo/dillo-3.0.5-r3.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86"
 IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
 
 RDEPEND="
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 729da6b1b7fb..f34699f4d469 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
index 21b60ccf3b59..a7d5f15e341e 100644
--- a/www-plugins/passff-host/Manifest
+++ b/www-plugins/passff-host/Manifest
@@ -1,5 +1,4 @@
 DIST passff-host-1.2.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
 DIST passff-host-1.2.1.py 3666 BLAKE2B 6a95defc3b1abe91f95e83ab20e9d0e533da2ae0e2153d2b50abf0a77aeb426b6b0a0ed042c00912a434dadbf53a9091fa772df9b9f5c330982a9ab49b891bc8 SHA512 5fe848fe0d6a75b679ee18fd5d32fda963853b91ad382fc19780104d44d1052a7191188946af470722dab883f0318ec38980fc24f052aeb5c54cac98f810ee15
-EBUILD passff-host-1.2.1-r1.ebuild 1548 BLAKE2B a8e37386227ff5dd27cea623dfc2830d20dbfaddf751e8917e2b2f757b55ed131200af764eca28fef5c701b7d19af815b36f78b0e40d8dabdff27e38c3cd38ae SHA512 b618615c1ebe17515629941210979ba6a19120a30d8a62d213cbaf0df39cf745d31879bf608e0a7d3817f1663f365d22d037c84fc5d66553fc9fdc98181ce5ff
-EBUILD passff-host-1.2.1.ebuild 1410 BLAKE2B 163e51c6a14842b93529553365284a9df20cb8573a686b7dc57a41609f3ad1d1e19c48136c5535af7780dc860df5cd5bb66545ee10696b8b388cd046ceea6fd9 SHA512 3f332d8cdca2a634d8cb05233f8426381d44bce16ea8e3a8d9cccb33c64715f0d1f6e483dc755da863084c38b10f434a61f3d15c484d1c79f74b9aff4cd945a6
+EBUILD passff-host-1.2.1-r1.ebuild 1543 BLAKE2B d09f84eaf8e524e1cebba50f2c6c21fabb47d1227226d4eca8b62d7e8d5fe2eeda4c3d8d47cad9e98f7adbe9471c967a22a866e02acac72017e6666d1c093a67 SHA512 9c000530ee91f02d8ac87ec0eb0f4151f48a0413894a763d9fe54936ed96eb2de452811f07f31baea23061a524ecd33d9aff590d8c305b7ac9f118b64189f68d
 MISC metadata.xml 605 BLAKE2B 05c6663ff28370ff663a4213b5a913778a58009f78ab348b5984ddc970af6f3f48622ea2a5c23b45a1a6100ca3d978e2eccbaa2707116e73f41d6ecc179b6d83 SHA512 8572806b39f10ca0598c5a317b059c83b551424830ce5a7fe29b926175dda5f456ccb9297b5cca1d8ab82fed74e4011cc8e674b209f2a00ba7b4df5bbca01906
diff --git a/www-plugins/passff-host/passff-host-1.2.1-r1.ebuild b/www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
index ae62d7aaca1c..ec245115cb06 100644
--- a/www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
+++ b/www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-single-r1
 
diff --git a/www-plugins/passff-host/passff-host-1.2.1.ebuild b/www-plugins/passff-host/passff-host-1.2.1.ebuild
deleted file mode 100644
index 3dd1e204515e..000000000000
--- a/www-plugins/passff-host/passff-host-1.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Host app for the PassFF WebExtension"
-HOMEPAGE="https://github.com/passff/passff-host"
-
-SRC_URI="
-	https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py
-	https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="chrome chromium firefox vivaldi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( chrome chromium firefox vivaldi )
-"
-
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}.json" . || die
-	cp "${DISTDIR}/${P}.py" . || die
-}
-
-src_prepare() {
-	default
-	python_fix_shebang "${P}.py"
-}
-
-src_install() {
-	local target_dirs=()
-
-	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
-	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
-	use firefox  && target_dirs+=( "/usr/$(get_libdir)/mozilla/native-messaging-hosts" )
-	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
-
-	for target_dir in "${target_dirs[@]}"; do
-		sed "s;PLACEHOLDER;${target_dir}/passff.py;g" "${P}.json" > "passff.json" || die
-
-		insinto "${target_dir}"
-		doins passff.json
-		exeinto "${target_dir}"
-		newexe "${P}.py" passff.py
-	done
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index a184fa79ea5b..6220135f78f3 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 0cb370810e93..7d11946bc3e7 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,5 +2,5 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
-EBUILD uwsgi-2.0.18.ebuild 11514 BLAKE2B 9bdbf0807ae4fd3e970fa237905e6e9425eff0b4b4e4d9342f540076adf30f1082f7c634901326cc3075c271b5f57584b30b31c2328df5e10ceaa61338d9c279 SHA512 435f7f79ac14b5e21b17ef0ca80535f6f67b0663691e0a5084765d0ce77215c103e9a3f85c9c4e6ce6b55d8e46d76fa19b675714c1999e102c8fca88d02b9085
+EBUILD uwsgi-2.0.18.ebuild 11504 BLAKE2B bac45f610930c21d66030cef2ab02527553907f1432c2aa4035dba299f18394d4c952c9384875385b942d47fa7c77f6001107f5ec3957b4aec6e2700697d9457 SHA512 1986553d51a64cd3f6f8282011fe422bdfd63511511728448fccbd373c308f279bbd14d26a21a8949d1e1bd09efc37177b0f81466993bd4d3bb070bcd191fa18
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
index 2ba21267a170..1f61916e28d7 100644
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 RUBY_OPTIONAL="yes"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 02663b9afe86..657b94b32d8e 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index f6b1077e8c4c..0a83dc866bc4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -44,7 +44,7 @@ DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 032bbe8cdb7ec3b353e8f8ef33d0
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
 DIST nvidia-settings-450.57.tar.bz2 1057133 BLAKE2B 123b804b988e758a2ab4afd476b4baffd1cbc43893c9df535f93a933f63ad43dbb450e1aacf70bee565b2e223362ac17aafa48ad012053f999b6d45547a9f0b8 SHA512 996c7759ce900984447956f08b17f979ae434a65ec21be382d08c63a227e3f7da600d906cff3370b7a0e41f6fb0b88e54b43a26faed264a3e804fd7721b4491d
-EBUILD nvidia-drivers-340.108.ebuild 13474 BLAKE2B 1d6abf7bc18a0d4820a18288cb1cab4a410f3a011231a089e4a4dfd592d517af4f213ae562fe0149b97e5082083c9242473fabc04ee8a3a54e7e0959c8acfecf SHA512 e1c260a17f06be82afb49d52f3b5b040e8645bfbb52670e706b490a82e0bc29c742ea506f33f56f46791b4ec1ceb5e6d1f9729370c1419ee2ebc7355f748d904
+EBUILD nvidia-drivers-340.108.ebuild 13442 BLAKE2B 6ea453241a1c819d7d4896d0b311c6a387cd92660240199253129ccacef3f2c79c23bed3098ab118cc5c4e9945d1efc44edb064731e0995a394fa9d58b100feb SHA512 2267b7142cf295a9f2b2bfccf92635944a929184b1f22ff3706e9836c4fce9312a8b8fd71e3a38b2c91662aa7bb36b1e445ffa0b3cac4a1718a95531964571c0
 EBUILD nvidia-drivers-390.132-r1.ebuild 15089 BLAKE2B 7fac0afb8035ce6f654290891fff85d2803bd1b98644f5ebd0f90d5026cfe51721b415e5278763ec8b13cfb18b7961fb6f8c634c1a767ce7e23acf33785636a8 SHA512 9ff5db30b95ac3632fef72d62fd01c10d577639e185034925936889794abbc54159e79a924af31a3ed14688af2e9792ab9283c0071b2fc883b3ea075bae48602
 EBUILD nvidia-drivers-390.132-r2.ebuild 15527 BLAKE2B e9ff9f103be3f0c2837afe9e9348246f7b6c52b1e0b00e0569bf07389ae174783610c7441da3a13421fc25e0111c0249852b705be5533bb6d2d728e514cb7dc2 SHA512 6c37c8858958c7497c679ee50c1e400fedc2506a215e9976580a67cb006bbd3c37f011f856480fa47a81b75dcee59da026567b9a827fe18f6e49a89c7789c6ff
 EBUILD nvidia-drivers-390.138.ebuild 15543 BLAKE2B 6c2459cd9777ce82ed37e07a5ffbb68101aebf19d306789535b28127d19a47d657192915973f29bc8e997ca2dbca5fb2e483e7fa5d0c3e7651d2ff0b54d7864a SHA512 054e447a9279e2ae0f3e9c1cc2f1e0553c9c1b749673476ce2bbf0f4a1b4f4d4d99c8e0ff4feabf97d8c1107f2e3758561494a344afd43d3ea9fead7c2d30344
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index 298817edf68a..dc1b42d6f305 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -440,9 +440,6 @@ src_install-libs() {
 pkg_preinst() {
 	if use driver && use kernel_linux; then
 		linux-mod_pkg_preinst
-	fi
-
-	if use kernel_linux; then
 		local videogroup="$(getent group video | cut -d ':' -f 3)"
 		if [ -z "${videogroup}" ]; then
 			eerror "Failed to determine the video group gid"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 85d91a2a532c..c24dbee64994 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 12cbeb90213d..0a556ee7ec00 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,6 +6,6 @@ AUX cairo-1.16.0-strings.patch 690 BLAKE2B 2509bdb3d6592c9606c92730f1e052c0ce5db
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 EBUILD cairo-1.16.0-r3.ebuild 3893 BLAKE2B 98e15a4b9625b26914e80598b84f47b7f8b85e8ab9a786f65f0fb78e96f407d814dd93e93da446b1ffbb6727df9d26f4b914151df174cefeae3754d8dc900ad8 SHA512 053b0d82dcba55dde60a6ffb9f7cefc018a511009c72ee27247575661274ad43483c3194c8cdbc68be2d3edbf33d58d6214bd3e715d706faed4ce0f062039c21
-EBUILD cairo-1.16.0-r4.ebuild 3928 BLAKE2B 4dd374db3d7a92a1a4a8e736c6715d7030b38ab3754c2236f3d213f2d3246492bb23c76a03b89d247cee63157c3ec326eb41cb511cc2f3e38ff38cc4e87ac543 SHA512 dcafbb0e3d2a0d33fe2934314561878883446fca6176335efc9ea0de62d99646344b145297219130dff1e5b8dc959b3aafa4be45c675e561cac38d5b4c733e44
+EBUILD cairo-1.16.0-r4.ebuild 3927 BLAKE2B d7aceb5380a64539af97bfefc5c24554c7860b46f61028ad8e4e210bde398216375ce04eb47fc4027189e5b09453e1b8506c70873001fac103230d9f1a7aae6c SHA512 3ca945059e7c6a6aface10be7fe7043f6ef6d23f62a4ad4bdb3ff5b7e70218973a784f598d36c5da8bc6934f6473ddc1a10daffe3fb99619afd74244b8a463aa
 EBUILD cairo-9999.ebuild 3775 BLAKE2B 881817b40ccafbf1b08d8625c14726e6cf4ef830a5db0db4ceb33184eb5281df9984ee8a878cd56817dd0cffd9b5c2f5cbd8f02584ae336462db73c7be6a11ce SHA512 b1a2b120987ca449367491559bb16af21e8b78ce0c4dc94f1284bc17068c04f387d816f6c8d15ccb0a822751260386f8e7b7640233b23fc57a6b6e9383d543db
 MISC metadata.xml 709 BLAKE2B 7cdfba4d24004ca9d45af33b49ec0f27344306a42d2269010957d085f527a8ef6e95b521f00344e3280852b1b57d06f4f84ead4b5e149baac7a2c5a48de44d14 SHA512 5ff7d97521b43486f6a9d51fe36c7546e229a66deeb308d9f5f84b5473678f5db869d3f58634d044fddc00af499a8e03699b22bca0582290b3a322dd6ae66b1b
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index e5f6838fccdc..672498559bf3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 89fd7f8ad215..e5be55790b76 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,3 +1,5 @@
+DIST libX11-1.6.10.tar.bz2 2294095 BLAKE2B de615b3fb95e709f3e7b4f91c21b7f29adedb591afd76d8e631ea1d88a54530d799c840de6f5ee1af2a5aa48dfb87bc20dcbed2a2902d707ea3c198ec24d8d86 SHA512 ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
+EBUILD libX11-1.6.10.ebuild 702 BLAKE2B 6a354660b9d037f1f5e6c9e9af633cf31e61be76c998f6184378787a83b0b5c246f56c049d294644d7da363a2cdc7e7cd1fe41a398649e482faab305568fc3f3 SHA512 b88c48a20d35f5be5195417192f747fe89115d52af76a307561a3670a323d9dc0fbdda9a7b8ab7e1dbd8a85e3db0703622e6e64758fe9f98fe85ba603a7ac908
 EBUILD libX11-1.6.9.ebuild 693 BLAKE2B 9c679aa628f39b4fddc4141f10b26be3a01d2ee5fa477bc80e6eaf0891a5c2cf5815e5c25556b370b31dfcd6846973c45e6b56ce5b73d5d1ff64a755a00be4ed SHA512 5114bb518dd2bb22cb6a43d8425f20e14a13344d6e0a235a573dfe077e07e96fecdb65d79006731b7948299be0c8af5898d06fc78ee7905f7b7cc7a9ea70e926
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.10.ebuild b/x11-libs/libX11/libX11-1.6.10.ebuild
new file mode 100644
index 000000000000..64cf1376c979
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index dc2be2c9320f..3dbdae2e8f2d 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,6 @@
 DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
 DIST libdrm-2.4.102.tar.xz 408844 BLAKE2B f3a5ddb96130d175e860984412949713cd30145a3a9e453f666b650ec9b7eedb1c8e230aa7c5769331a330d833fdeba3da28b339150d81c17716a96935267178 SHA512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c
 EBUILD libdrm-2.4.100.ebuild 2120 BLAKE2B 97b0766f1a0b6bd1b796d4049891323c7442bc2d05f3f58bfab236d335b21c76c0cf4312702e3b0d57f6de3fae681bc3eeec97ae17e80a0b6783a11c23921e1d SHA512 e136099e103664353af667600f77f2bdeb8594395cc15f27a5e06b85f18ca28962ac81e955b886e0db157e5e8caf1b59c6ffe952d2286e5d3c9131d5ea9d71a3
-EBUILD libdrm-2.4.102.ebuild 1981 BLAKE2B d89bc564737a71dd7623db5f383af63388db976b819fb58cf29abaca70bea6f1e95197668535f3e0be0dd19882a2b830c7b1a4a5ec809087b1a6be3b651e269f SHA512 e23a4daa0afa888568223f06a8d57bc859947ec618cad475667b4c26168e4db8c47920bff180782737db653a588cd1fb09f726277ad744f7b6eb4e3cfbc222b9
+EBUILD libdrm-2.4.102.ebuild 1980 BLAKE2B 521ae5ff9a2b781e3fc22f089e4276a0f739bfae842e4379e3f332bdff0f6d0ff0a2bfe52d6346f3f4c6a81586878c2acd574441ca1cc43bab5db46353bde3ce SHA512 37b69924e37465600c6f48455646c3ca8fae6d0563581a0316e534a0671280c989b37fd9bd1b3d64c80f7655d21d68ed5a9b93f684dbdadca1d11deecb16ab64
 EBUILD libdrm-9999.ebuild 1988 BLAKE2B d8456210498cfd377691e05d37ef8abb1412de0f3fc871f7ffc4cc141a34a95b196ec843ce0939719e3d9fee6d6dffd46de6fdae4b6d1426235d591ff9268022 SHA512 9ed3335d53489a17d895493c948c7ae44ec645c07ea6b8d1271deb62203a02c8b38120d0a717c15de3e8061098a7ad57f5b6f2ee96ebebd06bdf37758975e801
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.102.ebuild b/x11-libs/libdrm/libdrm-2.4.102.ebuild
index 306010737958..d20191fc0514 100644
--- a/x11-libs/libdrm/libdrm-2.4.102.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.102.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	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"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index a60a3522c5d5..6a73fc8f207e 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -3,6 +3,6 @@ AUX libfm-qt-0.15.1-update-runtime-colours.patch 1921 BLAKE2B 6adc0a2fc8a807adb8
 DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
 DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5
 EBUILD libfm-qt-0.14.1-r2.ebuild 891 BLAKE2B dbcefdec629df0704f774e9bb62f4469edcc8ba402299a50f0aa96fedb620736ce669bc8f30f4b294ae858204aa7f43ce29052b2fcb83a984a8354d9b1dee775 SHA512 a5e69d0ef73ee74fe74217ae55b2937ca42d6b70d52abeaad0f47649ebf409cb0a03c51b81ab417c86842272735d10b15bd00e6853ea45cdc0f825e8079fb31b
-EBUILD libfm-qt-0.15.1-r1.ebuild 972 BLAKE2B c439999d322ec90b3bb35a8a61676ce3471a1decb3f70efc3bf1cc4bf2dbb3e88b1ccf0238ca5bd3f0dad9e78fe1a516c5b0e4e780953195bbc0103b56dfbf69 SHA512 88cc807873337f7eac71c5eee48d51572af07eb8964be5ea8f7867009fd3c636623c6da0c7039eac82f5781794b67cd51bfb81785fde7f8c40092796fc1bf598
+EBUILD libfm-qt-0.15.1-r1.ebuild 970 BLAKE2B 842346064e7a6964eaf3fae8cf4b067baf1b70c965b31abc694f6b2c949fef04e57368638ae7a9ca5a7268b6a1861053ad3bb9390aaa0f298edd267b3acb6ce2 SHA512 47189888a0ade9e0ffd7723e9f8065e448e2945ace6aee7e83177df955415209e5ab0ac0c6d777ea9d5b03797f534d7e18cfc844f8c7084d5fc184a08a072822
 EBUILD libfm-qt-0.15.1.ebuild 903 BLAKE2B 18b712e1adcf4cad1b8dbfd8c7466431c5fae102d285fb9d412688092dd7e30b54eef42f7bbca89a65cc0991021f66c1a7c40f0f7c1b414e7b452af1e2a4ef20 SHA512 3c01045c648f1fc33602e74a7fa8538c0144f8421858afa556dac933c41bda1707b4b62592ef98da2664778ca5f5571ffc2c4bbc25ff22cc325aaf9ea25253f7
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
index b820cada88ec..f7b601350e68 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.15.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 77a8a07f0ab0..c18dac540257 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,4 +1,4 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
-EBUILD libxkbcommon-0.10.0-r1.ebuild 1285 BLAKE2B 4eeda34a44e768d7a7ebff6ef9907490428f5ab87b164e0856e82e791c81fca5ea92b897f7497dfd6610f8a4cc54fe79973e6e64195fa4f9d3b2386ec8601490 SHA512 b7e6893f5426266326608203f0cb7fd5a76c152529222ad2300ea659429c24f926c7f420a4f10c01141bdc430ecbfa7d0cc9c360a593d62af842b12d82f39dd0
+EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
 EBUILD libxkbcommon-0.10.0.ebuild 1218 BLAKE2B 3b48076803a2d153b2ed82b24c28839deebf1de52d1ca2f1b830ffd774a0dcf4d29a8a5701ea3d7795d374b516fab4303225aacbd499cf2e9e15402a78d2c05c SHA512 9700d6fcfb3e0580d0e6b3c01d20b8778f5363f3b6bdd67e5014b846980786c7a68537ba5e71a177e5c2a3b05322fc28b46992efece09a1be62faeb04d81dbe0
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
index 8378ce88a275..f98d9ab2f2a3 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.10.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	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
 
 inherit meson multilib-minimal ${GIT_ECLASS}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 1f4d40dc8a84..495db7f0dd6e 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 3ea61890ca36..a24a1b4bda42 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,4 @@
 AUX appmenu-gtk-module 239 BLAKE2B e45712df27b6eedb02825008829f86651d0e9c19cb2eba931082306e89997070067042d1d9d78419015cd85ae9699e12fe32b8eeab6086c7a79ab80226870c94 SHA512 2442e2ff93a046ffaab801e3595b1062f0370b0a05d2251a85d6a94af729857f9703aa451b09cd8c5b90205a76d9892df39e035ea58b704384388d59e667ad66
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
-EBUILD appmenu-gtk-module-0.7.3.ebuild 1019 BLAKE2B ca23a5d9fb55bc57ec293fbc46e0df352c16761734cf41ecd5a72cae6216d86009c05c0ea9c2d2ed5daa80bb98311bbdf0a53dd7c7bd79fe7008b2f98d4e7eee SHA512 55b328ed6ed2bac8d4aece5cabcf7402aa1ee3a91af0a421cce9919f19233fd53b8fd8d87f279e4ba18735c92ee082ff360f2832901765b4f877d7fc51ab5c6e
+EBUILD appmenu-gtk-module-0.7.3.ebuild 1039 BLAKE2B 4dd6de022a98fe803165b37cdefc57f0caa6635152649170f2777fa11f93989a658887622944868bc6e743f52bbf01745cc20f74e06a578cf7c19a0553970cd2 SHA512 89b195e2ce0621295b25ca367f1ce92800cefca437ccf7af29974fc501406743c75110798bc1a9d3a817322a189e40fbd502dbab3207a13ea4785f4d75b302c1
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild
index 910fc6a8a1ea..ce784a6457b5 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3.ebuild
@@ -14,12 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-libs/glib[dbus]
 	>=x11-libs/gtk+-2.24.0:2
 	>=x11-libs/gtk+-3.22.0:3
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/wayland
+"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 2f003c31cf33..46850267f484 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,5 @@
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
 DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
 EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 20d540f25296788ccf5531abbeb7ad2d2537d25c0c0914c311df6687027205eed535bbee18c92348155b6c7cfe0970630febab9f7ac844ab1480674305228c70 SHA512 87fa3f6ce4915ab69164b7099ed5cce0212b5a6bc4f74d2d19464af8d276b827f7a70a49cb8059c3573dbaab920748899c6610ea080e48f98c230f9faa71c931
-EBUILD obconf-qt-0.15.0.ebuild 909 BLAKE2B 4f0b479af6c398fef0b881d336e869be225105b8bf4f2aebbafd827fa0c3605d21457b2589839c7532813ddbb2117e36c70dc4b450244139d9e0f43d9999e35a SHA512 cca31af52fb81a7cd8a3a326ae29cafe8b6279c573a60b67a4b73869383bf208119742d77cb943ad88e6748debb73d6e63455e77597bcd2ea43562887cbd0315
+EBUILD obconf-qt-0.15.0.ebuild 907 BLAKE2B a004fcc83626c5abc8673361e9ed2d0a34ce6cc6640b245b3312a2bc2c68be9ac8c208eb7d5ea06473e02f1239c3b4eb10a371337d2c8aa80b54357709e78003 SHA512 857a0b53d75f1e4c769096d70242471234f7331b7828f345c08111d01d30ea52bd262103c371e7f97d9e88fdb01c1bd0fc6a0d7b74e5f4dadbaca8e4073eb5e8
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
index 4979e3f9df38..82d22dcca954 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index d91561c811f5..dd66885858ce 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e
 DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
 EBUILD pcmanfm-qt-0.14.1-r1.ebuild 1148 BLAKE2B f90921c01860b426fc45a0bfbff8105ebe545b501294760b4aff28eed23b809ec5e6983d589929ece717a3f5868a1c1bd16ce071944f0d5ffed8ac37ee7c3389 SHA512 cafe1662e08f4213708a40d360a208087a313ed6f61996664ca55be2b96c88e4b0b0d25ce00415669a0d87d419e745e636b3e22cb05a209ddf7fbcfe57a37658
-EBUILD pcmanfm-qt-0.15.1.ebuild 1096 BLAKE2B fbb76574d117324e398eaebc432b75a5884aed76ca5dfda5f7885e05da6adc0ea64cc43886a5170e781a0db3ab54a96b33ecd4d04bb2c6984259af9c3db2b8a1 SHA512 be78ecf60902fb23d57f78834a97f1b6803b012eec2b2f891de1313b58bca943cad01a6bd55e4a556f4b51501e586af0932d248accde738fff3ca91525680a7f
+EBUILD pcmanfm-qt-0.15.1.ebuild 1094 BLAKE2B 5802b2a5d48d26162381649b5cce5b27c39d058f0d118774cb40df60943b7ad9884603b4686f98e887fa1ac55669ada6854559aa86f60af03cc53a9638952777 SHA512 750af0234415a19364512c36d7aebe844cccb6f8108123ba22f6d7673490b981ad6dbac608fb609f57921c5b06c4681c2e99f948dfa3a0eee9d4bc91eec7ed84
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
index 4852d019e3c9..ab092edeac77 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index f0a10b65a4af..3b69d733dce8 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -3,5 +3,5 @@ DIST qps-2.0.0.tar.xz 211452 BLAKE2B 9b8501f3e57939b33ea54daf58d84cf37b6b66a0c4a
 DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
 EBUILD qps-1.10.20.ebuild 733 BLAKE2B 414d9ea3e21681785e5d1911e8c51e2d840bd23b7b88578b836f6ef0010ae249aed1d445fea5e6fee1c85a0910844f6fe78d3ed846c4743042a669ba8cd1ed3f SHA512 f734a5219314d961c1ab6631e1997820bb5e6000ad7a1e0982b4fe33e3516c6f95f1c42a2cb0fb891e3b5a7c76dd0c90f47a9985ed0004f4d586b5dfd5c94361
 EBUILD qps-2.0.0.ebuild 735 BLAKE2B e0500670a8aaafd62cefb11faceb54123a0eebe49886f5f2e7813dd1016a5a03b2dc6d2bace95a519c99dbc7f3e5389a0b0f72996b911777493bd3aec3223ce6 SHA512 fb3c9d64dfc2badb8ec2b787ec33df6e886f560209a7f321f8d1be95d47b169afdc16c3d598b5d9c9bd8854d109b126fa058a62233d4321969ba6e8af75d0164
-EBUILD qps-2.1.0-r1.ebuild 738 BLAKE2B dcbc8b48c426fa17a06dd9d7e1aad24af119aa509bee3a3c7a2bcbbd5da382bf4f4afc21c5f070e83ae710204a4620a5ca2df1c39aca7c04063afe0410f70713 SHA512 41bcaa6cb338f1f2b396c94c91daa8b62bb33c7d86901145f6a2ed37e0c99758bc60c54230c01974e3c5d308f76f972c4b2998dfa5f37cff006b97114a7859fa
+EBUILD qps-2.1.0-r1.ebuild 736 BLAKE2B 282c784d62c5df1586702ddb2a509de2b28ad52282344212642925148da0f258b73bed5b7a893ff449dd7fb2c287bd1a9bf5bfa5b2f1f3813a5613f86019f554 SHA512 ef62a9d7080022a9abf89f36eb20a66e6a4dea0e681331a7a4849a1942486588ed42e85344b1b71b2fba80bb108898c39d579b20c92f756f4467bcb87a50d2e5
 MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-2.1.0-r1.ebuild b/x11-misc/qps/qps-2.1.0-r1.ebuild
index 0a414be68936..1b0b6adbf9e4 100644
--- a/x11-misc/qps/qps-2.1.0-r1.ebuild
+++ b/x11-misc/qps/qps-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index d70bf6f998e8..d59e4300bb14 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc96
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 EBUILD xdg-utils-1.1.3-r1.ebuild 2131 BLAKE2B a6d2abd3b268a4bbc14d5a5cd3c88c0ab4083458f294f8a09354f95947b1526f06659c9bfc36dee0d1c6aed7654d2edd5394e0435e57e837401e5e7b2a74fc05 SHA512 688c267446e41feda372828a0443f71c00aa2008b6626b5785eb0b7a94d8be589427f6fa0d709924c0446ab8cc3d7fccdbff580db2c3e1d17e2a5cd8fd926010
 EBUILD xdg-utils-1.1.3_p20200220-r1.ebuild 2043 BLAKE2B 8dc8262457045b2dd47940def122a1b60234c5ebb08647e11f4e9e6be0e207ba89857ff9d128a9e7e50eee11c4c15a1dec7db5279b9d3ca28d8bab53e8ce5c43 SHA512 368f075527b5dc34aa6f997e4ed70295626874f1ccfc0271ab40a9dec1c257247b0daec4791f49936f8de7e8e4fcb5bcbbd5b0671ed11649a234ac05702c1b1e
-EBUILD xdg-utils-1.1.3_p20200220.ebuild 1963 BLAKE2B df892f7e7b56272cacb68969ae4bc447e7e2d20ceb1082de3b728280c872ba1928cf386a177be018e2976760fda103b2274be32dfdb7f8a5ce3b9e108742fadc SHA512 9c20738b10d6f297b89c5b58c2a4e13edf6cb01c0655f77f86f5de68270cbeee9adf8b8cd123a650a5e884946db6c30e0815bb6406dd91e868e4b951f6ba85de
+EBUILD xdg-utils-1.1.3_p20200220.ebuild 1962 BLAKE2B bfdf80f1f1fa7f4db72e520fb1c1adde3c2428782fdbc1d2b65f62313d5340a5f34479d1c797557016fb0860e5e498b7dee8e99fabe8b6aab9a65e250779794b SHA512 75fd58a1eff9d18d59493a000edd5d351136d5730806b8198881abff4fda156dfe43d78d0aa5d652459dd496593e2da891bd34155c41ba03fcf127f2bcb06a69
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
index 10923364b1b1..92fa3be1e85e 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
 
 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"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 42f6af798ad8..8e8b71f2f9ac 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -2,6 +2,6 @@ AUX xkeyboard-config-2.29-fix-python3-support.patch 1042 BLAKE2B 0ca08ee5c3b82b4
 DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670
 DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
 EBUILD xkeyboard-config-2.29.ebuild 1395 BLAKE2B 5b12916ab898994fd013590bfe57ea2925310d251f8609f1995b9a64cf5ec4fc5f9beae49dbd2de9ee0ffed017d466c2f995487d32669e86fc149e4789c0bafb SHA512 c20621c807ffd9150558c0c2df7af2fde339045b695cca5f97f51da29ccb136a538b4125492f11617526c363d98fe496057edb5c8ff405130a5d7763d0876325
-EBUILD xkeyboard-config-2.30.ebuild 1337 BLAKE2B 7c68ed09b537419fc27f61f6a53061a61a0cc231c000d2fc25dadfa5967a437e89da21ee9e0029aec6b7fd295493ad49e029c8e34db0977476abfc049936bebf SHA512 4c655501412b4b2cdf68fd2c10077a6304a4f4133297614a312f9a78990b9f7757dfa737d52f7c71e034a6357bf5162e7a0110ac7fbb69b99e935d83f2d9e716
+EBUILD xkeyboard-config-2.30.ebuild 1336 BLAKE2B 37c5040ff351aba7f8aeeb4c3a59fd02263d4ddc9fe0bae39e62361dfe5b1e222a3cbf428086aea90c8367fef6163087d884b1bfb64c13e4bf5403967da5d298 SHA512 415f4f5347c8b825208375a5c5839599e352970a5532fee8ef18d736f17ad8c135907ac1cf5afb3a2ba2fbe0db63de050add2e5d3a761b4b5c58bbafb554a208
 EBUILD xkeyboard-config-9999.ebuild 1023 BLAKE2B bd4b25cfb97dbd822f4b2e06200833139dacf0c1e689e4ea50c7cd779a8b86d3e79bde1581bab7ea3fa55b205b7291ba255b1f6d2992ddfa2755327a4f33d5f8 SHA512 87e81c2aa3ab90331386369e160be599051e831c6ea59ecb0345e829b376acc4f820aad418020852431357bd470feea2999fbdedaa8f0dee372a792fb23572a8
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
index af4d98c3a435..8d68c4fd0cca 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 2aba509b8a33..0a2e896c5f0c 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,5 +1,7 @@
 AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
 AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
+DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76
 EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
-MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
+EBUILD xmobar-0.35.1.ebuild 4193 BLAKE2B 4cc95a1a3740458b337f8fe3881b01c799f553b42f4d4bad4d72bac8433ac1d006676c75992cd7ba7157cd6d80fe0bf008004e171c61badd42e9c20a0add5e40 SHA512 da52c03e62bed40b886adfec53e7ade451c4865bab4233b00a191a452241c0a5c81ad81e21d23d50fb7792ecbb714c23341cde38a9af070e77e5c5f23879e6cb
+MISC metadata.xml 1541 BLAKE2B 25764867ba7aa8e01234baf9fba704bd28354a251775f53f4aebac5eaeab3d2c758fea53beeaa80b87096e15555aaa7867b1a6436fead8ed54de3dc3d84a74df SHA512 910fa9e26f97f950c920b01ecb1de35c21933619f2c5a416dca4afdefbfe5a8939ac5d92c664772ce85ead5797a7f08de548e9f55e8adb03ab1288a75b7dc296
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 69dba3f2e452..3ecfd078e089 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,11 +6,20 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
+		<flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
+		<flag name="conduit">Use conduit to fetch weather data.</flag>
+		<flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
+		<flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
 		<flag name="mpd">Support mpd plugin</flag>
-		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
 		<flag name="timezone">Enables localized date support</flag>
-		<flag name="conduit">Use conduit to fetch weather data.</flag>
-		<flag name="uvmeter">Plugin to show UV data for Australia.</flag>
+		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
+		<flag name="rtsopts">Reduce process wakekups frequency to decrease CPU usage</flag>
+		<flag name="uvmeter">Plugin to show UV data for Australia</flag>
+		<flag name="weather">Enable weather plugin</flag>
+		<flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux</flag>
+		<flag name="iwlib">Wireless info support via Wext ioctls (deprecated)</flag>
+		<flag name="xft">Use Xft to render text. UTF-8 support included</flag>
+		<flag name="xpm">Enable usage of xpm for icons</flag>
 	</use>
 	<longdescription>
 		Xmobar is a minimalistic text based status bar.
diff --git a/x11-misc/xmobar/xmobar-0.35.1.ebuild b/x11-misc/xmobar/xmobar-0.35.1.ebuild
new file mode 100644
index 000000000000..50130b0d928b
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.35.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://xmobar.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/parsec-numbers-0.1.0:=[profile?]
+	dev-haskell/regex-compat:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
+		>=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] )
+	dbus? ( >=dev-haskell/dbus-1:=[profile?]
+		weather? ( dev-haskell/http-client-tls:=[profile?]
+				dev-haskell/http-conduit:=[profile?]
+				dev-haskell/http-types:=[profile?] )
+		xpm? ( x11-libs/libXpm ) )
+	!dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?]
+						dev-haskell/http-conduit:=[profile?]
+						dev-haskell/http-types:=[profile?] ) ) ) )
+	inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] )
+	iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?]
+			net-wireless/wireless-tools )
+	!iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?]
+				>=dev-haskell/netlink-1.1.1.0:=[profile?] ) )
+	mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] )
+	mpris? ( >=dev-haskell/dbus-1:=[profile?]
+			!dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?]
+							dev-haskell/http-conduit:=[profile?]
+							dev-haskell/http-types:=[profile?] ) ) )
+			xpm? ( x11-libs/libXpm
+			weather? ( dev-haskell/http-client-tls:=[profile?]
+					dev-haskell/http-conduit:=[profile?]
+					dev-haskell/http-types:=[profile?] ) )
+			!xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) )
+	!mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] )
+				xpm? ( x11-libs/libXpm
+					weather? ( dev-haskell/http-conduit:=[profile?]
+						dev-haskell/http-types:=[profile?] ) ) ) )
+	timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?]
+			>=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] )
+	uvmeter? ( dev-haskell/http-conduit:=[profile?]
+			dev-haskell/http-types:=[profile?] )
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(cabal_flag timezone with_datezone) \
+		$(cabal_flag dbus with_dbus) \
+		$(cabal_flag inotify with_inotify) \
+		$(cabal_flag iwlib with_iwlib) \
+		$(cabal_flag mpd with_mpd) \
+		$(cabal_flag mpris with_mpris) \
+		$(cabal_flag wifi with_nl80211) \
+		$(cabal_flag rtsopts with_rtsopts) \
+		--flag=with_threaded \
+		--flag=with_utf8 \
+		$(cabal_flag uvmeter with_uvmeter) \
+		$(cabal_flag weather with_weather) \
+		$(cabal_flag xft with_xft) \
+		$(cabal_flag xpm with_xpm)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc examples/xmobar.config examples/xmobar.hs readme.md changelog.md
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a27d49aae2a3..a7bd26be0810 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 506adc158f71..4ae689d5df6e 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -4,7 +4,7 @@ DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7b
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
 DIST alacritty-0.4.3.tar.gz 1488401 BLAKE2B 0c4b622ec2dfbd45d4e3e99f6c83b0c0cc798cdac1b72d828e14f06242cdc796c29d78317c11e41126cad0e81677e1be8c7ae0ef911cfd3afe99445b4a1c73ce SHA512 1c1a50098fe7c2dfa5fc75e5fd2632de0c60d8ceba5316de15910a9ece7d5385ead765075b87c5154171a908e5d7c78f519d3a2991eccb313aae766208007402
-DIST alacritty-0.5.0_rc1.tar.gz 1524504 BLAKE2B 30eaa7b65cc435d5caed20609280dba0f87ddd155bebbdb32de07f2a16cc2dd47375a0ac251f64059943569a97873cae662c9ab14bd829ad85cc5b76b5927053 SHA512 be08b13dcb274bfcd9bf64711c1d01e134233f9b89aa401c4e9f0b844e69169dffb337f270c51bdfb8b8969270cec25d5db888ebf283150f3ba59b8e4dc3262e
+DIST alacritty-0.5.0.tar.gz 1500418 BLAKE2B c6f727c1d13ab6e831b0b434ad821045c6045f791ff35cbdc93f629dae945adeaba58485d8dc4f6655a7bea6de3cd8b6ed6002827dfe6a8825bd5f255ddb21dc SHA512 53ecda7996473890eea90b01b3f71c32d07abc38072dbc40ef3ccbc500a747af866e5b5aeea0ae0b85dc17e0b3c16fc9c5e3bae1a0d0f9a88c5ac264f51af62e
 DIST andrew-0.2.1.crate 9595 BLAKE2B d2cf73285889aaf702fb994fd1d5a1011e0f78011a612937ad9f06f506ef75c86fb82ee1069a8f520b926325a4363d83863234e1fd2a2fcd08ead5ff66b638c5 SHA512 06ba5a756e0d84953dcb1cd1714d1639e67e836dcdd92f5f77c2b35a2afdf0b0babcdf598e2c5cf2dc8661c8326bc27b1ac3c9963a5fcbc2e0c753da6ac730ea
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST android_log-sys-0.1.2.crate 5806 BLAKE2B 354e1a8fd046a0a0931752876560bc7fa720524d20715f5ddb49b80589dc0cf6a23fb13a9cbfbb3a7a823de90f76f6bdc336304d028d8857da2a4348e8483cf7 SHA512 36bd43f2aa244ab085a8addc972753897c7dbc66a648981cd20301f3e67f097713f2397d3bb7011dfac1f60742804697ebab4070346351380fbd653b4b56cbce
@@ -58,6 +58,7 @@ DIST core-text-15.0.0.crate 15538 BLAKE2B 3cd535a4fbd367ef9208877e640d00c445e0ef
 DIST core-video-sys-0.1.4.crate 10568 BLAKE2B aef062d1b1047d50d02e932413c7d24cf316d5b1d6947895ec2face253d26adc75811c4fb60535a35c2a0c87af6d3bb7b9e62dfe5421ee218356126a2a6c3bb7 SHA512 a6d3b0f78aebe7b64276f3accffb5d5b2ff23a19b9cb3dcf69a47b310098de8c85255c579cff8a7a711304c1f19b9fb1d8259c5eb511b617faac0da53e417bf2
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossfont-0.1.0.crate 26292 BLAKE2B f658437c4c3877ed5a51b67f5e1b7a2fd06b19d824137296d04785d3922af22395df90b33ed760b3e5f93f357d0ad296984c16d1ae15c7dab6dc9e5fdb33840a SHA512 1ebd82de281b704dc2d59452534eeb591894238883ec7e33c45191a463402314c6b16eb5d212117c17cbfdf64a65e49b7e7046cae59cc1eefccc6b1a94078aa3
 DIST deflate-0.8.4.crate 62021 BLAKE2B 2127108c8c4b0e15435e39965219d7615ecfb24623703ea53bde36e5a70b4678549d959fffe090083726e6e159534402b4a78ce08a054697969d8d361134321a SHA512 994bbf6720584b96987a32a0e391e4c0d173f19ed0e6d4a8011764729e85260926ff6c03b44fd7f058474360e744af635dd171a2270af3e18b28c4ec20d640c6
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
 DIST derivative-2.1.1.crate 45571 BLAKE2B 7da3a10e734522cc5df0d40a5da54d5de3c799b28e016442ac88038a18a8b3c8dc30c33077510a4fc3155be9b114a9314e9e5fc2c2eb7c3b35e3380570c41de9 SHA512 a9d2edbba6cdca7980445d8b00180cdbb377830acbf3be371ee9ceb5d8f3a937a02f346dd2a3a49bcd3b65d89ec1c71f78f4d125afe020f82789cafe4120f5b0
@@ -344,6 +345,6 @@ DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030
 DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa97462dd201e05877f60fd1bb6f88e9a219bf96063f0716d2246629dac15f802305ea9188d02e61634e5 SHA512 d7f32cba1de57b62546316f3ce81f24dcdf47287555294ca61470d14b61c11f1347c22f2d51df55d351e910720c0b12d1196164964232c9c5fb349ab2630a6ff
 DIST zip-0.5.6.crate 33064 BLAKE2B a14d64b109ddeba3a86b254c6c0ff4b50908d96cfa7b0bc826f292bb7c5e5b58d86c523c1ea630fa93eb9a804e83ba11048ce1cd90c0c0d1d014645d4b47e728 SHA512 e78ccef45715e49228443324057e94046ebd4e0b992f4d91eb680263a7d71aed931d19dd45bf0b18f8a9507a4716cb2f3c7a3888fed0b9a6fba3e65e74125e90
 EBUILD alacritty-0.4.3.ebuild 6874 BLAKE2B a4dee2ce28666b59a8954e5ad34f4bb1a538e3d0ff93dbd67e530a03c0d70dbb8f2ad80be607fe7db84455a10c57fc94d4d36992ed98f0c326b1485cfbbd8341 SHA512 bd2143219108e242c17e88e2e296da057e73404b052b00f7704bfad6b0b53d2608447e91fa8fbc39b94b5e9eb55c2bd04e1de9bd9c9f8c094669e66fbabb7300
-EBUILD alacritty-0.5.0_rc1.ebuild 6851 BLAKE2B fccc246b3ef4321469447c8220d8ee9fcf8e44e89b01bcc8c0e2d78f644e61fb25ba4bb235afa81b9757b92c6329a4ac1959e006191301b6702ff8e333cc144a SHA512 b3d31cb4015905d0fab8125092b44b5e731f49786e125b914df90a0b92fcbd00999a9f06941e7a76b1c6a07b030c78fbe34c16b055661204400f24d6b41d8165
-EBUILD alacritty-9999.ebuild 2463 BLAKE2B a0f535a92631cb4e4d2aebfb942d8679d15c51188c09927271e13af8fd121e0b9f6feb3aea9e647ef544519306b7055bec1c363681e1fe1146e3f260c88cea37 SHA512 db81093ce08f4fac3502db8b68db722f58037d65720202b892b080191962e1a6eb9a93c0e343a598af2d96faf6ac088e5637035101a95b206fdcbb8d0c77a1eb
+EBUILD alacritty-0.5.0.ebuild 6874 BLAKE2B f4a53772112188f27ae3eeacfddf2ddf05dafd4b9d3b5426ccd36fddbe422beac94b6f0599f3160a1458b67e26032339f935e0ac3bb0e8a9a0a383f8d6085c31 SHA512 deda232de183a5cc563ba7a29d384f9c64f1d939c80db2fa149b2fd985a8771972b139d73fff97809c5e9e518df2110423e580a5abefd6b1ff00a466c29aa10e
+EBUILD alacritty-9999.ebuild 2470 BLAKE2B cd1539bdb81d185814754f30df2759a9b88700366a832a906926dd42875ca1cc5235c4cd6546d21d5ab5f8b854092acac983d8131bdae26e3c454fb3fd0a41fb SHA512 6deb19f26d31b08c438e1cc64cfaa8b4d5867cecd01c430014cf7f8e14521719470b08cfb2c51199cf60a5dc12e55b2e2ddcc510b7ccdfc1ffceb45c91cbd5a6
 MISC metadata.xml 818 BLAKE2B c62fb819b5572cc2cfb89ed412cf4edd5c527180997b4cc0a288c413e2f5c04e16f23e72ae6c30ca216bcf33feb20b0b9a762aa4823412b0faa5f2cc7b9fbdbc SHA512 9073045732d5dc09b58766d3c546344216370ca161c9f25bf7f0679913e6fd3816d07de92773df4b5fe3a13b67522f02f2d3cda5b456ddb498e7ca902fe286d1
diff --git a/x11-terms/alacritty/alacritty-0.5.0_rc1.ebuild b/x11-terms/alacritty/alacritty-0.5.0.ebuild
similarity index 99%
rename from x11-terms/alacritty/alacritty-0.5.0_rc1.ebuild
rename to x11-terms/alacritty/alacritty-0.5.0.ebuild
index fec063cefd82..f473bf3a4713 100644
--- a/x11-terms/alacritty/alacritty-0.5.0_rc1.ebuild
+++ b/x11-terms/alacritty/alacritty-0.5.0.ebuild
@@ -47,6 +47,7 @@ core-text-15.0.0
 core-video-sys-0.1.4
 crc32fast-1.2.0
 crossbeam-utils-0.7.2
+crossfont-0.1.0
 deflate-0.8.6
 derivative-2.1.1
 dirs-2.0.2
@@ -277,7 +278,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
index 8be42023f106..25fe5e7ad923 100644
--- a/x11-terms/alacritty/alacritty-9999.ebuild
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -21,7 +21,7 @@ if [ ${PV} == "9999" ] ; then
 else
 	SRC_URI="https://github.com/alacritty/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 FTL ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 52db46a101f3..02f24bce7085 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 20c2c7f5b4b0..344b25969caa 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -2,5 +2,5 @@ DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3
 DIST adwaita-icon-theme-3.36.1.tar.xz 17247020 BLAKE2B 51461ff3058f413cacea9b7ec76bedd13e7adc38fa2aa9a80e84718f371463d9cc2b2be80ef10e375bf670658d184680ecadc7f84089e8b5ee09a39bf9fa1924 SHA512 5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1653 BLAKE2B cdb2f6f32ff05764cf1565dd791a542bfcf5feedae2e6c74d302489a4dd1052a23d7ae5bd151eff5c18ce77ac239a3c610e13780221859f0653f2f8aeb7d5afe SHA512 d23d394b6bf1d6897dc9f58cac0cc8bb0113dee3b22a99843065391739936cbf36ee115c15dfcc4bad5b3339e67d35f53b04fdd7ca257162dc2ee8cc103f0a76
-EBUILD adwaita-icon-theme-3.36.1.ebuild 1580 BLAKE2B b04149ad14757fb157b053caa154b284a5bee5beb18811b314cc45380d6393b80063d692f0566455daae8e9b939be15c759104bb821b13e6537ce1a5707467fa SHA512 15d2b59d3995d86eb83f59bcd94572af6a819fd0bb47ac5509d23cf96b20632fa2fbfc80c49b3c9e997e8fcd621aa92ff03fbddf14623d0398f3ba5fddab8c89
+EBUILD adwaita-icon-theme-3.36.1.ebuild 2032 BLAKE2B 40c3e95e62ef14082181c780e595ef3742cf117c2de78ea212fc2f67ed352f7757723ebab09ba555043a0db2f9632c0160791550e2a8bf97ac627d0ec62f78c9 SHA512 fd98e04c504a83f07a73997d78428d578f15a91bcaa415afc5576a746d70154997c995bb818e4897d11b21c96a783bd1d2fa1e3930c8798146f680e9ac60ee5b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
index e203c8b52578..8628545b95aa 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
@@ -51,5 +51,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# less than 2.45 being a problem is just a guess, but we didn't carry anything between 2.40 and 2.48 in main tree
+	if has_version '<gnome-base/librsvg-2.45:2'; then
+		ewarn "You are building ${CATEGORY}/${PN} against an older"
+		ewarn "gnome-base/librsvg, which will result in various broken symbolic icons until"
+		ewarn "rebuild with newer librsvg, and misrendering of scalable icons at runtime"
+		ewarn "until gnome-base/librsvg is upgraded!"
+	fi
+
 	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
 }
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 6ab70a9b837c..eab3ba0a3b63 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-themes-0.14.0.tar.xz 3203820 BLAKE2B a8fd0e77f3c6844f13755bd5c6e0e48c194475c082cbcf83b3999e120f548f457293cc0bcf06cff2ab38ac4ddf54346cf07abb80d5f5f326eca5c5a6baee45da SHA512 622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2
 DIST lxqt-themes-0.15.0.tar.xz 3203876 BLAKE2B d2c1c15c70b3a90fec23287bdaa9eb31375a23257376e575572769faf91d27c79e5f0ea868bcbcde29964d4aa52d6eea355e82d63076e4ff7e558d9f2f98d06b SHA512 7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d
 EBUILD lxqt-themes-0.14.0.ebuild 537 BLAKE2B fec4e01a8cbbb95f6181cc0530c1fff7faaa4904e62bd6c07fb958acb9b596b06346012d27f3c5dad2341267bb780ae3149e36a5cbf43fb972c913e35756d57d SHA512 f807304153c6ebc4242d84ad377b791d0e88b4961acd1c710697f5de667c2989ba933201e8ce3eaa4cfe5280f6777e94563c93057ac1840736c36405c20b183c
-EBUILD lxqt-themes-0.15.0.ebuild 490 BLAKE2B 74d5e6bb75cbb82ca096b80adb5f3e58178fe152ee02ecab44669998ba2e3660936bb273d412fa2a8c7f15686a404f1297b42f5301c4a8f5441457e948d16bd5 SHA512 224f2ee45bb9e5ed970b76faf35d8a86a7121c8e75b240a7578b9e88715f894d055e560e02122a68deb3041f0663c01c75de7004a5fef71210d90dfa4b2fbabc
+EBUILD lxqt-themes-0.15.0.ebuild 488 BLAKE2B b418b28e292f750614e6d87328930f4e3a5b323a72799e31a2dcdd9cc41a100ac5922ed9ca289f4650422d52f190d2a5faf8572bf84600dc1f05f274ca99c8f5 SHA512 3e5f70757db20cff99be8873f6e367911c4e6ca49d1fd6b13dcf41ad9f07a5511ad9b57f36e9cf9c3ccb17f3f67a86a5cef0c5e3f5523aca7ea554cfc0cf712c
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
index d241792f75d4..8b5cecb8fc2a 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ee9c34619482..d674c9d9013c 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 32cdeaa686b1..3c1b5397f7e2 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,5 +1,5 @@
 DIST twm-1.0.10.tar.bz2 287094 BLAKE2B c84d26119c2a9ed1b6482dc35a421e3d745af506d2faf6dff1027aa84752accc32ff6fffba0e9e8468bfd583bee17c774a88960fc4c5268e82b69c4dc6ae8e81 SHA512 1280683fce7ebbf5670239cb1f3cee2b40612bd9850d98827e793cf8bf298bdb58e48387cab943ea6befc6f7b34da2567353c22b8eaeb8bcf1b9e303cd7e6a9e
 DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
 EBUILD twm-1.0.10.ebuild 440 BLAKE2B 502cc0b610b9264d479c1c9f32c77f21202e191650c38f3af04471cddb917783105e0a38ecb4997780eb9067a4a7ec1dece2341970215e7bc3d47e86f6d8f27b SHA512 b50d158ccd60a9547056324b61fb38f0b3f6085a4e533984a25395c123cc9023f01b84ff96639ca311f0ff7d5e0d34bd36a9da51f39290a2331ceaadcb9e7bc8
-EBUILD twm-1.0.11.ebuild 562 BLAKE2B cecbb9ec6c90765f1b536e539471b3b13fa0668c5f39b561efede2ee995e47a63d0b2e20a0898236a07c46593200d7535144db6e8fb175a48b7c45b82dbe4e89 SHA512 9e003b4ea8c1238d0058e84e8c8bc6781a43b8257a7226a0c1c1b50f0fe39561c57b111377f8b77df296be8e8a02060a8ffd1f6c075e00007460ab94784a0add
+EBUILD twm-1.0.11.ebuild 561 BLAKE2B cf373f1576c973a1ef087ea16498bb1b12db59da8d8938e1f2b39d376393a0beda440f8607d2540c9f5a8aa49033f888ce71882ce80616e44955df3e0caaba73 SHA512 b1fe7bb9ea02a45671a15edc9c172394e7376a0cf83c229c08297356a4c2b3bffcdbed1e90e5ab2f804b35f9b791f8ab9442482ebc39e353ca20ff044a246095
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 1e44df7555a7..962cea70292b 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-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=""
 
 COMMON_DEPEND="
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index a013161fc6fc..275e2c2ea0ae 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 5c8a28a209b6..7d264495b7ea 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -2,6 +2,6 @@ DIST xfconf-4.14.1.tar.bz2 644804 BLAKE2B 1b04770fa9b3f4901f561bc3978dd7ffdbfea9
 DIST xfconf-4.14.3.tar.bz2 591432 BLAKE2B 9722547018a6db7132bad53b750ec8bd66b2f5dde2348b605bf9a6ce6a7d18fefbfb16c31f58c1c4e6c593d3f0525c3bd8231b4bab0728bd64f91d918f0a6c23 SHA512 e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713
 DIST xfconf-4.15.0.tar.bz2 586244 BLAKE2B 0bc6331f6a00d9328b7d462da1bffd0aa57b7b6e5a48a6e9d05d43993910fe1a3677ca33ca2315caac0528087e61a66e574118efd6c9ea5fb2d068cc843532a8 SHA512 3d36881a5d4a8b514196905689f32eed0da49c642fced38c57fa9260013e2efc0ce83de502b91c5dd07734dd99c2521f2cac00b43d3d76141efe7eeddc03c5c7
 EBUILD xfconf-4.14.1.ebuild 1949 BLAKE2B a8a3953b1c2625ac1e2432217ddea0e7bdae9811c1770ea7f6b24d015ce1db9776e5f71cb591850babe297ae11366ee60f06777e3eaf510fe15b65974817632a SHA512 794c36200e9a9a7d6e41a54d8b8c1daeb6c1726acf3cf3a003740efc35050b947b06ae2832c4c206f29921707a2a6d8bbb978a254490b7cea0e33fb52f143579
-EBUILD xfconf-4.14.3.ebuild 1967 BLAKE2B 107d3d8a522f0288ce1e4aa891b3bfcece990374c748dcb87362f371cb904b2a4710b0fd7309e291092ff0e2aeacc7e868d47d141e5a93c5487795c871f63802 SHA512 9addc0c54870ab55b367b10b4792e132355eca44079bd92030a67ad1f448bc109c37df93406525e9ef334a840769fcde969a8197b3d0b4abe6c0c6d99864417e
+EBUILD xfconf-4.14.3.ebuild 1965 BLAKE2B 18767591e7885e1acdd106c6c8393e5c99353802615adafda332fc451ef868671a123f3b7daa483fe6c0c0cc50011a36681c4806c3eeb53ed172308581f46ef3 SHA512 7ac591456badf8ad1f881be02dcbe5fd09065ef1aa61fabd89256390b1975764215d7da6b75c0a2d02c3972bd686ede9c8510891390b13850dde82d23266cd55
 EBUILD xfconf-4.15.0.ebuild 1757 BLAKE2B d09f4c9976687074b31d77ba0afb7a032239be697cb1d4a2f772b6986faa1da82c27151ffae7b6dbd72129274113c33598a546cc36a0d9e9b383ce072b84e2a6 SHA512 5eb83f862e7c62d8e1e67f7cb460ec616248f350033fc0eabbd1fc752e136b82e98c3e4b7d87562a2a255232d6db55c3cd740ec0ac83c63df42f7d6b7d151664
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.14.3.ebuild b/xfce-base/xfconf/xfconf-4.14.3.ebuild
index 6aff95a8ec5f..497831d5927e 100644
--- a/xfce-base/xfconf/xfconf-4.14.3.ebuild
+++ b/xfce-base/xfconf/xfconf-4.14.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug introspection perl vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index e92c33e6bdae..97b321926c13 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,7 +1,11 @@
 DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c SHA512 27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
 DIST xfwm4-4.14.2.tar.bz2 1158799 BLAKE2B 87270997688a44e1476935f2158842999befebf18628f6cd92131d81beac2f0a91db0a6522f86340688285fd67cf48e94259bdb2e4ce8df567eba83319bb31e3 SHA512 9e28f7782ce6c1734f9a50efec75d4c03a193bf078fd29f42c11770cef134c4516c256cb9c4b92a71bbbbfca81f37ba0ce19477831bb1da858c839135005b8f2
 DIST xfwm4-4.14.3.tar.bz2 1164653 BLAKE2B 24db309df708164bd0554fb96499205b4f1437023c014d571ba86f7419e09e23ffdacbf31d3afd05b7bd4f4e8e88394cfe34ec233518078b88eb8c0c640b8af7 SHA512 eb27c9d540a4b1d773f31c16dd8e7e4cd8fb833514ecc62251c68b53e88440beccb4923c49c66a29b387c77e2e69cb36e83d0a3d457ef8e7fdd5d2b925fdfda6
+DIST xfwm4-4.14.4.tar.bz2 1164972 BLAKE2B 5bdf4837bd19708c975d6400750059c5182b9d1b1a0b7b30e8721e1c443d9f78c1ea1c868ad7ceb384e442b94139b89d50327dc6413e938348816a311cada2b2 SHA512 ca3c94d1835076b904aca9f531dccebd9d78a1c85e0f7af7ac7aaba1a067e0f11f5224bdc20dc233038dc752ae1ac85602608c168a4d91643ac7538b448c04bf
+DIST xfwm4-4.15.0.tar.bz2 1179779 BLAKE2B c12ec365218b8afda7b01706d4f2822b4663d327aad482e89f8c8b2811b687594c6f58ea0b5be79eabe3771c125edb111c3b03a708dcfbf720eef993181b0e14 SHA512 8359c8e9414bc7a66a95c4b9eb98da7a3ba08c0e15752c2ebb4a569f9afcd50697d37685c786d6a4c23f1bfa12f8782293923fde309c7d027cf66dd4db44340e
 EBUILD xfwm4-4.14.0-r1.ebuild 1639 BLAKE2B 9ce4b689b7edbfc708a47fe45f3fa7aad4e5f65b148045edfd1ccc560d40a13e7f1294db936b93fd0759dda92a022662e0215ca4d319a63e088a693e857514c8 SHA512 81c8a383599a5f1c0ca0e39ff4e1e2bc3e785b0b5c553746cb268d4150d7070d42ff7836abdd6a575260c2517180e2594b61d8f5a343e54f19a9321d09bbd692
-EBUILD xfwm4-4.14.2.ebuild 1642 BLAKE2B 91d4a47035e35fff4d343675479db73ba1dc6bdf8f6e8bc8c656d88985cc5196daad22ef4734c5575e98be1e5700bc498b0c6adf44d9683fbcbc7c0c4633c436 SHA512 586132607248da7132ff43920b7b9306224e1410df467834b8c2347abf5a0d8d929870ee84ce109e6493cf6b4d1ccb25d26af249afce88ae90bef9697a26aed4
+EBUILD xfwm4-4.14.2.ebuild 1640 BLAKE2B 3b3216f6a1cc7e8480d710d0493229597994633d73a70453874646fd9f99ae286f67fdd358f83985992ff676d38fc20679b6340e14ec61125a385e6fc2f3a828 SHA512 dde9d58f0ed21c21b3818174140585687cfd35c4e7f0bacd826d2ce5f66c79ae6983676605ced0a059ebf691d4c9d647d5c799da2a6edbf1bfba5d48a075d237
 EBUILD xfwm4-4.14.3.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.14.4.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
+EBUILD xfwm4-4.15.0.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.14.2.ebuild b/xfce-base/xfwm4/xfwm4-4.14.2.ebuild
index ad56b0c6dea9..c8500f46d96f 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.2.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-base/xfwm4/xfwm4-4.14.4.ebuild b/xfce-base/xfwm4/xfwm4-4.14.4.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.14.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/pango
+	>=x11-libs/libwnck-3.14:3
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
+	startup-notification? ( x11-libs/startup-notification )
+	xpresent? ( x11-libs/libXpresent )
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		)"
+# libICE/libSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable opengl epoxy)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xpresent)
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.15.0.ebuild b/xfce-base/xfwm4/xfwm4-4.15.0.ebuild
new file mode 100644
index 000000000000..77ed670eb91b
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.15.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/pango
+	>=x11-libs/libwnck-3.14:3
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
+	startup-notification? ( x11-libs/startup-notification )
+	xpresent? ( x11-libs/libXpresent )
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		)"
+# libICE/libSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable opengl epoxy)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xpresent)
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}