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 53f17c429cf0..9388c6185a69 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,2 +1 @@
-DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
 DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
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 62f2cd9372b9..1f34e45b0712 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,6 +5,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
@@ -41,8 +42,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
@@ -56,7 +60,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
@@ -64,6 +70,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
@@ -74,16 +82,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
@@ -123,8 +140,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
@@ -138,6 +160,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
@@ -173,6 +196,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
@@ -183,6 +208,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
@@ -238,6 +266,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
@@ -274,6 +304,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
@@ -299,6 +331,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
@@ -332,6 +366,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
@@ -402,6 +438,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
@@ -461,22 +499,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
@@ -533,6 +581,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
@@ -550,6 +600,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
@@ -570,6 +622,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
@@ -585,6 +639,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
@@ -602,6 +657,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
@@ -629,6 +686,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
@@ -654,7 +712,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
@@ -675,6 +737,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
@@ -683,6 +747,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
@@ -708,6 +774,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
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 95a51dd7fef9..5526a34ad4fb 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,3 +1,4 @@
 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
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 4ef051351805..629f144fe4bd 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1 +1,2 @@
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
+DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
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 ee2bc98ebee7..9dbe02e8aba3 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,2 +1,6 @@
 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
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/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/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/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 bd2570916a26..d0024070cfb3 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
-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
+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
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 177e05820905..c3aa6c7e2f05 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,2 +1 @@
-DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
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..1592a12e7dcc
--- /dev/null
+++ b/app-dicts/sword-GerAlbrecht/Manifest
@@ -0,0 +1 @@
+DIST GerAlbrecht-1.5.zip 1020277 BLAKE2B 0a94e8a169b61ab977b03d4f58e64fd135735fdb32375e5de4cfab3260d302be11585f8f5273ef914a2b3577317c549857ff3abbfd0ee33c94d10a2cae451920 SHA512 8ec94b998dcd5e16064958e388c3cdb7e19f747f924827bd8a03275c2ab17078038cc7ffb2d172a1c4eff2cb76c66e2cfd84136dbb90afaf1fcf4fd23e421d25
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..65863513e3e9
--- /dev/null
+++ b/app-dicts/sword-GerAugustinus/Manifest
@@ -0,0 +1 @@
+DIST GerAugustinus-1.5.zip 254435 BLAKE2B 2ac9c0236d2cb5c55b09e4f4b8f81c38f307e18af487bed2010995f3eef206282235b4c38142be4a4ec317eb8d9100da934879c44f605538d3277c87ae08711f SHA512 1c68cf5df559533801a2516f6b4eb740e54c370e403f5a11c00a3b5cdc79e742e3e65a9b9ae696a526547e17a4a85362d351996b4bd45df4205bd22149007674
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..f8e4ffa9a0ac
--- /dev/null
+++ b/app-dicts/sword-GerGruenewald/Manifest
@@ -0,0 +1 @@
+DIST GerGruenewald-1.5.zip 1596123 BLAKE2B d5c6d4b7cf83002b98d83c3ac7f2baa9dd983ff0c23c1d505548f481c2302fc184329ac9186d3016710fdd9d05d3038fa58c133d522813249b84f8b8a6472ab3 SHA512 c1172a5737a5aabefd341d1305c11bc7e029457903ba3719ac4d05c0d927b9392e4c9fff3770847834ce123dd29f9aedf4357eaa8bb13d978a2f8f25ab56f67e
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..dc5272862743
--- /dev/null
+++ b/app-dicts/sword-GerHfa2002/Manifest
@@ -0,0 +1 @@
+DIST GerHfa2002-1.1.zip 2215852 BLAKE2B dd159ccd4019dfb3aaf3d6c67cfb953795aaeb95cd6f324f87cd5d5b78caa0cb76fd8eb191e4aabc94c1b0ca394bd6049de74949272daa95a709277cf1c3fbfe SHA512 2fe2f0f05401ee27ed81bad978e641997a89a32ff4393c51476d106cafe9697751ea3bd885d41d8d7739801ac16be391632a20fc70bc739da1a5ebd1d869d408
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..9936c5b2b02e
--- /dev/null
+++ b/app-dicts/sword-GerHfaLex2002/Manifest
@@ -0,0 +1 @@
+DIST GerHfaLex2002-1.0.1.zip 45837 BLAKE2B e4f16c3284a0a58fc503d1b8fb3b6dc23a25a9b50f33eedd38d8eaabff258defc3365cfc5944fb1a4b6a88088726108a3f570da78d6ff55d801cdc279472d09a SHA512 5793c54f66cb6ca13393aefbb87d687fc2c34a5eabf17d38a8d426e441c7e8b72cccdd32d579a670ad23d742c922135c6cce58039e28a3ffb3fcfee4ab0c9c8b
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..cff5944d44a8
--- /dev/null
+++ b/app-dicts/sword-GerLeoNA28/Manifest
@@ -0,0 +1 @@
+DIST GerLeoNA28-1.2.1.zip 1583052 BLAKE2B 6b79fc1aeacb051abba80c15313b42acaa83c4838a760355baac0cd6ec1203c6b47cf0384353233048b0557068768db17a851455b11e281279ed75aa4d46d7ad SHA512 1b825626ebb259e796dbb637c52305b35fb04de26ab58a32747d6984196226ba7e84577cc4138875bcf74eaf7f52cfd7c723df197b086803d3f0548b7edb6b81
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..959794e9a876
--- /dev/null
+++ b/app-dicts/sword-GerLeoRP18/Manifest
@@ -0,0 +1 @@
+DIST GerLeoRP18-1.2.zip 1599772 BLAKE2B eeefc753e9ae1877281e912018fb5897d63c74f6bbcd41b3db1e67e66b8cba7f3fad5f98138c968f450df6a6d25ed89741f77a61b07790128cbdab99982b4247 SHA512 4676a1836d6cb5285a5bd23d3afafb60a7bfaa741db046567f25de98a73c66b2dcedb0b46c44cefb0a3c45f4e6e86108d098187b108f9fbee83dffced15fe616
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..1adecc275da3
--- /dev/null
+++ b/app-dicts/sword-GerLutherpredigten/Manifest
@@ -0,0 +1 @@
+DIST GerLutherpredigten-1.7.zip 480439 BLAKE2B 0fa071afc540616bdcc6f773095b18df17bbce83d55bffc1f9183be23793f07b3df3126752b21bde4c03c12a6d9ca52cad2bdb49cc223772f4e438f092734fa9 SHA512 3404a4da3bcf612df852cf3fcd8eb70ed76f6bddd91b8d03b5807c4c127253e5a8ecae205d9079f5e99f2c097eaf7e44859c63f4fb4eb67cba1e973fed406143
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..b2ba2d3f9fc9
--- /dev/null
+++ b/app-dicts/sword-GerNeUe/Manifest
@@ -0,0 +1 @@
+DIST GerNeUe-2.7.zip 1975175 BLAKE2B b89646077a9cee4de9b411922a7b8fd625b9fc422e6b26267d4b921c339b9666040f8d51e7246f08826ee1e38ee1e96789020fd93753d54f903202a44b1dea4b SHA512 0e48b6f34d939e3f653368f27e4f3d11e2b3a68a8ea4e6f33073e2c122dd9ad2dec1a4d4be9cb20719af14ba3b2babe9ceaf8ff2428eec3c48bf148eeb0fe508
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..13165ac028eb
--- /dev/null
+++ b/app-dicts/sword-GerReinhardt/Manifest
@@ -0,0 +1 @@
+DIST GerReinhardt-1.6.zip 200320 BLAKE2B da4bf07cfc381bfbedbd2274445abb2e78f236842961d1283ea4aecf85cbf1777e0b85d9ae278b812483566fe4e64c67ac10f38c913d02b5c91fcb38701cb40e SHA512 84db10246e4b57dad224e3b214317e7504e96a15798872a56328b864db4c99857346869fec0788dae04685dde5db93a212ed644d21e84c53b1274b0c56cbc34a
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..489cea1cd653
--- /dev/null
+++ b/app-dicts/sword-GerTafel/Manifest
@@ -0,0 +1 @@
+DIST GerTafel-1.1.zip 1372851 BLAKE2B acab53f2a8cc0fbc8692c46810f82337095ffab951c553c7e17c9eef713d6c1d590e3ee50615e2a31ab9a16d1662b6926b219f6e14ba46c9f75dbc994722b077 SHA512 da493e12e0c880498e68cda54cbf27869d76f915aeb6f4fd8e6be9938fa6f55e76e4e198c1869ebcf60d752e188d7d38bad1ae5e7284d7b501c87b5fb3389d86
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..5c21b0bb4601
--- /dev/null
+++ b/app-dicts/sword-GerTextbibel/Manifest
@@ -0,0 +1 @@
+DIST GerTextbibel-1.1.zip 1264086 BLAKE2B 1b8fb76c48c49ffe6d7ebd71f97f973cc08ca3d32691afd77720f72a0d14bb92db3da62d578542ba60130ecab1d6d6ea63f240372f71954f576cc5b21ead8d72 SHA512 a468edd02c43ea9f5643074c08ef31c1b4e605d17751f64488ea56441066da7a1879a9738e4a61cc62d6a839ed557b4c1b9645a1d3d2e16b317cc08e1a753e9a
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..fbcdc67e7439
--- /dev/null
+++ b/app-dicts/sword-Godbey/Manifest
@@ -0,0 +1 @@
+DIST Godbey-1.0.zip 359620 BLAKE2B e5e6d5d941da0f3548196ce2543f432fa86c8f7e8ceba41259c67a16e25ea56328fef31340c1321dc185f28ba225c94e75ab0357197d6afaf673a36e11d08b61 SHA512 720e35a3fbf28f300bb51de81d50695ea53f8de3dc8c5032b0aa81d972a8a359dab6e148ecb7ff376126dc1024154ce3223f731e9b31d03958bbb4d9f6b69545
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..962476af9c59
--- /dev/null
+++ b/app-dicts/sword-GodsWord/Manifest
@@ -0,0 +1 @@
+DIST GodsWord-1.3.1.zip 1450003 BLAKE2B 236f87504b6d4a9a180f2b01f320121bf5fe7c27b6d2ff99c0328e4e178a856d225f6c4436b6707a6eefc9d63eaefcaa1c3c473a6cbc1a2328083fc0a4629f37 SHA512 68d170eb61156f923af36ee0338824938e1ec52fe28cc516ef99c71f8f7e6b6a35a4463116f190c73ef6f3c0eeaaa77f158da73625b46d5095ecd096eaa31b4f
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..7658e3b05839
--- /dev/null
+++ b/app-dicts/sword-GreVamvas/Manifest
@@ -0,0 +1 @@
+DIST GreVamvas-1.0.2.zip 1874658 BLAKE2B e02894eb822cdf494e5e5d436581e255901e21ff3ee31820c0d0f990a4ed5e1cf781a3b31f5811700bcbbd0bd12018c725a81ef7a7595490d988c2a220a5e43c SHA512 a69875125a6f228d62239c67a84d2f4d027fd1ec5983d5520fa771cf14c24a29fca1564e9b3d76e42d2ca42493eb7fec3c55ec2e46d467933c5fa097207f8060
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..fad878b6b595
--- /dev/null
+++ b/app-dicts/sword-Haitian/Manifest
@@ -0,0 +1 @@
+DIST Haitian-1.5.zip 1501318 BLAKE2B 6db81c276484ce1a855f746707aa9ad148b7f30f30284c457b423671714a0abc000d9dae0039c52e3750bdb38f73854b0eb3fd1bfd1a1548ceba9e61a7f04f29 SHA512 e85a8dc1f071d9ca1d198ee8a10a4ac69107420129280a69cb7affd0e35d2a919abbb1a3ec3a07c1556e961dd106ec5c435c730b58ff2b8bd403ad41f81a3a8c
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..6d6106c0593b
--- /dev/null
+++ b/app-dicts/sword-HebDelitzsch/Manifest
@@ -0,0 +1 @@
+DIST HebDelitzsch-1.2.zip 450760 BLAKE2B 983e8139fb7bde0fc8f67f75d2e821bbd0963e1294bc6163a345b82cc1a12d08fccd579975f7267eb81ad60b38927c0112864a6842d2b15445d9480a8188c454 SHA512 4b6f4ea88094aa519d8a6c1ed7f5e373fa61c56c602d6f79a63de73d820509cd14c68ecb73d3bc7f293ce28ee9dbafcc7b45cfdd7e7416c1cc475029406446dd
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..c6d3c7c39f88
--- /dev/null
+++ b/app-dicts/sword-HebModern/Manifest
@@ -0,0 +1 @@
+DIST HebModern-1.2.zip 1171549 BLAKE2B a1642a763604083eb27689a84c1d59f499e5638480cf8525c3bd00ada83d801a99d13e76e2dd5930c48a37316bef0d6a51585dc389de1f0d8fa56375f776c6d1 SHA512 d7970e39db8a37b3eb80b90a629b209fd005ed4575bece6e2299800596b175830504596bc92941f564b1b43cee6833a617496fdd0518a3eaf8818c4e9654d3b4
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..d673c07f2d30
--- /dev/null
+++ b/app-dicts/sword-HinERV/Manifest
@@ -0,0 +1 @@
+DIST HinERV-1.1.zip 2790168 BLAKE2B 120991657643bc0bef2e24289e92d11b573b21de3c42f76ca6d936a3e59118483cf2fb52203dc850159d48284fb71445796c7430c66e4f5ae543aada93b1d041 SHA512 7e14cf63ebcb2aa2ef018414a996080e9a13dc599dd9c01fee96d0b81cb4df02f262afe054fb916ef0bbabf5b252a98e306cda5baf859207f8058bb567580731
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..0ca40ee8a0c8
--- /dev/null
+++ b/app-dicts/sword-HunUj/Manifest
@@ -0,0 +1 @@
+DIST HunUj-1.7.3.zip 1992889 BLAKE2B 81f0eab4ef9946b3df67a4f4c453370bc3e10dc618cd3eca9c2e097192a5b7749150ac28f409bdb0dc2fd88f6778e990c7943f09a5d344e3e30f901554cf8076 SHA512 327564170a70ca9140638bfe021c4563dfa91922e9ba25fdddc9ca5218440f749039b6fd82a4838dc85490f73020bc2f8839e658943ec7eceb0f7023658c0c70
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..d57472a37ab3
--- /dev/null
+++ b/app-dicts/sword-Imitation/Manifest
@@ -0,0 +1 @@
+DIST Imitation-1.7.1.zip 126981 BLAKE2B 49a0cea9a24e17688d100fe89d19f435f9cc147646be7da6c734590b3f23d28dd316662e5bab87176be41f63ee64fab81cc1302cc456d082e218043d6e892a8c SHA512 0f2b5d0182076ee92b12454aac13bdb7009dc7fff5e582985c3e06774d0eef278fea5a03e3734cc382424b7b7ba6ecb0061509fab234bb656d6b65dbf955d792
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..fa39c7188161
--- /dev/null
+++ b/app-dicts/sword-IriODomhnuill/Manifest
@@ -0,0 +1 @@
+DIST IriODomhnuill-1.0.zip 63376 BLAKE2B 6edbbcb12ed687a0d6f626abf34c057bd2cee2d3a12cf5b9bae16e96a16411718996b816f2e6fcf12a05bcb383e146ae197a84e1708df4cece4ea89e8ad63ef4 SHA512 5fc3024fc0ad1dd88e544e3270f23c8af446a9d4a8324838da7624144d2c6090db65f28d4776dc2df22cd6d1520464859c7de8405e1d45efcff904f7f360c5bb
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..3239cf3b8d18
--- /dev/null
+++ b/app-dicts/sword-ItDizGreco/Manifest
@@ -0,0 +1 @@
+DIST ItDizGreco-1.2.zip 1540580 BLAKE2B 7688d565e91c53fd54371ab3b5fedd83abefafca8852190747f07caa480f41453f80dc6b6576c62f2ee1dd28da084898b68bf457fe7b01394cfb045addea3109 SHA512 926e124a34ed4ddba5f58073350883ec5a4367cbdd4681e23449d14163268f451807881e1a1b21f789a9f5bfe4a924fdaf256f530bd6d6931906da6a698f4143
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..85321b144178
--- /dev/null
+++ b/app-dicts/sword-ItNomiBibbia/Manifest
@@ -0,0 +1 @@
+DIST ItNomiBibbia-1.0.zip 573300 BLAKE2B 1183a6ba2ad8d4be94068e891819023c24521b973c9af38d72e244e50c0a2f103aec93a5a73f1271ab79ccf09c0c07d5e7e85f8910314269a207123be983dc6e SHA512 49e1f3cc6674cb6ee2410ad5512b753a99ee074777ae0c646d63e7fbb4db73e44d60cb1f37491ba349809b154dcf0b37465822cb149ba9f27e37c4f7f115d8fd
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..445147c9c3f4
--- /dev/null
+++ b/app-dicts/sword-JCRHoliness/Manifest
@@ -0,0 +1 @@
+DIST JCRHoliness-1.0.zip 364726 BLAKE2B ae8e3fc039c92079a983fbaf6e08aea07e1ae7ad8c35b5e7adabce3202b29c30b7e8f750970fbfd2089b60532bc0855e514307385916f9695cbf49e5fe7d4dda SHA512 6ae9d21c2371edf081ab979ce1ab8e3ad84bbf0855f594c1f168490d55ebd11e113d48ba91e52e0e5c6d13b12ffd13e9ad1fb40932a3029a6438eb09a387bd5b
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..2342be43ec42
--- /dev/null
+++ b/app-dicts/sword-JEAffections/Manifest
@@ -0,0 +1 @@
+DIST JEAffections-1.0.zip 334808 BLAKE2B 640835bf426e904f74406616a639acc2b7f92e4f07a2b386dabcde6dbeca69427cc06e9a740daaf00431b066bb654db3ed3ba23c3310bba78325a628f6db6c2c SHA512 a0f7e4f9836d5065be283c15d2f520d3eb20e8de7c94e1c86f7958e45e50fe5b39612ba3c790b06c8f11b984a893d72948e9181746779abe46b3f61b67dc8293
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..0cb0d36f2974
--- /dev/null
+++ b/app-dicts/sword-JESermons/Manifest
@@ -0,0 +1 @@
+DIST JESermons-1.0.zip 373636 BLAKE2B 016c4a8233145ae820de8fbc0634fdd33c01717828b64ba7f4093791c7dcd8aa02cb14850bb2f6f6ded415acd0df1d202a5fe367999f7420cd70ca679529f576 SHA512 07ab1be31b5661c15be92d7c31e3a20543d29d062ebb6ee1ddf8e11e299f509df20d11f312e95db792d48a7015a3d4f0e0aa92f11f52f535ff3f4f3c97ab7c46
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..7f84307e6ec8
--- /dev/null
+++ b/app-dicts/sword-JOChrist/Manifest
@@ -0,0 +1 @@
+DIST JOChrist-0.5.zip 291983 BLAKE2B a8191001152244ee0b7da93440771da431360050ea165f8cdd8131759a5822286e0368fba66a977b698cb2b06c7bb2085d193a0f635b4edb56112d563f25a260 SHA512 f5567dcefba877680ade70d4b84c09ea26d046584e14d51dba65b2ae3e62e26e2a01339286b6417668518d39cf2c981516fee9a750cf17c123e7f8fb4226f10d
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..9dc034b4d90e
--- /dev/null
+++ b/app-dicts/sword-JOCommGod/Manifest
@@ -0,0 +1 @@
+DIST JOCommGod-0.1.zip 412234 BLAKE2B e9e7d27f3e331d194f27bc53553ac0796c9a50ddcf44f4cd45a42a3cc4619d24b7b480db8bc361831e3fb1f6eda90ff788e23518eebd5ec51e6710de282aa2a6 SHA512 621c618a4f1ae92a0e92eb611ced362661c2a29722de2668394d4717678e644aedd062c2250525a9eced932598cfda50bd9d794771f06ab3e43948bdbd0d8629
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..7d11ee8ee65f
--- /dev/null
+++ b/app-dicts/sword-JOGlory/Manifest
@@ -0,0 +1 @@
+DIST JOGlory-0.5.zip 209907 BLAKE2B 7a42b1c2ca0fcaaa421ffd9e2763cb9ed695a021da6ff961b9749c874cc3fe00b785557011f0096319a079e4c8e5e0ffcc55a128babc638eca9677e0106b470d SHA512 20e94b768ab4bdbd27fd2e5c4469402ae0ad3a6bd2c70f26d817d21ac005222aec74eb8e732fb863f62139cdf7983d4bfefeacb8e08aa84935a43b5deafdeb85
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..0864487f3898
--- /dev/null
+++ b/app-dicts/sword-JOMortSin/Manifest
@@ -0,0 +1 @@
+DIST JOMortSin-1.0.zip 95888 BLAKE2B 19020a4a93a0ad73ef575a3c781ce4c9b3f73df00ebc607818af38c7a31cd20391d6b73b82c6bbea1a5b5b195dedd659554af8898aa5de9a8f1505f0f40deb02 SHA512 443d2c0b2754475ee306f7d15f366b0ab894c05c685a3cf58c121de4ba14b61b4bab460146815cc3ba2c7f9db95877f5463f5136c139d5dd867d32b80f2dedfe
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..210ea8cdaebc
--- /dev/null
+++ b/app-dicts/sword-JapBungo/Manifest
@@ -0,0 +1 @@
+DIST JapBungo-1.0.zip 560591 BLAKE2B 4904a2f05d5f41de5607689cb776b75d544b84298260512d0ab1ba1d32860c7b8c7876bc376b535ddaadb77e3095f18ff9a324feee9beb20fef9a2d33f84df6f SHA512 253afcd9ae148aa17ac38a25c668868a2027b44ea5196eb944ce52ad4efa180578a27d4a0abec36249d05b02186a92836e026c4af6e38629320bec13dbbd5a92
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..4fefe23243b5
--- /dev/null
+++ b/app-dicts/sword-JapDenmo/Manifest
@@ -0,0 +1 @@
+DIST JapDenmo-1.1.1.zip 344068 BLAKE2B 0a7c1ec03a717fecd9b4071563709ce1f0e08d6086530d1e35aef313c48b36ed64e5bf58a65958279382ca35bbd47c2022f0d8ea67b122847bce1db27fe4527a SHA512 4631e31ebd6ed3233b7c742ef4b7c834c8ff36ef092cdff03acc294912a9170d5223f92cc189d5eccf5f6e6de0422702a6639526d90da0d019aed778f1268d0e
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..54c6d6ebb65b
--- /dev/null
+++ b/app-dicts/sword-JapKougo/Manifest
@@ -0,0 +1 @@
+DIST JapKougo-1.1.zip 2113786 BLAKE2B 05d2df789bf27b4f0f9d5069218dd8904870036570d491550f9157fe9c6642672dd81359711e2e63795a9c196ae40336188fc397240b270fdf754a303fe26373 SHA512 aa4d7cf8b4d4f3e782224cc359a524e2f4f99ae211c3b6eca44df18e753a92e91b0a06e727399b11ac0db0995239f41f08d5756cfd2cfcec579984cbb20095e3
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..52f6fba9b2c4
--- /dev/null
+++ b/app-dicts/sword-JapMeiji/Manifest
@@ -0,0 +1 @@
+DIST JapMeiji-1.0.zip 492094 BLAKE2B dc985b7d0ade888eb4957271574f95a9804be962bfc39d34d72ba20eeac2672d0c7304edebf6d16a34ca1b0b371d77062e746aba9ca3fe62e5ecfbfd73973a5d SHA512 7ef97965cdaca67693cb2a2fd5857bb740c90e8aeda17934cad57906a3528145889b2f42c142368d82b35a1e5c859a86b014ddcff68ef138e4acf890efe4f702
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..03b6d9bf0b08
--- /dev/null
+++ b/app-dicts/sword-JapRaguet/Manifest
@@ -0,0 +1 @@
+DIST JapRaguet-1.0.zip 645470 BLAKE2B f005c035b57adcda509bf4e687e10aad3005b5a4bc0fecb70c054ae61b960e8e5cabaa597a63607f199533da3b0b171f505cde7dd836c4bdb72b12cd517ed657 SHA512 354d42d23c86306d26af282de07409dcfeda42a2839384d748d2f2c66cb8c153d72959339a7cd4743237a225098c171171ebee4210b5a2e441640843307f2c52
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..b08599e33348
--- /dev/null
+++ b/app-dicts/sword-KD/Manifest
@@ -0,0 +1 @@
+DIST KD-1.0.zip 11712440 BLAKE2B 1218b0cebf572840f3efa1039c7abcd7fd56e02c906cdb793134f84da596786e0e2928fe76ef76cdd0b0b2d2ee93353e3ac2c00e18cabca6ff2709d653f9e5e9 SHA512 f87c0332cfeb2e894dce0c43a0a99fd19ce67cdac6bf15975990d52c36e9ec5f1d7a9b7a02d8c847d97c4aa10784ea096c29dfd0ff9dac4ca906fe7cbfb57718
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..bb39ea166e41
--- /dev/null
+++ b/app-dicts/sword-KJVPCE/Manifest
@@ -0,0 +1 @@
+DIST KJVPCE-1.0.zip 1561436 BLAKE2B 0baa54c37e2dcf365a8ad8a07c1af25074270fd06b814058cf067e6f139635b9bd48e019c387526a8c3c0573505afb6a12c20a73d4230e8aa7b63c293abbcc5f SHA512 aadbc163f998d59bb3a22fb2eef5f6b1ce4d6cabe01e215716d178de3aff114f65506ff8ea5670ebbb4bf77db4d1cf9338ace2ae34d943e991c32c592b5de68b
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..6a06d49d9325
--- /dev/null
+++ b/app-dicts/sword-Kapingamarangi/Manifest
@@ -0,0 +1 @@
+DIST Kapingamarangi-1.0.1.zip 3916592 BLAKE2B 94704fe0cda9bb103f42e47590fa3e225c253553011ede7e57520041b3bff7f04db838036f3fb26ee179d4fdce0ad680388350738376a8b2748bd84566c5af65 SHA512 d4af52dc3d55d89a732e4c466d3791a113ee06cee292bbcd5227285a81c582ea0f3415879283071b99517add4f3d54ed30f611f1040923bb39018d938f9ee556
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..39420179b079
--- /dev/null
+++ b/app-dicts/sword-Kaz/Manifest
@@ -0,0 +1 @@
+DIST Kaz-1.1.1.zip 3614233 BLAKE2B 076128f674e390bb6f089fa689cb0d84eac1aeeba74cafd9b63a313f148352fbf80a32b2d13cd0b3e9bfac3a78e12a5d8bd6167af45a864db05c3a0f9505fa3e SHA512 bf6ca9c8c62c88400a9c22cfcc8034fc3c54af0a4ecbd16f83ad3c9a84b7a4640cbec20853785b3d3b7e479a11e6fd448b0e6502f0d9371412d84deb44ed7898
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..d93389f96a4b
--- /dev/null
+++ b/app-dicts/sword-Kekchi/Manifest
@@ -0,0 +1 @@
+DIST Kekchi-1.5.zip 1676130 BLAKE2B e31a2d8ea4a6b5df1e26f141bb7959e3244eeac42a98794409121f3a7d6bcd9a1e987a8289f51513d93ed1e850ca66194a1c2315cb33e22ded527b2a18abd180 SHA512 c4c3df33e26165780cdd19441f8765293360119fe5d8179b66a7032893d4885ed5724f1674929f909183f96af5f87f4893e8e4bb72e34af5bb3c6f32b02ca877
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..8a358b227541
--- /dev/null
+++ b/app-dicts/sword-KhmerNT/Manifest
@@ -0,0 +1 @@
+DIST KhmerNT-1.1.zip 550616 BLAKE2B d1d9199e0605290abb441f2440698cb33f9424b1f4d540c676f529afbf3ecaa0d427ad7c40d6d18a1a25b5dc72c6f55363d422a79bdd651deb37550d4b692541 SHA512 7955344af9dc6cb6ebcdf313563d867a8399c351cbd247e32f5f2c5590d5108ff3ad4f0cca3e9a0fb9fb13838bdcf5606d3b6edd213b38f741758c00e4127ca6
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..d61d86db94b2
--- /dev/null
+++ b/app-dicts/sword-KorHKJV/Manifest
@@ -0,0 +1 @@
+DIST KorHKJV-1.0.zip 1711946 BLAKE2B 9f268c8ad2033644a7a379a3407a294331b2d7ccc741708f685084ec491816b12378ad1683933a1d3805973963e5845f30e514ed19d3939b5e7a8c13524565bd SHA512 12e17a5d6c4cc5bc1729ee6732bcd27dbea3eae25f6030104b3b31f912a5546e73982fa9de91e1e69e5561bd851c1e0d96df34b096b306b9b3d0686be7a6c94d
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..c41424365817
--- /dev/null
+++ b/app-dicts/sword-KorRV/Manifest
@@ -0,0 +1 @@
+DIST KorRV-2.0.1.zip 1476689 BLAKE2B 0be11e327b9d277931fa90a9db01dc6d497029cb87281f6553615dc751b902de0c451abbec248a2446238a52f991cf23425999b0b5049f0d31d630cd0bdc5b82 SHA512 a0e5acfb4ee3113c42c3f14fa96523740b6bc17031b004b17172ea229eb1bfc6081cc32fd2efc71518863335b39665e873fc7c17ca78ac26c3e85f6b37c16223
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..ae69db0c9af2
--- /dev/null
+++ b/app-dicts/sword-KtuVb/Manifest
@@ -0,0 +1 @@
+DIST KtuVb-3.1.zip 2847068 BLAKE2B f5f491775d14f1c8c5e7572ad7cbcd1fdb0840f3b87c23fd290dd04de9213e703c481dea6cfdae07be3361d46974097730982733a3232d69e403c2c05485dc79 SHA512 358866fc8572657dd0132a73a1ec317b896c256b50cb2328776f6a69ab51da6200a8150e9e9cd59dbfa62443c456f6afa0d08f5cc5fbed0bc1b5e4b32f10fa90
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..faf96f7580d4
--- /dev/null
+++ b/app-dicts/sword-LEB/Manifest
@@ -0,0 +1 @@
+DIST LEB-2.7.zip 2230351 BLAKE2B 529f405e81736fae3863f130c13118c9f324ec8e2f607e4a49b620b89df3acbdfae6b25fcfa315e141b849635e329410f34ce30309c9e0230bea26cbe3014e80 SHA512 616ea9b9da9f588db3398545b08e4edf964237a55db1070832bca4307fc86fc1d6dda39454f24f6eb28cbf4d7f1b0a59bd4aa75bf441c42b07a113c1fb33731b
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..8dad09ae9876
--- /dev/null
+++ b/app-dicts/sword-LO/Manifest
@@ -0,0 +1 @@
+DIST LO-1.1.zip 366644 BLAKE2B 042d363ec1038fd0c68e3794763249cd777083dbbcfa4ef88263fc1d3fd89ce1fdd58cbe593d96aa69f26a13957ab3fa9fd2563e9165059bb1905b0ebac0ed16 SHA512 0442690740bf9bdaafba5f08497ca3615e65a4b327abb57834c95a0e2a00a32081949460c85fb4505df455e84ce3c3d83b7f391f60baa37f44ac4714463e44fa
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..71009c11748c
--- /dev/null
+++ b/app-dicts/sword-LXX/Manifest
@@ -0,0 +1 @@
+DIST LXX-2.5.zip 3279771 BLAKE2B 40bec0a0f84e463ec770d9deda2fea0653bc8b3e92fd0cbd98f48311c1b07cb22f2ffa89a48d744b14890c5777fe1c449996e1b70788d4b15d3fb27b3900b89c SHA512 816ce66342bf4b7e23723a81dbf4e2f6a5699a657d1cb53276259ea96881b001d89cf3c18a0e9e67c57f059cddceba268d5af4bb020889ff2dfee19a6f6ad73d
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..ff5b8f6f0888
--- /dev/null
+++ b/app-dicts/sword-Latvian/Manifest
@@ -0,0 +1 @@
+DIST Latvian-1.4.zip 369413 BLAKE2B 63dce51cd751276f82e2279ea679167516abdf3a9ed3428916f9d74fe67759cfd730cd2ab2a177d25085244cbd867b514d298c122d319602dcb39753b5b59c7d SHA512 4c65d9b3a2e7b252af64dc760d470a72792d6385fe6f8f3e1b79c204738c2a7d95269591a659ba1bd31e0251a022c3cdb23b45c84c3b452d94dc70215893f1e0
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..0e3d2b1cfe5f
--- /dev/null
+++ b/app-dicts/sword-LawGospel/Manifest
@@ -0,0 +1 @@
+DIST LawGospel-2.1.zip 579480 BLAKE2B ee2a7a69816f152d60d3c8dc0e641327ed7327df49b7cd0d336f8d9fce3c503922ecf6d238950c4fd07f82208e065451b9c02d4dfa1e3ce0f76dee648b124a96 SHA512 10dc357e43386e30b4ea330906b816c35cd836c51a35b77e31be98568133f0e5db99e706e4208e3836f28bba28a8da68f7cdc7d5fe5dd82c137acaec103b395c
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..05f3d0023688
--- /dev/null
+++ b/app-dicts/sword-Leeser/Manifest
@@ -0,0 +1 @@
+DIST Leeser-1.2.zip 1142555 BLAKE2B 76c1a100ff15a22f55f777cbc1b251f8a3a8831e85a1430be145c990e9d11969d459b862a51ac0f8f7f071934ae3af56e52ece149f2771b34c3269bf71a32fb5 SHA512 21d0151221a60bd1359c5ba6edb7ef466d5a25f6f494c1393a5a2557e83388eed4b1cf9fb85216b62f1446794e1380a93662170f46087ae46dfcc14dc1ba27b1
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..4e42b8c0e3de
--- /dev/null
+++ b/app-dicts/sword-LinVB/Manifest
@@ -0,0 +1 @@
+DIST LinVB-1.0.zip 2095504 BLAKE2B ad3d21887eec285fd052e7ce02fd1ff7c851d8286597c57e4396c89ed6b78e39ca2fe3fbd70cb87197d9d2c0052b2ac990e96958fdcec02e6581a1c47cc4de8f SHA512 cc7d51f5bc8d22594cfea9f708f1eaa8e650f1c447035d85678b737bf48e19ca688167005873418440fc293a2892b36f7e364212c8eea953f80ba832a82e9c0b
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..f628edd244a3
--- /dev/null
+++ b/app-dicts/sword-LtKBB/Manifest
@@ -0,0 +1 @@
+DIST LtKBB-1.7.2.zip 1411962 BLAKE2B 44e850c792b08a47d56492def0c5e57f18b95366e1d9726b3d708b086ec3ce37b8e0904f0b2e2e5167ae3597e29866dee47e35e242b0fc4d2a971a14b060b375 SHA512 f874c121094d315c7d2c53677b5ea5620815cd275a242a508be6b131a25ed014e810550a3d02f823dbc7e47cce80c5a08309ee1d9414296f9117f4fd014022ea
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..02a12963e486
--- /dev/null
+++ b/app-dicts/sword-LvGluck8/Manifest
@@ -0,0 +1 @@
+DIST LvGluck8-1.1.zip 1909136 BLAKE2B 53717a113faa07d06209eda3052f2d2a0d2ddfb442080d272c1f27feb4e4edd19309d91b4a5a70917a5c715f33369d6325b06337ae6371656b165cd30e7e7132 SHA512 2f7ca3917059a43089e88bb450756ffda0b4a4c10c95a4ad0f7087183b0514f17627ee2c4f59ef2883234841a7f817a3d9dd65e5dfc1efa47756e308c74209e3
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..64517a33215a
--- /dev/null
+++ b/app-dicts/sword-MLStrong/Manifest
@@ -0,0 +1 @@
+DIST MLStrong-1.0.1.zip 1111512 BLAKE2B dc13ee00d33ff8794f1769d4e1570604bd5e444938637efda1866c16d0e5f251f862a44801c88c0c1dc5f04ae8d67c767d8fc5b0180ac71ad4b1048f0f841220 SHA512 442ece11580b0f7f2b761c7205a094b69ce5aac194842de8c444c728f78453fa587ada552cad6acccb769f2a9346633871b766fd3343a04234f8be85dab0a887
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..7ffbce68cfd9
--- /dev/null
+++ b/app-dicts/sword-Mal1910/Manifest
@@ -0,0 +1 @@
+DIST Mal1910-1.1.1.zip 2063642 BLAKE2B d5c2e53b700cc99ed1148b25137fa5c670792b877cae3e8c31a4229821e6006a85825675633438518ffc080729616c805d8a8c784713b5d3ed3d6cac62eb818b SHA512 1947611c283aa40d52a02dbc8bb8860837b99750d493de3907a3feca8315fb3960691e21cf04374aed510a505ea47750f956338a27c47a3bfc9a4e0dffe5ea73
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..f7c0991f6be6
--- /dev/null
+++ b/app-dicts/sword-Maori/Manifest
@@ -0,0 +1 @@
+DIST Maori-1.1.zip 1397374 BLAKE2B f443a1008acccfd9b9c48171e9102da58a85bd97ce9ac8b6035a6d9aee07ebb20b97de5791c821bcfda371acae739d2dcb36bc57c39767e88fccd4479cefc647 SHA512 3a634eb0e785c43b0d6909d079cc9555f2fcb01735f6a8a80a904306567bc35c1490800024d56bbb194f7d0b78e9f984df068aa128f9bcc6c1fb99fed2bfa0a0
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..74161a36a8cc
--- /dev/null
+++ b/app-dicts/sword-MapM/Manifest
@@ -0,0 +1 @@
+DIST MapM-1.0.zip 1731033 BLAKE2B c5cfed8330f00acae5d38486e70efa258732959427fc3b5f01f9b1cb36c4b880199e9db5e971d7eaa5e546ce628c827d275d4bcde9567b9719b2920ca8ef05bd SHA512 c960def4b825bc491dc294ba968126a08f5b3ee3e30bfa1cd00d7bcc88c00fd7e97475d14cf2c8d3d93306a855a11edc5de3972973bfefc8557d3dd5302f2d80
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..927c64835f9b
--- /dev/null
+++ b/app-dicts/sword-Mg1865/Manifest
@@ -0,0 +1 @@
+DIST Mg1865-1.1.1.zip 1525628 BLAKE2B 8e88b11368eba767dda2520db3b019222281a42a480660a570946611e36ff2fc930f7ae9b9b715f28c0e20c7207ee72cb730491de437b3bd318949dd71b44427 SHA512 16e254a82b300f3424cdbc9644075a38520bc270aec9ac695ee803bceae445b76baec1ed7822d752ef77522b128b73f8f6abde30e8cc0d13ce502d11e20fae6e
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..30a320a7c9bc
--- /dev/null
+++ b/app-dicts/sword-MollColossians/Manifest
@@ -0,0 +1 @@
+DIST MollColossians-1.0.zip 34449 BLAKE2B 22cb5d0cd3f45b364f5b00025b8699921e6bfdba4e2d4538cc6ed931c28fe0fa0d66d8280f6db183946920a525d70cad4c9f584e2205a13aadf59ed0481b8b57 SHA512 c4a365892cc14191e34fdfd4f41e486277445fb95e3b5c7bc3f6a267203c265e38888342fadae014940fe17f004738a0cb2136ac471082db1765cd5a6f503b36
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..d840fdb85ea0
--- /dev/null
+++ b/app-dicts/sword-MonKJV/Manifest
@@ -0,0 +1 @@
+DIST MonKJV-1.4.zip 684932 BLAKE2B 2bd51fc94363201857b963d05b4d4871481ed0c7383a087e220e34bbaf2199426ae4352fec974b5d60abad7eca5e5290d9e82d907a5a4880e190022f518be291 SHA512 777dd0916ed2cbe211d561f237afcfb036e6f7a792fac9f43738ba97de87c248064b234cd77023ae478b3b59180cb41948443143c7a1a26fda83a6a76aa2449a
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..53638b817bb6
--- /dev/null
+++ b/app-dicts/sword-MorphGNT/Manifest
@@ -0,0 +1 @@
+DIST MorphGNT-2.0.zip 1327923 BLAKE2B 9833022838334ffbca6e9dcae52262d1539d5d19ab55d471afa55a3df30f6da673a02e38d36b8ea247ee002ef805cc7650bced3ca35fa36abd26a5cb6cbe9ec8 SHA512 02cbb90efa3c4fc45bcda9745511fc426922ada5287a0f5742903d528f3a9c037f6d3be5fc8c719c5f945ee31ab99a14043751dc32a638769491cd9d1cb4524f
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..27641cfcc178
--- /dev/null
+++ b/app-dicts/sword-NETfree/Manifest
@@ -0,0 +1 @@
+DIST NETfree-1.0.1.zip 3408528 BLAKE2B e5456499d99567750e1891688e59cb651bdc0a8a88bd455031ed51d3682952cd41b27749c533e46badb683002b48f430a83cc6131c25ab6ce464dbc84a284209 SHA512 bd444870d72d169573218594897709d4bde602bc8ad2b07cd2952ce35077de01c643fd4ae8ed6d757afc237b9c2e542e1b6ec795007343610d48d25cfd98d645
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..5e44ffa13294
--- /dev/null
+++ b/app-dicts/sword-NETnotesfree/Manifest
@@ -0,0 +1 @@
+DIST NETnotesfree-1.0.1.zip 2384042 BLAKE2B 68f66d747eb5b86bb076552304873c0bb5ced3f78e5430f613e9ad8945ca24cd5be3782aa3764ae474924968f6b00b33168b26fc2e488892aec79267b095b0e0 SHA512 426367f0e7a2afe831d03c30952f6189aae24c51d83d611b8ff4cbad06840ba2bca687dde5c7793aa1ecab5c224ed4afd1d8170518e3713d4abe2596dcf6dd37
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..b7c5b8b51f86
--- /dev/null
+++ b/app-dicts/sword-NETtext/Manifest
@@ -0,0 +1 @@
+DIST NETtext-1.0.0.zip 2019471 BLAKE2B 53a2af043990c92dc5261afa0c6c7a5fb7e537a30cab2fecbbe992f2403b1a970b2430d8bc3b6c1ab065cbeb660ec8a100bc5cc070c3e0c5b80820c5ef69e121 SHA512 6b6a178bc7b50ed7ea907d4ca85e4e6b51c8e59a8875943f0fd94129fe7084af52c8085f26042a7ddf473376fa3ff0fb61ad07af1f87a4875b4c5f9adf75d7e8
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..228a23ac146e
--- /dev/null
+++ b/app-dicts/sword-NHEB/Manifest
@@ -0,0 +1 @@
+DIST NHEB-2.1.zip 1707586 BLAKE2B 0de8ccff1afb296a3537ab5b190840db51004dca81bb3d03dbb927cbe7e1254f54742187350f92a4c5bab5a65331e5f88eed571fd016a341fe11abf8b77c8542 SHA512 159e8b4ff4a40aadcb377c8a0711dac6a63262579579cbea2858282a31815fd21d1f8767ffbdbcffadfb8016be1e0971faa487672f338efdba7164fcb4475cab
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..ac06b37657e3
--- /dev/null
+++ b/app-dicts/sword-NHEBJE/Manifest
@@ -0,0 +1 @@
+DIST NHEBJE-2.1.zip 1707083 BLAKE2B a5ab00760653a6529e9406b8bdc118d205e22f3619c7bba5aeae652c65c5e6ff7ddac2e65b86306f4574524597c04738462983d56bddbfe27ff192eabed864cb SHA512 69e3944974120837a1361b29326a4fd0093ca20cc52fa8c7d27a3107a994947c67f0e367433b81da4afaa0c1c307920634542a4350222e904ffd71a57e4ecf58
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..30f8d822d5b4
--- /dev/null
+++ b/app-dicts/sword-NHEBME/Manifest
@@ -0,0 +1 @@
+DIST NHEBME-2.1.zip 1707965 BLAKE2B 39c487f6ae62efd2da25d043da7930016375a0f9f52fbc96db70d05149f1850d41b5aa86cb01544f75353c3e921cbc55e618f2d5dac5da2f0ae959d3867d52a9 SHA512 3c8b6a8a79d75f3f5f65773e6e76342a31a4310eb7f25533e65f3252167a05b64dc2c230b0f0bfb729a611b12bd2c1fc4390d008689ad6bfaa0fb13dc6fface8
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..70c7be510db0
--- /dev/null
+++ b/app-dicts/sword-Ndebele/Manifest
@@ -0,0 +1 @@
+DIST Ndebele-1.2.zip 2670226 BLAKE2B efe7ed577c72b75b6233983587c58ac0e0d91209f640a6eb43855e2901b62d7ea39c9f28fb2828d791a801b10c26fc200ce8b8e7c50ab9b99dc4ab58eb6dabf7 SHA512 851819012bc89887ec9f7b0434ac3444e35f079ed368e6288e7263b6720c022c482db62347c889661e3ed9eee508237780b8b6caddf7c5f108de03761e3da6cb
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..79bf2287e4a2
--- /dev/null
+++ b/app-dicts/sword-Nestle1904/Manifest
@@ -0,0 +1 @@
+DIST Nestle1904-1.3.zip 596868 BLAKE2B 4679dddc07e65fa2208964ef5259683604c71f8298b170fb0e6a08a9c98abdd9d1e7dc4156bf977dcd84543cd9c985a5145588b36e0d4b15668baa2de2c0a6be SHA512 0b147de7f040dde759dcc34579b0b26a5856a894f483365cd5f16f1cceda84b5ec92b0bcf55e270964361bc0c094883e526e11d7fbbdb26fd6c864671a02ed84
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..e01ae4b91e1a
--- /dev/null
+++ b/app-dicts/sword-NlCanisius1939/Manifest
@@ -0,0 +1 @@
+DIST NlCanisius1939-1.0.zip 1790561 BLAKE2B 7fa3bdbb20e6423691710adb2fc033a8343eb89953f19de46ebbe3459614477d04fb906b6682f15845bb5d00ef0ff3e29eaea64d26a737bce270b9f042c2450c SHA512 047f587a17df5d64e46cfb915ab7def8f8800c3dd912c5ab34b03fdd7409aa2107189642e677f0fbe9322b302a7ac1770cd179e069854059cf28cd13d555422e
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..6cd7bf815c88
--- /dev/null
+++ b/app-dicts/sword-NorBroed/Manifest
@@ -0,0 +1 @@
+DIST NorBroed-1.0.1.zip 372307 BLAKE2B 6bb696b466a100eb9dce5d9338aedcbdd0a797163ed606a18d5a3118e4a3a77116cd3561957a3d89ca487b766f56fe1472fa98de3965221d96e47f9006b706db SHA512 d22077c943b9cfe90cce35253787f6b5508f34c9c4c1675333744a6c90ae04cbda79dc7ade96c7ba12861ff878abf9c65285df393b59bff9b8e240cd7cab94dd
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..1d4a6968afae
--- /dev/null
+++ b/app-dicts/sword-NorSMB/Manifest
@@ -0,0 +1 @@
+DIST NorSMB-1.0.zip 1477046 BLAKE2B 1df96807c1e8359898adbed199c1c23aa2fd74deea78794bd8bffbdaab8580eb9c7ec785a231de3eedd1b10c250a16fa9f0a5d07b545821e4773915203c925be SHA512 fd5af2b1c31a61a27a9b57dac2a732a8056d89ec525c8fd9c9cdc033a8bce5e212ad88aec33dde1a442cb8047656c3a615de7a2808768c2c0894ef0ee2470438
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..8853be515f06
--- /dev/null
+++ b/app-dicts/sword-NorthernAzeri/Manifest
@@ -0,0 +1 @@
+DIST NorthernAzeri-1.0.1.zip 2057321 BLAKE2B e9bff39550a74d874f4d4e2ea6cfd74b9fdd22d71374785a9681e7240cdda47e1ee7b0c232600656c5531179fee920ff23049ed5d05ff59ef9ca1c61cd43850e SHA512 67664d07e5fa861613078a8a64bfe5d1faedeb322fb54aa9b61956d4ce10142e2415ef5a19be39d671944d44115d249a73771b7f9727240952425cf4e5fe7440
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..55a4f539da29
--- /dev/null
+++ b/app-dicts/sword-Noyes/Manifest
@@ -0,0 +1 @@
+DIST Noyes-1.2.zip 827202 BLAKE2B ec7c4dbd78fd004dff6d9f2390e32b00f240abb59df2dd8b8aab88577b0948261aafa4e638d337bf0ee3527d9ee15fd8cf6da2657faa0f61a023477518875b4b SHA512 17ab608ca2e8951f5654ff667100f9b13cbdd530155f39c0e82fc52e9c7a9ac81914f3497c05130794e6a8323b6bed444e72332db674a7c9edfad6b5c1d085f4
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..643cf87b71b5
--- /dev/null
+++ b/app-dicts/sword-OEB/Manifest
@@ -0,0 +1 @@
+DIST OEB-1.1.zip 613627 BLAKE2B e44f56c20eb195af7238e9c0aa5cbf3c5c27c09a450c693181971d65d9ecff32813b600313da4222e8c09c703e5c17b14cbafc9dff8bb460b0f3058685d9a03a SHA512 c0782ba1429c91097f0a632e77f696cfb0ec8c0a1dbe4a38f9b2585413a6d17d78eaad2da4bb5a9f97ae68856691215e4ebe50c79ff41374ddd41f015e237277
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..c6a2869758f9
--- /dev/null
+++ b/app-dicts/sword-OEBcth/Manifest
@@ -0,0 +1 @@
+DIST OEBcth-1.1.zip 613615 BLAKE2B d077e9dc435fd4c626032d3f1cd82427596ed7569f66b5080b6ce16e923912f055bdab8798243bd42eb57cd983d6927703a772cb33879a959cc7e7fb72db2560 SHA512 b52dace0949ff9f9cf154bba6e549209fbc002d0f810be0ec06d3e0f1f3afed9ad0ab544e3a1102f225bf034b391b8410f64537f8b92d423344a8d8735305b9c
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..b5f03ff19ca9
--- /dev/null
+++ b/app-dicts/sword-OSHB/Manifest
@@ -0,0 +1 @@
+DIST OSHB-1.4.zip 3765030 BLAKE2B a8f49f3a4adf74c22f221aab9931487ac00684d1b7fbda4ae8de8eea205e7776d946b13d7658dbd989e7ac3c06900024212a5d82a18dad28e260d3ba5f1100f4 SHA512 f1b663bb41b8907e8cd097bc6dd6011e4b5da3c6990f64501c2e312e8101635120e2652e7412fd5be97279418f23fc9acf4e4dc4873227c94d8e3bcc643e2f2d
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..caee4de9a85d
--- /dev/null
+++ b/app-dicts/sword-OSHM/Manifest
@@ -0,0 +1 @@
+DIST OSHM-1.4.zip 73316 BLAKE2B da652ccc8b592258b8b1a84d10517a44676a47e03de60800f843e4ee35d7ea45bbaba9091342401e8f7a45a2f679de1b347706740012d4dc1e857ebca8ea2517 SHA512 4b1e9ce13335823555dc11a0cbb0b3b7fea5e543c0d8f47287c8f35ca358cb2f71482c8febe10a4afbc055d65cdf28181467dac5bd8ba38137c2e4a4653d72c3
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..bf2d70092a9c
--- /dev/null
+++ b/app-dicts/sword-OrthJBC/Manifest
@@ -0,0 +1 @@
+DIST OrthJBC-1.1.zip 562457 BLAKE2B 7bc6839b146b21f9b6194a437a08575cf5d15a490f4430ed4538a1a932ea9b33880de86cdf4fb97da7b861e253622343ee06a056f2f5f6101a03cfa1ac45247b SHA512 5744b13c98d51c92567d794203d2db6ef01297d0b094abe507853a0d6226635cdc2c6a7ee2ec5f4fb0e96ae8d591cc40731bad9f9081ce1a33142943828c98b8
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..107efbf58f7a
--- /dev/null
+++ b/app-dicts/sword-OxfordTR/Manifest
@@ -0,0 +1 @@
+DIST OxfordTR-1.0.zip 39844 BLAKE2B ce58ddd0bc23b13105c8bdaadb986f8a30b81d0c614d6087b33a182fd6e42f184d3ac87820ea60d4ea6df4632bce94e9c7869f26f4bb254ade33ea172d4a302b SHA512 6cc3155e7424253320f163b253e8c5c0d7b6b854306f360b6348006dddbee6a32f3e49393bed58516f86117a4d44bccc148f0c437281b4c48fb4a8a8762852a6
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..45b9124a9ab4
--- /dev/null
+++ b/app-dicts/sword-Passion/Manifest
@@ -0,0 +1 @@
+DIST Passion-1.0.zip 264741 BLAKE2B d40ee0fc79b098d0539ca2c3da4b75bd6722c28d254262d68408561afdb87849ec426961b67b574c8f552a606069e3959cba681bebd652a8caf76ca134760a96 SHA512 15f01f6639eb97bacda7f272f3eb47ce507e7c2845608a11959ce037f8758dd8080f62eac92bb38a176e9da9b8ee2da63e515e01eaec7e3295bc4ef57d7615fa
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..41763ce840d3
--- /dev/null
+++ b/app-dicts/sword-Phaistos/Manifest
@@ -0,0 +1 @@
+DIST Phaistos-1.0.zip 1492 BLAKE2B 6e6da400b6f2f3512137dc1b83d095ba39803285ad8e8c59abb52e8d9158464c88a122ab777ceb80e672023cf4f0edd1578b77e70676fe9119e4dba7f50e7534 SHA512 dfb19c009d5dda2dce4276e0b72e675b64b9cde9bd53278c29e53eb5bcf7bdbdb4575fc8c5ce3997b19df50e5593bb62be43a49b8b135051efd121e3e694f67c
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..7fc1f90c5ff9
--- /dev/null
+++ b/app-dicts/sword-PohnOld/Manifest
@@ -0,0 +1 @@
+DIST PohnOld-1.01.zip 424926 BLAKE2B b44d9bb8b9a869473ca7523d18d506810c357c9a0b837690867633736e8b957f82c49333010cf7a4c22f5b78ca9745bf72c45c632d2eba86904b9b0f8b85f0de SHA512 ae10c486b76473ddec22a1809d58f97f1cc54b6509cecf494ff3202e7646989fcfbcb07ac82167f122881450a4ce295ae464319e57505304ed942804625d87d8
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..8e1ca0b99d6c
--- /dev/null
+++ b/app-dicts/sword-Pohnpeian/Manifest
@@ -0,0 +1 @@
+DIST Pohnpeian-1.1.1.zip 1986578 BLAKE2B c9fcbcd7b44403b4606cc64891557566bc4e97992c6ec60ed3a0cc6046c1086244f73b147d77a7281ecba56aceeba358629a61d1253193f1e5939b37a93d7760 SHA512 25cac36e86e5f1a92064fe62c4ab908ec066c524474bc8cca151611c5b3dc4176e0dbf95e6cc2a9acf6c9f19121f31446262b45d61f3a0c3a689ce45814ae6e7
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..46611ca3e301
--- /dev/null
+++ b/app-dicts/sword-PolGdanska/Manifest
@@ -0,0 +1 @@
+DIST PolGdanska-1.0.zip 1527305 BLAKE2B 68a368f1ba39fa858c8b318281726eee2aaa39c66af0683db9e055a990d9197c4e8917708e8cbbb26ffb5d5d7c127b676a47419ab6b054df3ff3472214a87d9e SHA512 41cf14babc30f5e94d7891d0ad727f116069617b4f82b81394ac7e8156dd9187f65d92ac2d487259242115540d774c6df876e5d2587dcc608315ca7e12d938cc
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..0aa7ba4b351c
--- /dev/null
+++ b/app-dicts/sword-PolUGdanska/Manifest
@@ -0,0 +1 @@
+DIST PolUGdanska-2.1.1.zip 2250429 BLAKE2B 2ef74cc8f22f6cd3c647fe3e0786c5a0055f6628578e97043e64de3f5353bb535592e2883adf2fb52cbfba2d3b73038006fb29a51de551b5ec39c250a83c63aa SHA512 d5f915f8589cfdd9892e455a171cf7436a8f868c684c5533d6e3882cec319dfb490f3f4f5ee3daf5423648402c0189c532df98a93c6f4ad8dbdfc0a04498b965
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..50e1a39e2af6
--- /dev/null
+++ b/app-dicts/sword-PorAR/Manifest
@@ -0,0 +1 @@
+DIST PorAR-1.3.zip 1487651 BLAKE2B 9bdcb4929cf8ae2a2ff2382b2a93ffb7752f56237806616626cc08da90d0dc5a6011e7f7a446acbe80dcaf4a618c80d650700dfdadd7dfa39d673ee8c9bb0e7e SHA512 6dc9db89f9ea7d0137f37b3d89e1acf7ed969696b1623948aa633367a468c33b2988c274b7d05785bb1967d65a305fb62d3eab0ef8ba6926773840c0902a6bd8
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..b5433f2aa249
--- /dev/null
+++ b/app-dicts/sword-PorAlmeida1911/Manifest
@@ -0,0 +1 @@
+DIST PorAlmeida1911-0.2.zip 1485727 BLAKE2B 44e6fc9ee16013220cf1ed9946d85e3167d6b08b9496024e07aa32aaff9238e9fadd46c77a9acfd15f49bf0f3343621ee2e5717e5dbaa793aa1299ed3986671b SHA512 729bbdd5fb1411ea2ddefcdf407c9532aee83f885b89c9e875aaff9bdb375e67c604b6bb3bbef4599e045bc82044bc7981d8b4ef196e55c3b3e8c8b8e180da1a
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..607a7f8925e5
--- /dev/null
+++ b/app-dicts/sword-PorBLivre/Manifest
@@ -0,0 +1 @@
+DIST PorBLivre-1.0.1.zip 1591833 BLAKE2B d189fe440555bf24f8cb6bb8c09cef3078c3d6ab440d6294d925a5393dfe2cbd8295d68d069d9d148dc94e8499a028e34d714d63694bf50588307a15487fd007 SHA512 5bf02a9a29b9af2067de3aa545d2106a35417fbd59928bb68e081376c8a960e85be32986801f509e4d6391e1128050b53bf37bcfd1676b16d9dbe04a4276e2ed
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..f506bb2b7461
--- /dev/null
+++ b/app-dicts/sword-PorBLivreTR/Manifest
@@ -0,0 +1 @@
+DIST PorBLivreTR-1.0.1.zip 1585746 BLAKE2B 0e4fbdc0104ec37fb458c39f32b6e317e4d5afb4a5b5ed80c4371814455deac6cf135525fecabf2a7af81a2b07c50be7f5377db73046f01df7a186ff134f8363 SHA512 a196825146e91a287af4c4907988d67936f7f1e20687f7c91a73165a27b2ef2d0e320d1f63490f38fbe1490fac592ad57a53c42e093ab7634d339d60200784d4
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..cbcfaa732564
--- /dev/null
+++ b/app-dicts/sword-PorCap/Manifest
@@ -0,0 +1 @@
+DIST PorCap-2.0.1.zip 2477036 BLAKE2B b42b011833ec8903edeffcdc99a44f6b5c36f8f9a85845ede52d95ee15de3e86b71ebc5a025de77892de0f530d7d61f65c3ba8c40f013622c8f0f5c69d41a67c SHA512 99760ff299c5c5294689527e2bf2879c8618cba5df17d6752ef75485cd9342ef9e9edb3dc8a08025ebf5e5b483049b04d15c91d76d0c5195556957eafa245fda
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..500bf554fc1d
--- /dev/null
+++ b/app-dicts/sword-PorIBP/Manifest
@@ -0,0 +1 @@
+DIST PorIBP-1.0.zip 138896 BLAKE2B 302cbea984e5d4949300b4b5bae8805888ec50eaa9c60d6eda89899fab9f6b25dd797b92afa129b51f5c5bd1fc9ffec3a075d11c2734af0126c42b22d8ad0f26 SHA512 4adb5d18c16f136e247d336de20863593a77cc3f99e40f1d9ece0b762de2d54dc00d20ba15c26da2aa4646dc4c7f422207b970bf11e4b324aa5a82439b5d35fa
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..9a8ebedc854f
--- /dev/null
+++ b/app-dicts/sword-PotLykins/Manifest
@@ -0,0 +1 @@
+DIST PotLykins-1.0.zip 100068 BLAKE2B 9ca066fc4451309754fb557bae2dd528db626d4c764447553e6fe8dcc59746baab57b14d0263fb510bb90945d72dc78fa905ae8c24c188ff4f8668205be60534 SHA512 5a94d587a820da43749949869be72ae20693eb33f18f881ffe9242d1107d8a655a67598383cdd3a87658a8789212f1339414244a0abd8093fcc53d222cfd90bd
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..c8ee0ecc68e6
--- /dev/null
+++ b/app-dicts/sword-QuotingPassages/Manifest
@@ -0,0 +1 @@
+DIST QuotingPassages-1.2.zip 74662 BLAKE2B 3722a7335885b8fdd912648113aea7c8822ba78e4bd809c06c012b05813a3a1d7040cbcc0dfddd4bb82e3988b4eec868f373cbbf8010da998ce6c02e86e0791b SHA512 7f0ba6a3892f26318db19c8e1068e547707356e1bc30b41393f279fa49a5342d82781f4b29e3e188f6707172b0b36a4acd4b4e06a2a84129128779c6d775208a
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..faf7d30a6750
--- /dev/null
+++ b/app-dicts/sword-RecVer/Manifest
@@ -0,0 +1 @@
+DIST RecVer-1.0.zip 1514709 BLAKE2B 7b20a173e0a2bb6b0aedb395b96180cb94201cda45c8a86cd725b755b01fc920cd4031ebb9ea9cc399046ea4246e4f1138857cde4e683172bc3dfcdf74997c05 SHA512 ae642dc6b228bc64db937c5691db14338b7859aec296c7070ef2159924055b6b4cadb730d27b2107d094d4be2b74880dd65811930d056a30a98b5a3df106a73e
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..6461ddbca607
--- /dev/null
+++ b/app-dicts/sword-Rieger/Manifest
@@ -0,0 +1 @@
+DIST Rieger-1.0.zip 859735 BLAKE2B a25a62002ba19f6c66c4016522044771564182e1e81a9a22bcb8f73ce67a8083ba2982ecc90a267e5dae3326e3e37639a5b63563d2015db683323d5ed1ceb19e SHA512 5da6e85ecb335448712befb74a47c9ae21d2cd8d5ed6ba03227ffb8c916f3b4f261f15eb75035ac22dc1e6ec1fa9a0ea466002150eb93048182a19993055cc94
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..66022dda504b
--- /dev/null
+++ b/app-dicts/sword-RomCor/Manifest
@@ -0,0 +1 @@
+DIST RomCor-2.1.zip 3056645 BLAKE2B 884683e5449cbe1f8cc6f2700b7cbd33790620e5477de63f1f009ca9e0d7aefdcba4b1dd6a253b21669c42ee24e6179f81ca286677770c8369337ea5455848ca SHA512 acc2c91819855da717ff43093a5d2e4055700032a48148a533be4e1f8eca81c722bfc325e4c860bebcdffffec0ac8297a39883aa93d5b18d35b4ee1253674cb2
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..fb319b24131e
--- /dev/null
+++ b/app-dicts/sword-RusCARS/Manifest
@@ -0,0 +1 @@
+DIST RusCARS-4.1.1.zip 3625042 BLAKE2B 37a799559c84a743638a83f7a9ae12eb3ec58dece748eff0cc8b0d3e396ece1432ff415d40252b14abdbdc068ea61361b2eeeb3c925bbec0e256d21254d5ce23 SHA512 c4e6b38cb522525180d469b7edd0194bc095565c32235fc15ce65804f8fd98e7b9d56512dd382b13c18595fccd171baeef111521b123a35dab83dce4c71b4cd3
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..07fad1047fac
--- /dev/null
+++ b/app-dicts/sword-RusCARSA/Manifest
@@ -0,0 +1 @@
+DIST RusCARSA-4.1.zip 3589059 BLAKE2B cb48dbcbca5d4cbd6b7e1b0ae1b40b3f29dd340a2ece88736090091f988ac1d3e93f1d7b79d2218e339e42f441ce53d6e3c8ac8a42edae6e08e02e4f8e87bef7 SHA512 b6bb2970175116f53b232657a47f66494048d0b78a997a635dbdb963a2994ac43d87229ea345ba3850d5cf4d5c48c4f4c2ccf8480a48119936520176e1c3ce1f
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..2bc3cc11f118
--- /dev/null
+++ b/app-dicts/sword-RusCARSADICT/Manifest
@@ -0,0 +1 @@
+DIST RusCARSADICT-4.1.zip 208866 BLAKE2B 20ecd33726886388edf45bd51d5a41e79efe2bef415565849a3723a47ea59b10f5bdb93f3a7601118707e91429901bd4d6aa0d8ad902ef4da5464dcd34401356 SHA512 7657f886168c3c972554781a85f9a715c971fb5344e02f71be3d2d5cc0ffd101400679de4723ede546690d978d094a63a1e22aed6c211c5dd09b0533c4978adf
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..3a669a3dc20d
--- /dev/null
+++ b/app-dicts/sword-RusCARSDict/Manifest
@@ -0,0 +1 @@
+DIST RusCARSDict-4.0.zip 4126592 BLAKE2B 46795ab592d369b9ba1d8e758b8a36569ebd2e9378809881a6935b3a0f268755926b37e2657a732efce52fee37f95bf24495283847deae5ba98e36a1eba51469 SHA512 d4521e5b2e961bb2c8247d87a5d7d925477238951e37c2fd2e45594623b3372b1215ac4e39bb5bf4fe5529f3e800f7d43ada2ff70f0272a106006c3a280d92bf
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..531b55ef9067
--- /dev/null
+++ b/app-dicts/sword-RusCARST/Manifest
@@ -0,0 +1 @@
+DIST RusCARST-4.1.zip 3604067 BLAKE2B 41d226fe8eddeb02c238369aac26e800392e18a817a445d48a64e60ab78c977d7b3fe0ccc5f182b065a8d10e7efaedaa01a3aa937481aa156b94d36c954216c1 SHA512 68072e8b8ff3f30b4ee09a9f0256e6622abaad3f03d1accd17caefec5c2873c14ed52db02bf1148435dba4619b29363a9273fece3ba3f232212fc448ab016c22
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..c957634c7806
--- /dev/null
+++ b/app-dicts/sword-RusCARSTDICT/Manifest
@@ -0,0 +1 @@
+DIST RusCARSTDICT-4.1.zip 209364 BLAKE2B 12c32e6708f100283c19f124b55fdb3a6d156d38d1e317da4b451e3da0423f4e4610948fa94447c636016fbf9096e772f33029fe698d9acbcc8fe9af737f3b4c SHA512 a46a02126d7afee216727d353e51fc269fa50886b995ae90e31b7496634ea2f244697676bb753b230b09a661f5f6cd7b8145f8124c65906a404cc1664eac65c9
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..52d61c78668f
--- /dev/null
+++ b/app-dicts/sword-RusSynodalLIO/Manifest
@@ -0,0 +1 @@
+DIST RusSynodalLIO-1.0.2.zip 3147693 BLAKE2B 839a505b14df0fa34ea83a265e04cf2e596a37ad241ef5ada1d92d7d0eb1138cfba72ffb5f53bef5ed9334c944a8d58c4b1738bf37b183d59e73b66e476732f1 SHA512 4667410e8050d6984a416646fd4a4473714c505dbe6b56dce4205d319c702f6c487fc1fa05f0aec280a749daf8c4c51faf652b0da45fdf5dfcf35c83b43a934c
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..b6b0380325a1
--- /dev/null
+++ b/app-dicts/sword-RusVZh/Manifest
@@ -0,0 +1 @@
+DIST RusVZh-1.0.zip 1918395 BLAKE2B b3d21b9bb4b5c083be0e71cb0260e531b4b86190ed37cfbb7885779713e400979c6055509aba2a57803e90c9767c62c677cc5422ff94e8a12e38334894741bd8 SHA512 4c871f453fc6115a607bc7949ecbaf4eb030de2a1419796efef81d55f1a8bb622e4ff8aef505d2a6acfc89e641875f4aea36c5a45c83122de016bb98c7105f70
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..fa68be42cc61
--- /dev/null
+++ b/app-dicts/sword-SBLGNT/Manifest
@@ -0,0 +1 @@
+DIST SBLGNT-1.3.1.zip 602907 BLAKE2B 684e5f4943227acbc4082741a2720a05673e69aa945d0cc1fcca242b24c780fffb56bb8ab5d4c699f483a80cba7329dc385e56e5c87b46bc0de08b6c28d72455 SHA512 8cd6ef20e2f195eb324567a1e2d4124c24b6b69bcb796b21e1d198fcc6dca949003007b326af93b873c210c911a7d8976207f2536d91e7b6e29dfcafb2709d64
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..e17a2472c2ac
--- /dev/null
+++ b/app-dicts/sword-SBLGNTApp/Manifest
@@ -0,0 +1 @@
+DIST SBLGNTApp-1.3.zip 211517 BLAKE2B 46e91b64fdc3d7a0d460968ad9858bccfe8a0c1451d6a9bad73a6fe5997bfaaf69726612854d766cbbe456ae8a4f1c2235bf38eddd8410dbdb6edd00d819d9ae SHA512 9bdf607db57e4448c4999b597b2bef985f5c171c09419cebbbcd8ae3ce1360180977c33229f3a4ed2179b8129c75370f0bef11ae6cfdd9c4d000d017df2deadb
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..3a3d51eb3a19
--- /dev/null
+++ b/app-dicts/sword-SP/Manifest
@@ -0,0 +1 @@
+DIST SP-1.0.zip 1169815 BLAKE2B a01f1fe5b2055068360d9e61aabb23a6a9f9166628edea74309b9a05fa0b32ce372f6064f81562f97abaa6e2518082aad9a2f27955d6ec4012c39eecc1ee37fc SHA512 766d48ee136a093c99a2a58f221e4ec1e0ae68be6b2d95c0e5bc619ee3534dcf61f0ac9be389ce7f2295cba831e2916cfbf54d4ba588302db17ced51ae497b52
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..03fcb7bf2db7
--- /dev/null
+++ b/app-dicts/sword-SPDSS/Manifest
@@ -0,0 +1 @@
+DIST SPDSS-1.0.zip 126280 BLAKE2B a661af321e75bfbcc789236c6e5f9204a35ca6b84c3d13ef462c416c761b0f183e4e9d0247caeb54a3517dfc3abf782d235595d143f810d38079258c0d63b7fc SHA512 5fd67e8f332582c71e1a341e96af9eb6b3d21ab8a75ae5eb1ba08f1947bfa2e60f0f1aec494b706d2397171f6dd5a774abb26fdd5467973b5513d509ca8ca79c
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..dc59e42c8ec1
--- /dev/null
+++ b/app-dicts/sword-SPE/Manifest
@@ -0,0 +1 @@
+DIST SPE-1.0.zip 275090 BLAKE2B 61464838b19677cae2a1ad577fdaf4e242441f119bc9d3029ec196c220f9c40b4139026d9bb120d793f5517a1aa698c699c223b077829d89f94eea5ce76b0f73 SHA512 e04821b9d3321086cb1fb52063b2acbbe649e6177a0ac6cc87d5ef83e31e0cafdc58606a598249462b93e7694d62632bd04e4acf206dd6e212ccb87bf04d1294
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..144dca3b34d1
--- /dev/null
+++ b/app-dicts/sword-SPMT/Manifest
@@ -0,0 +1 @@
+DIST SPMT-1.0.zip 1146260 BLAKE2B e3190a4ee741cca6f275a72a068fe6d41415a2ccdbc2781fb6a4c6abed467724662888f1214474ef7857831038c6f0aaa568f26d27d9991191d36bfb034f3780 SHA512 3099430adc665913c87a214835ea3ccc644fea8b48a4c2f46737c065ea0768ab43547bc5a722034b5018e30b9e46ebd8fa48c3911b3ef68ee79ec0ef8626fff6
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..eded0514e180
--- /dev/null
+++ b/app-dicts/sword-SPVar/Manifest
@@ -0,0 +1 @@
+DIST SPVar-1.0.zip 271904 BLAKE2B f47e155f8149729f6ec836a732c4ed36d9a501cb5e763d80f218c151da3b79be5d19ca8bdc68583030e73e67f1783e95a4a642126f3467e1a54728ba389f78c0 SHA512 76ac4f9ac2fdadf8801ab60e122bda478194f749b549b7686c0cd7e1874cf053dd85d6a59ca3f4b1cc39b8e85bb56f01eb225d3456d217677dcfa269f7de4962
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..868d8d96256b
--- /dev/null
+++ b/app-dicts/sword-SahidicBible/Manifest
@@ -0,0 +1 @@
+DIST SahidicBible-1.1.1.zip 728553 BLAKE2B 8d8b040312efe77c48ba483080883b20a8e3c96d5b709e70cf8f03f3418453b5fff73427e780bdbb6e94f6aa0a69674fcbc17deb3177d411f0682cda00b47f87 SHA512 a7ce839c8ed498fe296218e6eac86f373a0bdb8cfba107bd4c33d4b2557acc02ee2d1cf57a605f096b2367c7d104486565c8a73d111da98ac4d87408a4595955
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..b85346484ac6
--- /dev/null
+++ b/app-dicts/sword-Sentiment/Manifest
@@ -0,0 +1 @@
+DIST Sentiment-1.0.zip 409335 BLAKE2B 6f25250cbe97cc3bc7dccc193f494306695f07caa14a9eeaeaa2398ce1ac02fce5c1fbf139c590f5af43cd0b420d2c51abcbe40189807e4061a1a1b07eb9ac8b SHA512 066711b437075176077d18a990c7d61d643b5b33e35f588e5e34d0a7a1e7edc9e738c899ccd7102656fcb640f121bd86a5a9ee1ad1c0ac51d1f5f99b2fb34eb7
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..2900c0c465c7
--- /dev/null
+++ b/app-dicts/sword-Shona/Manifest
@@ -0,0 +1 @@
+DIST Shona-2.1.zip 1433824 BLAKE2B 555b5f956a34e88aee96da0f8a0153e92757cdee6ce7ecd25a2c9463db0d2808b9ac02ed270ba7c093b1f00a13e334b83b5343c67ea6a256686277ba17c74b5d SHA512 043f9e75fa0201cc5850c32f9fc29bfaf2d971e4fac0a77cf7fca7c65d20141303acb43a32522a23a4f525807598dccfb134ab0c2a30892ed2cf7d4463d4160f
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..3d6f7fa04e94
--- /dev/null
+++ b/app-dicts/sword-SloKJV/Manifest
@@ -0,0 +1 @@
+DIST SloKJV-11.0.zip 1289946 BLAKE2B 82dbed6f1ca68079146c808b2a99eab080cfb2b019336e402be977dbd856f50b2f51c28d4655f2498d6dc2dea82a15a2ff3769769b1ebd408e3599855e8eea75 SHA512 250864c6b5aac6de4d15b480848ebe3b66f8feb68871ee354107de94703db8139a45510c879a5882100f76920036804b7ebeb76e2bb5f12b4a59f732328a5fe7
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..7121466f7abb
--- /dev/null
+++ b/app-dicts/sword-SloKJVA/Manifest
@@ -0,0 +1 @@
+DIST SloKJVA-0.3.41.zip 765532 BLAKE2B 9213251aeb97bcb773987874f481e6798298a37b2821072f41ec7d9cd00c09b23546b60b14f3d9c5ad5f81ddfc4d79f02ebaf7419aaa4fc9f1611d7c224e7f77 SHA512 066924e395b8931a387ddc020b077c0d04cc583d4f999295086ee178e683ba46838bfcde424d7aee46f4a37de48cf33ebd4cf6ca86448b5371f74be39130442a
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..61553270119a
--- /dev/null
+++ b/app-dicts/sword-SloOjacano/Manifest
@@ -0,0 +1 @@
+DIST SloOjacano-1.0.zip 163348 BLAKE2B 5723462433b70f8946bfe24a79301b026d84381b8ba44a42fac18c72c4a4fdaec345bb880fd12c7db6c2343067e1aff7e784ee2259fb969540b63fc3571c7834 SHA512 202e3f53add5f587b43e2196d4e0ca297283f80adcec40a1b27ff326da6ff039d716bb94c14de6f8b4048424d4329e74f07a8a904b32b6f717885d92efbacbb3
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..0f92c47a3c44
--- /dev/null
+++ b/app-dicts/sword-SloStritar/Manifest
@@ -0,0 +1 @@
+DIST SloStritar-1.1.zip 464914 BLAKE2B 43277208d60a534f70ebd5d110d2775744bcce1c9e3b96ecc0b611484afaa3a8cff39edb9ab343bd7afcdaf8a1a2f68d5f6e7a332fd3016b3427e37e9683c2cd SHA512 6246a6b2aecddb72a45b4ee9946560f25d41ed7f517db1776f3786b598f7a7c05812a4429720df8acdb69808a4e766fe92e60e0c7ac3e9b17a338a9547f66a6f
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..828710d2950e
--- /dev/null
+++ b/app-dicts/sword-SomKQA/Manifest
@@ -0,0 +1 @@
+DIST SomKQA-2.0.zip 1900896 BLAKE2B 7f4162c8f925eafe4ee385dec070f03f58a5e32b7d5ee04859004f130cc01569a60e63427159739c41f4c54644b86a9db92977a110d421da6b14fda72b3e751a SHA512 b420de364fc7f199cefe0bd3b36b873f789e6ba439524c5e6207a8a733c3f557a51ba99107fcc67f59e4595560393b0c9778f91652549857d3efc8bba45f5b2d
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..50a79045f602
--- /dev/null
+++ b/app-dicts/sword-Sorani/Manifest
@@ -0,0 +1 @@
+DIST Sorani-2.0.1.zip 526706 BLAKE2B 9a666d6c6a8a34e4f7b57cf57684f0c7b0d3c0560f956d45a34089d6e2fb291e311e6cce6f6dd5825a0e80a2a473e20b3b242aec45ca86c84cd27f51643f1fc5 SHA512 19f2ae307209df9527f3bce37b63ce1118caadf6765bc96324cf206bebc6111d2b69602070cb5268dda0f52d3d172e203a8a93069995dec91053a97e6df71743
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..e3d4a0da850e
--- /dev/null
+++ b/app-dicts/sword-SpaRV1865/Manifest
@@ -0,0 +1 @@
+DIST SpaRV1865-1.1.zip 1530877 BLAKE2B ca53784806d131195f53a48f38fe4e3ed39bc258db123951264bf84943622a129e3d930c84d1411ba5cca1cc407a00d2fec24a142350e2c459aa3769a4b1ae16 SHA512 df6c62ef00407f47a772131533ce73fb94ae5850d24ce6ee4ffe7bc26467b84fb29025172e2ba3a0ddb53fa8edc3f5a2042055fa88ab6f38174f796f8a08ef57
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..25e662b15d96
--- /dev/null
+++ b/app-dicts/sword-SpaRV1909/Manifest
@@ -0,0 +1 @@
+DIST SpaRV1909-1.0.1.zip 2817495 BLAKE2B 2241138e28c7701c96182bd2ff049e5237c1cc80393f7c80087727f2501c6ef104053e89e97e3c5227ea623640a45f405cee0c8a92a9b3211d7abb7ba0307d2d SHA512 690706dc0a114ededaf7906c8e642fcb0c053b59e0b330e80521592385087aa2567979e55e9527fc905ebcbf324eea481d23fea8daa976321e0e5ef58d3d8fd0
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..3d8f700e5003
--- /dev/null
+++ b/app-dicts/sword-SpaTDP/Manifest
@@ -0,0 +1 @@
+DIST SpaTDP-1.0.zip 408008 BLAKE2B 1e938511ba68a92d116fe39450cfee3c0358b1588527446d3f10aa0d6c49f1f68eea1966087662cc4664f8aaa3b1eb3f2ba5d0438a7fe8c84fa677ca201294de SHA512 b0806c9a34f5af6b01eb64ac813f41481ca103a59738ee59a46663b715c6a969a93ad61be65f9796488078ba9d15a9c4c58900ce3e54bf415566bac3a7fbb56a
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..f0d2a1e1fbe5
--- /dev/null
+++ b/app-dicts/sword-SrKDEkavski/Manifest
@@ -0,0 +1 @@
+DIST SrKDEkavski-1.0.zip 1609954 BLAKE2B 98fd1edd87512d5ee6c0a7aacc45034109129b3920d1d6e2a01c97a53f97a830252bc07cef2f480f8c8bc345bc75a7bcdae213b8d8cbcbeeb473763c6c275e53 SHA512 fad6a98670657cff8ac427d4ae82eac45fa9b2c91c47a64aef185012b80b9d30663db055b8c5ddb28dc1d529c7708f7d0aaa08a36d237f94f9f35809b8500272
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..f07ca0a21e52
--- /dev/null
+++ b/app-dicts/sword-SrKDIjekav/Manifest
@@ -0,0 +1 @@
+DIST SrKDIjekav-1.0.zip 1609798 BLAKE2B 916c704100d5b981be159fdf1d6d5fbd62ab1e443c5464abebebb769a3567d48afb15c6a5be876c59f2092bc9f9152c9fb0430b71ddcd8d68f25fad73e34d473 SHA512 2f4ca321da2bd6b31ed2bd77842de2eabca3a2f892ba2175818e2e1341bc2a6bd18116d59046d80b9b8c1cd106d4c621ef91d9d6979f9e882acf73f7fc89e668
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..fa8838ba56b9
--- /dev/null
+++ b/app-dicts/sword-Swe1917/Manifest
@@ -0,0 +1 @@
+DIST Swe1917-2.0.zip 2375221 BLAKE2B 339c07519f283dffede8d9ee35af180dfa4e6ff0b7ad9fa5fe36d00e628547bbb6aa4ec2ced9fbebad7fa2a897e99d0b6c4ec310cdfc7001c2e4b9e54c972eb4 SHA512 40d14d09389cc6655f691afd767f0633f1456d54368a922b8578b652311b99ba2dbb15e6b29f435955e77f9adb24f65358f32335d468c9fb095983988729f696
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..9419d015571f
--- /dev/null
+++ b/app-dicts/sword-Swe1917Of/Manifest
@@ -0,0 +1 @@
+DIST Swe1917Of-1.1.zip 61369 BLAKE2B f61b354cd25e31925cfc4d64d96421540255cbe521416786165c9a25a604feb04ea86e569ddbc235ecf83d75132a0e5067dbb587af04c51486f2c85f54ae8b9f SHA512 dc38fc33fa813e94f09de94d2a9e1230236440b200fd489576fecd7d5b50745d3a383ed640f130a593453ba16d3246acb119c561bfb8b5242173f7f8cd3009d8
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..8a530b36263d
--- /dev/null
+++ b/app-dicts/sword-SweFolk1998/Manifest
@@ -0,0 +1 @@
+DIST SweFolk1998-1.2.zip 1633828 BLAKE2B cfdd4df8998d942c4358f5ad7625968d50fc9f8f0c1181faca4db2718105615140587782f07ea9262fd016de9ad079e8e109e4d2b03d609747f1d4490bd22599 SHA512 ae2e2f51512c2ab7e7fac1d1366b1e9f59d2aeeffe93ef5077a84bdc8581dd09fa690be7fc37f4e3fa2554e546f88444fc804d31090b732aa03f36b61f72a620
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..e09212517c38
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII/Manifest
@@ -0,0 +1 @@
+DIST SweKarlXII-1.0.zip 1051209 BLAKE2B 16a8fd29310ad5bd83d1de25181bef571bc76cccb8ab92d9313203031e319db3ff497a13af591535b81ee584b1d386eacd4a947d9447c64e297005fd3e1f1760 SHA512 1822468c6ab0a441f3c262f81a606864e4eca77de0cad92d19e6b989bf90084d733ab01f6b0fcea16fa7f1b234d4376f57578713b47bead0042ed99dc53c3008
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..5a796e64d9be
--- /dev/null
+++ b/app-dicts/sword-SweKarlXII1873/Manifest
@@ -0,0 +1 @@
+DIST SweKarlXII1873-1.0.zip 1495180 BLAKE2B a1babb97a0e9bb7e19e7b247a400f18138a3b057bfc1ea6562ec0058781e0fd468d5e3b2a8f3463d11a776342c01a7a4e672d128bb71a5e9b66657d8dd4898b5 SHA512 45ae34a1b943800863f6ee9a1b199f396dbee2d9e15e6216fc12a816cd44292c9db48a83e6814fe8555b635335cae45ebe29c48ffd77fbde16454f16ade4ae68
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..fa7e3d2c0247
--- /dev/null
+++ b/app-dicts/sword-TNT/Manifest
@@ -0,0 +1 @@
+DIST TNT-2.0.zip 511100 BLAKE2B 457c492e5d9e28985a26f55204dcf6ad22f1da5f5c9b9f76a0fc4149ab70b5e5b5c96f1e322cfb584c4cef5ad4465ff1ccffa5c87b4a4929d1b15999a967e72a SHA512 f70575d04fb02e89eae53a7c92ee79bc994c947ee9ad57327df5b0b81b18ef233a7640a7ee1308b97bfca2a513c27885b77264d3c0edb78fa2baec9dfabf1c3a
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..fa249f29bdb0
--- /dev/null
+++ b/app-dicts/sword-TagAngBiblia/Manifest
@@ -0,0 +1 @@
+DIST TagAngBiblia-1.2.zip 1489402 BLAKE2B 099f7690037ded93a19495b44482003aa822c3992edde5c650bb33725693806dd111d032b7f62e87d812784394fe68f5270931acba1d4b2148149406c627e461 SHA512 762150c09ec07225d25c3861cd572781c1ead0f8726bb8e93d2f0343da57616ae6a51272c2d0ebd6eef37b1a2ed88c4c13992eae667d1e09de8644f09cf7472a
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..d50487c43102
--- /dev/null
+++ b/app-dicts/sword-Tausug/Manifest
@@ -0,0 +1 @@
+DIST Tausug-1.1.zip 645228 BLAKE2B a36e610ba87e1fa2ea3040ee2cec32e9e9b081d19efd3a44d9c51e35e864bb2be3131cf6a4c9e3b592a4fbd7b5f7d146a7f65993e7f6e530bc40697f9a67ef4f SHA512 90f9a73f07394a29cf1e03af6f4b18a64ee9c95eec2f5eac4a28c7b81c17d423dc6e69a87b3179a755b25e68d3f202d17d02940106dcef1911dd9c2ba159409a
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..31c9d63b0ea3
--- /dev/null
+++ b/app-dicts/sword-ThaiKJV/Manifest
@@ -0,0 +1 @@
+DIST ThaiKJV-2.0.zip 2168169 BLAKE2B 1088e9301b5f09b37d3ac3e90c36d95e9ea9074c8cd828255b7bd2291003d3cec304ff865ae6923115230df7349bfca7381cb0bff26592f038c61c423e1bf046 SHA512 6d6a7b2a036378ba62e946397958885fb76966027445be6d1d1ee8045f9d57e43c166a879c781536265212693f56cbd96076bcba49ba7601689a9d2f2d0c451f
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..5a47f9c06993
--- /dev/null
+++ b/app-dicts/sword-TurHADI/Manifest
@@ -0,0 +1 @@
+DIST TurHADI-1.1.1.zip 548110 BLAKE2B 346acfbe730d6e8c1ef6f0e42d8d25cc8ed9169958a5871d56e1c5be61aa11f94a660b45f657dcc6da270b3f2f99e52a17037ea96e6dae41644338adde244c4d SHA512 48ce8d47e90ab560b112e380bd6dc2e9d2a6827c1509357751ab2f9702040f63e8db07b5fd06341d884ec4ba88de39bc6889fa0cdbd342b1d9229092039c7bea
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..5c8bd12e709b
--- /dev/null
+++ b/app-dicts/sword-TurNTB/Manifest
@@ -0,0 +1 @@
+DIST TurNTB-2.1.1.zip 2132224 BLAKE2B 50dea0e56b120d66d9a0dba88e916ca02995c665b22e3afb9220c0218b183cfab47c37796f2745858c691ab45c808c4cef1f0e15b232fe26a7df8e8051c4ed1e SHA512 1cbedf1eb264b68cd72780810f36c4cadc70e70c14efdd0a4b50a594cae874058935c836b3f768342817492d6f4d327439e65bc522dd9dd69df2f2a4210c100f
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..f4067e525d17
--- /dev/null
+++ b/app-dicts/sword-UkrKulish/Manifest
@@ -0,0 +1 @@
+DIST UkrKulish-1.1.zip 428367 BLAKE2B 1d1c55d0fc54ed55b55e11bef31e3aaa463480d2058923f3591279002511d05636ec069d23f0687e6b4fe705fbbb72f0a0fb567bf2cfd9325c2af5607b42bdf2 SHA512 4a8d15ec0e62c1affe69c49e1b10b8c72c6a0790cb93924b11b82136d9809399764a42c25fab46927bee27f360935b7ee73350033ca309ccb14ac021b017af2d
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..f2c9c0a426fa
--- /dev/null
+++ b/app-dicts/sword-UrduGeo/Manifest
@@ -0,0 +1 @@
+DIST UrduGeo-1.6.zip 2187611 BLAKE2B 45b7a47ba84defa0f8215e0a9f5d3247d76081dbe26185dd8fcb1bbcfcc617bd18119aeeef5f6dd192371844dccd416232a955eda44c5796988f37b8bd53f73d SHA512 991cfa169b2fe4a4e117c54e67eb40c9715bfb10b8d6c35df0a3a81cb525afcdde05ee727029996545f0a85280e0556231b45ff0e62c6716b88cf0ec60563839
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..c815b857c5db
--- /dev/null
+++ b/app-dicts/sword-UrduGeoDeva/Manifest
@@ -0,0 +1 @@
+DIST UrduGeoDeva-1.7.zip 2442351 BLAKE2B efefe39dc9b5bcaa4d14e68de9d612deb162727da3c57f43638626c10bd6fd4981db75a9a6414e5f6b2bb4fbe02881f13fb6c695af985bf0f95a4ff6c5693254 SHA512 24f4250fc878705364d9c3aa0758f4613f6b14756c48443135f3b4cbafced1077fedcf5b9cf1b7a336a97b40365dbd1acdf36e81e5fde26970c70a836e7111ef
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..ac2e98c58e60
--- /dev/null
+++ b/app-dicts/sword-UrduGeoRoman/Manifest
@@ -0,0 +1 @@
+DIST UrduGeoRoman-1.1.zip 2029001 BLAKE2B ceab12a198581cb1c30aeb08437e1c18018bcbc2d90b644145e243b9ca723a98da07ae20a9af6ba955a964f7c0ba4a97671649be11549d9e46a32df8a9dacb79 SHA512 2776d1c54405b1d43f6f6a390570306cf572f44d742a57f3dd4f678fea7b171297bd6e9d6f5ad36d50258497bfafdaea8bb5bee2a8565a5ef519ef09cd246a52
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..96f09fca578a
--- /dev/null
+++ b/app-dicts/sword-UyCyr/Manifest
@@ -0,0 +1 @@
+DIST UyCyr-1.1.zip 1958778 BLAKE2B 56d10db568b790bfbc9969be6ccf5f2abb1926ee778846cf8bc02e235fbf53321083021101777b051ef7dfc373b6de1d5cd52bbe71206d209f3f30f31beb5324 SHA512 b1e1393c5774d485b700b7d2b0ece24b600ec40a82b0859310c2c99190b1a5e19740afc0ad8cc1e2569c4f7b7d28b18e3d6d12ca048fc48652ebd5376c5a9935
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..42f52f9c2fc9
--- /dev/null
+++ b/app-dicts/sword-VarApp/Manifest
@@ -0,0 +1 @@
+DIST VarApp-1.0.zip 925096 BLAKE2B 51051e5c529dcaaacf426cd9182902a7b99ac1e54a98bf3711ed9a37cc0f23c7e3ebd20965552fcb129b4c3be86d0d9f6b550b0304d720b30f38e35ed6398428 SHA512 512030bc6ed288b1fbb356d52b2e33cfa73a392dfd64777402b84d9bfe58336e6df7fddd04fab393b98f7ede21293e696d7540394d07f832d9f2254b9292f1ee
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..9bfbeeb4ddfc
--- /dev/null
+++ b/app-dicts/sword-Viet/Manifest
@@ -0,0 +1 @@
+DIST Viet-1.4.1.zip 1557474 BLAKE2B 3826bf444b9bab0d685a540796aa7bbd032df597453e4de66a5e7749ba36c87501340cbd6bf3be1f7e26f76b2b4d7b5ec43168984c014ec719e6306470254e0c SHA512 ffa89c972243108390db78051556159abd6023f849fc22ce87a100cf05515a6a18e0124c1e477a7bd11412498af1328f4527b533e86d01946ffbe28d6a0dbb66
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..56e5b89246cf
--- /dev/null
+++ b/app-dicts/sword-VietLCCMN/Manifest
@@ -0,0 +1 @@
+DIST VietLCCMN-1.0.zip 1958369 BLAKE2B 44802e1037f5c6a5df982e3f3d07f49215d0f8eb192113bc95bb695edce0afe12636c589311065eb51f0b99e36ea3f8a1d009f6a4f7d5f2fb5d4feb11c76d689 SHA512 9e2fa69ec54b2e3b77c124d84b4b1ca4facdcdecf84bbb891b2bac7b99c12e7cb9c4e8bbc75f66389866022181bcbb1eca9c241a11c45f7a9f636c45d3461edf
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..bfa4f3065933
--- /dev/null
+++ b/app-dicts/sword-VietLCCMNCT/Manifest
@@ -0,0 +1 @@
+DIST VietLCCMNCT-1.0.zip 887742 BLAKE2B 25f6c1531bb807c71d4226e9114f35e144493918b9db4602dc8392cc308ad30532d9e62ee68e227652ceb51c442c21f3e4f7fd597c6ba45f84673c74ba1e5d86 SHA512 e890df3d2adb1b8d359326151217117d083bcfd7ff80c61c4c6d608c157ce5709384dd24eed0ce71edf484c8f20941ad4717f795e0974becb7b9d48c8abd3ff8
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..873f5a5e6d63
--- /dev/null
+++ b/app-dicts/sword-VietNVB/Manifest
@@ -0,0 +1 @@
+DIST VietNVB-1.4.zip 1914442 BLAKE2B 8ec207b384f7823a3c6aaebfbf8fa3c7de04f3ba6ed46a691432856171ebd44a4d4d51e00c3534d08ae7bbcb9499dc02aa41f72318d63b1a405c4eafd8a56885 SHA512 628fa49425f12bc8c6309e9244b0042f58a13803b869cd8b2b7015c6f7c10226472145885163bbf193cf745aec1c5265ba9bb9bd7f57029963a4cabbe2b45821
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..49d4c6dc52b0
--- /dev/null
+++ b/app-dicts/sword-VulgClementine/Manifest
@@ -0,0 +1 @@
+DIST VulgClementine-2.0.1.zip 2075201 BLAKE2B 6e3ea414bd1b6299d0152f6bd8aaa77878329a5eb4a5558b7f517058273a5de487b64107e30b966dbc81b31a4572ad568e88f1c9c130f951ee693a2946cee709 SHA512 e1cbe11884c361e2934c9f872a3b4116734259c2f4cfc5a8b90ff1c8d7c757d48eb8362c4cef0759c23e793e76a58c0e17edc724e24c2bb9fe486ba18916b918
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..a257c8ccafee
--- /dev/null
+++ b/app-dicts/sword-VulgConte/Manifest
@@ -0,0 +1 @@
+DIST VulgConte-1.0.2.zip 1641941 BLAKE2B bc725367f449d0d864641040d73eca08e17199f393e85d266f75e905328d977648d6306f35fb22e936118aa421b0a4fb8139132cd90478258b65f15ad5d2f61c SHA512 d648b7843252ebcc946bccac69db9fcabd3417cfffe25ef0f7f7ba1cbcb2a38bc460ca4dcd92cc1273c7c523cba5d5630fc152454f2149005c42b3618e329500
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..c1628046f0af
--- /dev/null
+++ b/app-dicts/sword-VulgGlossa/Manifest
@@ -0,0 +1 @@
+DIST VulgGlossa-1.0.1.zip 2148186 BLAKE2B 5d24b1b10e3847776cadd041d53982a2555d6330fdbcffbad466db76ab12cc95e5af00c748c0f7a46b7c79399e3a5ac66e8fe5602cdeb6d42e28719abea03473 SHA512 b184d3d33d4ede0d7e836e7adefd473f6e8793048c1c10da4eafcfb891a82d1ec46b1bf3bea2ccd858fd879e6479aaaf2a620d0645d7a6f2f51d4453c937daca
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..4aa9c86406ae
--- /dev/null
+++ b/app-dicts/sword-VulgHetzenauer/Manifest
@@ -0,0 +1 @@
+DIST VulgHetzenauer-1.0.2.zip 1641511 BLAKE2B 8f1254308b050e3665a9e63e587d0f7316636281bfae0417f87f1f2663fcd5c7c9ec31e1ce4eb849257720add59cf29c0d9b46d7d8868a2db2b689f0173f39fa SHA512 66870e298235047d4a9d295e670ad7713c273248ae31231630d01cb10a9d227f02485f485d6699bce991c843041dbf416d687fb74e343414e9e7d3c8405d9c80
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..e32e68beab74
--- /dev/null
+++ b/app-dicts/sword-VulgSistine/Manifest
@@ -0,0 +1 @@
+DIST VulgSistine-1.0.2.zip 1632044 BLAKE2B f11f8b11280bc872de85cdb227b9f349332719f263272f0d7b4ba724f854e292031b3d197297cafd6a82516b2d54601469e2a273eb26630c81950e9c73e847ce SHA512 b53f5a452716f39ac93de0ab0356b4177160608c37e8d5fcc4452f8212f57d76875ee69ab1447ae66c9188c4eb8cf9889147f0b76a686a703cbef12634da30e9
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..c2df317eaa62
--- /dev/null
+++ b/app-dicts/sword-Webster1806/Manifest
@@ -0,0 +1 @@
+DIST Webster1806-1.0.zip 1953871 BLAKE2B af39baefd2d1ab5e3975f52fb45afb9eff2d20fb0b5d077f0047eae5b0cc6c00176adbcb6dc6a2dde4a8a6bf09353281bfbe03d4eb600a02d25388cc22d1a1e4 SHA512 d6926297f5edd0f20141341119c2ca89ddc8025d6717f9825d1d34e6be73a7576ff05e4bd5bf84e053011faee5c2ca2fbba3d0fae8f566ff181601d2671557ab
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..0ee1799c5b57
--- /dev/null
+++ b/app-dicts/sword-WelBeiblNet/Manifest
@@ -0,0 +1 @@
+DIST WelBeiblNet-2.5.1.zip 793457 BLAKE2B 43c62105079631a83c033e3ef9e1a7fc8a4da10c5d73531d6187bd8c7b7c0c8663775788783a30b678795da97aaaac8f87d4df33767696defe9741bd1c0d31d7 SHA512 62733735103786f6b4815ba50698a0126641467bf2bc035f8e07aed864036dd2d329cc65e74114126912df4f892f8612139576117fed46822ccde86b6310f9ba
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..87ebb233c382
--- /dev/null
+++ b/app-dicts/sword-Westminster/Manifest
@@ -0,0 +1 @@
+DIST Westminster-1.0.1.zip 444333 BLAKE2B e12f3f5de0666dbe4a64dede65d14c06cc03fa134fe3c47b7cda5c21f98f2bf3434c65c543a495b088ef41b4159ec02e63c70779736d643aaab0f22af4c2ef25 SHA512 8d11a793fdeccd04f75073129e5a695733d3b73c4396e54c51bdaa283f3847c295e041d81c04f4c30565206ec793e5a8f32ff1ccdd1611c419d08b32a2a58de3
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..730d2a59e12b
--- /dev/null
+++ b/app-dicts/sword-Westminster21/Manifest
@@ -0,0 +1 @@
+DIST Westminster21-1.0.zip 214728 BLAKE2B 465ef32e151c6f0cd9a040175c6358c343ec117dbcc0d50ca4e47bfe3685c64cb19a108f58dcee9b5366ddd8b89d117540701ce638deec046104a01720e8bccd SHA512 63ca88120c26130a0275c724cba205d5e0905d3568df42dcc4026c632f724b950394ce93a6cc7c2288ef8a9a015ebf9e6b9102c545f9bce59884aad34635250a
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..9f0e5b8afbe5
--- /dev/null
+++ b/app-dicts/sword-Worsley/Manifest
@@ -0,0 +1 @@
+DIST Worsley-1.6.zip 407194 BLAKE2B 26a2868fa67dff75cfccef91537c6c7105a62106d50b5344496676620b7f8b35c80021cebea3f08121f908dc85f6f406542640e4f1e229c595f78026deaac369 SHA512 6a88eb8a77207c14548d6ea7322f16a6f88d504e835d6cd90254562c89e539c8c0d9094f447d7db5626a5842b859db9dd5810e1cb6917982103e1e434c0821a6
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..3155b97cf04f
--- /dev/null
+++ b/app-dicts/sword-ZhEnglish/Manifest
@@ -0,0 +1 @@
+DIST ZhEnglish-1.0.1.zip 1148611 BLAKE2B 9f43eeeafd6c83b9b516fcc9a74b05b33f5926b3aca43dc9ee5cbb82b794ba3632c237cbb95ea49df7765c48e2a10093e59e8047f356c2c93d87a02258c4a03b SHA512 dcb596976899a48c9209d3194d7389f5e97ceef1d0108b490d5e6455c16b59a7de490fbbb69da0039dbc1d64f0fdeab7664cf2d6f961d93be7fbee09b155dbba
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..3279e2096082
--- /dev/null
+++ b/app-dicts/sword-ZhHanzi/Manifest
@@ -0,0 +1 @@
+DIST ZhHanzi-1.0.zip 801576 BLAKE2B 773c13c5de6a9064611b1f476e55358bbd4921bb1f8be4ae67f916cbd5dd2e53a4215e1f7031120d6378ea14784dcd4d9b71d8bc723f3736166346333e697b33 SHA512 0cd514d514fafddc70c964210a33018bb219dd1dd97b320f043105b229992f924be171b462b8b56c43c09f8681d4d37ba34c9b3d9ac452a3b012ff8c8ca7b8c9
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..beae5880a977
--- /dev/null
+++ b/app-dicts/sword-ZhPinyin/Manifest
@@ -0,0 +1 @@
+DIST ZhPinyin-1.0.zip 644691 BLAKE2B d970905361fbc09217af237118c14854f5b36483314aca19c954710e01ab740479caeabfa414397ded1d0c23624d8d3b0065af11efd1863f9ccab4f4d75c5a37 SHA512 0c96c831d97dd8d7b707e4124b336bb8c6f01338e75fdf4c604371e2f120ceebbb37d3fc28458f86fea74b3accba88689dfb9da6ec8982d721758adfd06c4007
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..8690dc4afbe8
--- /dev/null
+++ b/app-dicts/sword-alzat/Manifest
@@ -0,0 +1 @@
+DIST alzat-1.0.zip 43100 BLAKE2B aafd0cdd7e31c005335e1c1c77b7fb6fec14cf2ee5d6dfcca5021d4616845c347f6c5d0eddcdd9c87d9d36f79a16af404e07ae50c77e95d2ee2ab9120a5f72fb SHA512 aef7a83aca6a65bffa87750b9f3ca13afabb1369dcdf3beeb5d70556fb9f422e75851675e31566e41751c7e92249c169fca6c53874ff295565546cde4d19606a
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..683d682379e4
--- /dev/null
+++ b/app-dicts/sword-br_en/Manifest
@@ -0,0 +1 @@
+DIST br_en-1.1.zip 7016 BLAKE2B 12264230697b98ed21ce8e0191a2380cc6c10db617e524405d0f64a6fbc6dbd79b05807c0c262ff57bc3c736dc67693c6d08ab66493cce99616cf045b60a383e SHA512 8c5bc58e0e4535192367302cc55a9b7208127bd52d0591f10e3493edfe51a237a69a2992e22f83d49fbbc0f2d04bf56a191d5d2481284dd95d916e5390396cc8
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..a19b037408a6
--- /dev/null
+++ b/app-dicts/sword-en_eu/Manifest
@@ -0,0 +1 @@
+DIST en_eu-1.1.zip 10034 BLAKE2B a4de449ef3ff7b3e5436dea9f0e5a50545261973eb26ba03efc065c0d863b2a68a87a87e17369e85a6447209794f559488c968f7b17d38f5734b0e9c69811b00 SHA512 684297b7eb438952b2d0dc78be5d2b468da7515d304050fab3cb0023bafe32cf78a9ff9fec9d4e248e07da6f4b9ebf50a21f651f560f8224fd517efc885e4fa4
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..9aa47833b05d
--- /dev/null
+++ b/app-dicts/sword-f35/Manifest
@@ -0,0 +1 @@
+DIST f35-1.0.1.zip 405415 BLAKE2B 1692983807c5f26904cbf35e08f07f574f667738103c60ba4360e2379a06698a14ac4cbce910567ad9588b61e7ead0bd742243763326e3895505f7e33f1adc62 SHA512 a3c686a44d645c11463ab1d52140e9493e4a93aff59132acac7c66d4957fd629e3e9b4b279d8ba6c3fa2b93642c07a4642ff7ac7517783b34ed733af42969039
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..d25345900b96
--- /dev/null
+++ b/app-dicts/sword-la_en/Manifest
@@ -0,0 +1 @@
+DIST la_en-1.1.zip 104210 BLAKE2B f28418e4c1524466930cb4a56b3136e8f2fceb69e9d303b04cc01f7e9edd4a909bd1b190f3821ea1777cd905513edf23689a2d8bea136e52a5223a8dda195a9b SHA512 b4e3128b93d974a0ccd46dac277efcbe661675460a757cbe765a4fd239a24047f18e088cf3d3907d5162d3e2fa0317412863acb71d15aa9ed062a8560591d903
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..a18e65b6740b
--- /dev/null
+++ b/app-dicts/sword-sml_BL_2008/Manifest
@@ -0,0 +1 @@
+DIST sml_BL_2008-1.0.1.zip 925123 BLAKE2B 2004c732396cae332024cb6589fd6de7aa5b28a377ea3a5ddcb8ac0ce03c7d13f63b00b8672894ab988bc706eaba48ab01b7d56ebf7b5d72e982ae919f32015c SHA512 d99af18fc5d1f506f8d5152b0c77d14bd0a09dd3f0258523a35ac8d395e0ff36c2c6735ca714bb5084864703cf4c5f8386d030f4d52a2e714453fafcf30c4ea6
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..dc6cb949f292
--- /dev/null
+++ b/app-dicts/sword-vlsJoNT/Manifest
@@ -0,0 +1 @@
+DIST vlsJoNT-1.0.1.zip 419089 BLAKE2B 8b123dee9f2b07fb7800be47c03d835393879152c32e066effc6085ae69a0f90a2a29c1e7ecc9d70882eb56be144e15be695c46277cefc8e5bf1138338c6a5cc SHA512 5adbfe6d67503b7669f9ab65315e63ae4648cde484b9f9d9c4967b96aba3429a257282deeffaa16729f797468e18712e52121487e8aa35ede279e25a01f23c0c
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 f9b02df25574..a844a97724bd 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,6 +8,4 @@ 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
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/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 64034c02aa82..1b694be374fe 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1 +1,2 @@
 DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
+DIST okteta-0.26.4.tar.xz 969572 BLAKE2B 37f3a0c83c3a922030816813de9a66edff0f4a1ae9f3450f9fe195b52d1b053c23f37c8fb2a06b08ef8df47061123536f202809b3d4954d824103dfb1b912559 SHA512 2410fc73d2685405cef7d3d639ae202632f8781885803aed5e2e5e4ff8b48f7cdf4f8b9565edbc1b5fa3db4bb22ae90019f8cfdf4bda09def7badc559ebe02a7
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 e8d0fd0d14ea..8e83fc094ede 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1 +1,2 @@
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
+DIST ddskk-16.3.tar.gz 1252772 BLAKE2B 133685fc0587e10c89145eeaf014c8e0d1ce0dad63b9207559030598f521aee00facbca9550753493e579d5acec10e8b36c1499087d1b6c05317754c434b9b69 SHA512 47624690851269ca818bed5cfdfdb21bbbd3152c0a7c64a114ab595a92d2e79600fe738953e6a73a26b0195102eb1e9e03ad4f6bfca1bc4d3e3732bf59aa8a27
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 0dcb0f0f58d4..b63afc5af522 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,3 +1,3 @@
-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
+DIST buildah-1.15.1.tar.gz 10344892 BLAKE2B e84f8d245536f8864f057f576d92c218420ac975fabfbdc8b6bf591c2ef43494d49fe9095320a07de450f2ea64d046aa4ad680f08be80210e0dce1ffa874a286 SHA512 61cbe91867dc664a9e76b367e0f99bf5c797c68dda7182ed43c6a6a5a72a0f0519e45db6b2746b26933d829834757cc93bdbd30c62ce6a947ee546dbc1f930be
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 25c89f03663d..fa875be04832 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1 +1,2 @@
+DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
 DIST docker-19.03.8.tar.gz 17477887 BLAKE2B f9c50fb376b37b19de79f52f10425432f5042bdc25a581e1f2cf7524d2e89dd6bd5ac8181f23a7ee00e36b07e3ce62b631aff28844963f8b05e21ce7671bfe6c SHA512 2e2266d4cc832c2c2afb7c0fba92ffd39b92cce988c9bedd40430eb87fa97c32dcf97d8e4c651ceda7c292c904f83c49a12e39861a9a69c9c9e6d54770f95d02
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 c9852210213f..5dfdd29f2200 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -4,3 +4,4 @@ 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
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 078f713a8812..c34b57b3cdc5 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,2 +1 @@
-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
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/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 49af86ca62ad..c6c433fc2458 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-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
+DIST ibus-typing-booster-2.9.4.tar.gz 8222228 BLAKE2B 8ba79ceaff6cd5ce37d093b08438a22ffb7b1295bba6d0b3af141b5804e89d04807d14fa5c5ce959ff728d76fcc5e60c0a51f113baa172710d59866733bd9741 SHA512 9c323301deccec0904cb2a2e34015ef11885ecd635ddb99afc6811a7f684dca448a026301155ae26fe0a38c00ca0a4d714ff933c39a60e4299434cfbca455d58
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/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 a6b2e7359fe8..b26f72fc3e6f 100644
--- a/app-i18n/yaskkserv/Manifest
+++ b/app-i18n/yaskkserv/Manifest
@@ -1,2 +1 @@
-DIST yaskkserv-1.1.0.tar.xz 75108 BLAKE2B ac567d4715d1767f0690462de934768335eafe4a61010534c16b430876f81ce43ac175dcc0a2546af996dd0bef8fd4c744b475985365abe3d571a4ed3f1c3a4c SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000
 DIST yaskkserv-1.1.1.tar.xz 75136 BLAKE2B b5a26e7d12951d9256e050d543338a48a61e9b6883a0866e4f7a2d367783a5757a5a12cdd810a87e84ade5bfebdc9c24eb093c09081e1d9099ce848d435eb45e SHA512 5f421ef684011aed716e929b90ab98fb1703abe707928847d79a34815750d59df59f4dec8bef6e8ce399340aedb32688d6dd8a5d02ba9372a935ec8f1adffc29
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 ce999251ce2a..3dc7d190891a 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1,2 +1 @@
-DIST evemu-2.6.0.tar.xz 507032 BLAKE2B 189507f984e2ebfdf9ff7474d5854ed02f29cd2105684700e1cc2c5ae3c1e888bebd7e8e04e3a5003506bb9571d61785712d08fd90d6e828f2ba5e2ea763a064 SHA512 8dd3be18abc6e36a79b91e6099116048e4fd45a96531a5c2773c84618d6ba7089ee8734b51b9309462c393dc7c3a83d87438bcbdcd5876803165a4ea439aff83
 DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
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/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/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/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/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 4327a880f66f..4b169319a10b 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,4 +1,2 @@
 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
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/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 d782e287505a..df98e588981b 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,2 +1 @@
-DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
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 a9a6fc50bdb6..854b42eb19c1 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1 +1,2 @@
 DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
+DIST hackport-0.6.6.tar.gz 2079279 BLAKE2B 6e4084babb3fc036568387845ca2793d47a29ce94c24211259324d3040d0c0e15be028d0a9726ea8512dd518d7e9dd8447aba67725c0916418f523449f2179b4 SHA512 b836bd21e3713796feaab9ca830fdef80f52b9723d0fba6cfb60d802e038eaec2da8492eb025d6ae376aea69734c031e23c0887642675c4f767b1592d82c5523
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/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/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/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 feb748ef0df5..e764068e4e5d 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -4,3 +4,4 @@ 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
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 2580a64bd37d..f5e248b0e6ef 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,3 @@
 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
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/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/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/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 af25a71680c5..5cffe0cb71f9 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
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 ebe2395673b2..b12d1be5989d 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,2 +1 @@
-DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
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/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/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/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/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/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/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/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/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 cb69a80f4e00..e9bb05873ffb 100644
--- a/dev-haskell/adjunctions/Manifest
+++ b/dev-haskell/adjunctions/Manifest
@@ -1,2 +1,3 @@
 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
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 4764cdf1f094..b9010739b38e 100644
--- a/dev-haskell/aeson-compat/Manifest
+++ b/dev-haskell/aeson-compat/Manifest
@@ -1 +1,2 @@
 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
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..54c6ad89ebfc
--- /dev/null
+++ b/dev-haskell/aeson-diff/Manifest
@@ -0,0 +1 @@
+DIST aeson-diff-1.1.0.8.tar.gz 16521 BLAKE2B fb72ea03dc4b35791f151f22c4fab3f9cafecd604c520137c79af5e4c71772399516d0120bd01e2335fbf7747525babedf5603e5e8d3ba244a9907c81c9f1ea8 SHA512 5a5f703dec592c0cfd825eb1899006350649c52bf810ff1aaaf4134ebfbc11f5fbe9e7f158a8c3a21dbef4902b1f9e94148bc116e27418b2b786f6d31c7561fb
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 7973f44ecb60..a960cc0e8a7e 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -3,3 +3,4 @@ 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
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 c91ebc947b60..2b7c0b6ef25c 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -2,3 +2,4 @@ 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
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 3fb902fa3e34..c12c36b76794 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1,2 +1,3 @@
+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
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 0a929451c2d4..119f48535bbb 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1,3 +1,4 @@
 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
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..0e4a91f5164e
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -0,0 +1 @@
+DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
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..bd99a05472ed
--- /dev/null
+++ b/dev-haskell/authenticate-oauth/Manifest
@@ -0,0 +1 @@
+DIST authenticate-oauth-1.6.0.1.tar.gz 9470 BLAKE2B 9326a4dfeeaede4d9b69e7f92be66b7d3f4d74fab30fdeb3e63e7741f33d5ec68f287b35a4c7a424084aa693881c9e23b78fd2f7ebb1c1a32073cef7e23d7078 SHA512 b2a6310097a6edc5bd3c38052a2eca73d3f398c0b9ff4b8f1d43a1f4dc83b7297df12f3fc0bfdecfce17e600f90b13c4c9e3f31c02b17d7fec0134a34c093fd6
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 7afee192e984..2f481265cb14 100644
--- a/dev-haskell/authenticate/Manifest
+++ b/dev-haskell/authenticate/Manifest
@@ -1,3 +1,4 @@
 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
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 a32037608ec8..b0ee06ca1980 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,3 +1,4 @@
 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
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..43b7be06991d
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -0,0 +1 @@
+DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
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 c28267c048bb..aab85081995c 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1,3 +1,4 @@
+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
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..e5d9b986e87e
--- /dev/null
+++ b/dev-haskell/base-noprelude/Manifest
@@ -0,0 +1 @@
+DIST base-noprelude-4.13.0.0.tar.gz 2864 BLAKE2B 25d13ae8a2cbee524d46cfe351abbe77321b61dd118bc26b8d275179fdaa5d429450c3e99a12518646bfaa13258a5ffaa9eaf0cb0bd7bb84a93187ae175f6d36 SHA512 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf
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 e1f792a0724c..a403a23f3ed6 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1,2 +1,3 @@
 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
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 1dfe6d1f8eb4..93e8278e51ea 100644
--- a/dev-haskell/base-prelude/Manifest
+++ b/dev-haskell/base-prelude/Manifest
@@ -1 +1,2 @@
 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
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 c0c42ce1a4d5..96d13c879268 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1,2 +1,3 @@
 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
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 79200db41cce..62cb27372d5d 100644
--- a/dev-haskell/bencode/Manifest
+++ b/dev-haskell/bencode/Manifest
@@ -1,2 +1,3 @@
 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
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 81243d1f9c9c..9c5ff060e0f6 100644
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@@ -2,4 +2,5 @@ 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
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 e1baa3609eb9..d99bd1f1a69c 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -4,3 +4,4 @@ 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
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 f382d3612647..649d67a8c3bf 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -2,3 +2,4 @@ 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
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 8dedcbe764d8..43c3169bb90b 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -3,3 +3,4 @@ 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
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 1ffe1da1cbec..4817c2361b9e 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -2,3 +2,4 @@ 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
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..697eb8c05b87
--- /dev/null
+++ b/dev-haskell/boundedchan/Manifest
@@ -0,0 +1 @@
+DIST BoundedChan-1.0.3.0.tar.gz 3591 BLAKE2B df6f085ea129efccec006dec7133524fc88332fb6451f8ee63702b985e6481c5741aecc0974c203f43b25f63036dbf0935e44e4a9cabf3f1c3574be9580bdf26 SHA512 4d842d2b499dce265329f81a402fbda2e97e00b7e04d55176225f6a1284d5dafae4712df1ab71effd328e65f218c582440d4db3e62e253033da49339cbfb7055
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..1998bde6fdfd
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/Manifest
@@ -0,0 +1 @@
+DIST bsb-http-chunked-0.0.0.4.tar.gz 6630 BLAKE2B d16b539f34518aaec4875b7644ceebbf50b94ddcdd9a2bb612dabfcd5eafbaa9753d187a5b137f39126993e0b75c9ffcebafb3772d948b45512e33ff3fae1dd9 SHA512 74c04c2fd372067c42d3631cdfc2ad7093c0c3af1145833ab307c538dbb936d2042492d4e81c520c3adde8634df29ff8558822f06f226c52d16abb4a35ab1a13
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 c4a20fcf313c..0c08df60b3b9 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -5,3 +5,4 @@ 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
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 64212ef94ac0..84a39ddb1b1d 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -2,3 +2,4 @@ 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
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 d75f72fe0870..f0f69a366108 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -6,3 +6,4 @@ 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
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..b38eb5d4072d
--- /dev/null
+++ b/dev-haskell/call-stack/Manifest
@@ -0,0 +1,2 @@
+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
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..fc16ce1244cc
--- /dev/null
+++ b/dev-haskell/casa-client/Manifest
@@ -0,0 +1 @@
+DIST casa-client-0.0.1.tar.gz 3676 BLAKE2B d00b8fd2991863190e5fa12d852e2a0a3f3a87af4bf988d337ee703a5a7d827aa1e2681aa9b3066dd77176cf52b3564b3266b1aa9d542fb58cd0694204668031 SHA512 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa
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..784d0c2c9e6a
--- /dev/null
+++ b/dev-haskell/casa-types/Manifest
@@ -0,0 +1 @@
+DIST casa-types-0.0.1.tar.gz 2030 BLAKE2B a1787b35cf8254118287a7415ee625dd8815011a3d444f5ef303ba4af989924e5b40e1c1e5abd43e69c299e5c7ef1cbe7b67a0f019c6d2bfd01e2bee4b1661e6 SHA512 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98
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 3704dd597085..10d6c8009851 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -1,3 +1,4 @@
 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
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..501633ffcf1a
--- /dev/null
+++ b/dev-haskell/charset/Manifest
@@ -0,0 +1 @@
+DIST charset-0.3.7.1.tar.gz 12507 BLAKE2B 1ea4b189dda47e05066b800c26c62e26b92e1482e546acf8606dd98cc1b8156de350c57c3e3df2b956a96ada04a1e564d681bb9af09026d160cc4f3b919a1500 SHA512 594e71a5d6ced52e1491368611775bda106119b82025e84fc97078753358af7d9f6c22b99291dd51a990ff223c4582f913e01d829418f8918652c3c9fc495792
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..f4340e1ff714
--- /dev/null
+++ b/dev-haskell/cipher-aes128/Manifest
@@ -0,0 +1 @@
+DIST cipher-aes128-0.7.0.5.tar.gz 26228 BLAKE2B 8ef1aa343563d7889154b5f0b96b5b457ed21afbcad4f90f82e95a080c19f50d8ad2500ef4b8caa1509ca953aba3ca1941c61656417ed527943858a9d6cfd652 SHA512 8479dec68d6fa35e8d615bcc8c6336459fa537f1962b7af87e63b0c38d544ed26e6d30e980f90bb3585513bd618e01330d3e008e77404dae8d2e27954d7a535a
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..4358152281e7
--- /dev/null
+++ b/dev-haskell/cmark-gfm/Manifest
@@ -0,0 +1 @@
+DIST cmark-gfm-0.2.1.tar.gz 200812 BLAKE2B aab0142db460139392fa1922bbf090b0222c039f3795e28c1b91024ca9c159cc977a5be645f91f94a0d147a8713c770e4608a6504b68c10263dfe46f2605b84f SHA512 46c0847608f741df689e5b213ecd023bedc4c79ee9b91bff55eae11ad600b248e5816b7c259d5c862b3c9742c6f5d08b16d1a6cf1b8724f7831e77788d4df70d
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 59e371df5ab8..50d6d2b0996a 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -2,4 +2,5 @@ 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
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 3c0cf9953f73..592fe96463b9 100644
--- a/dev-haskell/concurrent-output/Manifest
+++ b/dev-haskell/concurrent-output/Manifest
@@ -1,3 +1,4 @@
+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
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..dd2389027923
--- /dev/null
+++ b/dev-haskell/conduit-combinators/Manifest
@@ -0,0 +1 @@
+DIST conduit-combinators-1.3.0.tar.gz 2204 BLAKE2B 4d3c7783f00a90a45e2e5947c523792a67cf234d12232c3abcf865df4647d0767b27516430704792f2f6393e61fc4c4513346d390774b8b3eeb2d05b494a4d3e SHA512 b994c73f0a9c0d017831125f2dbde406d6ff1b51b0f37079e8292ff1747c9718c28cceba708b3451136a384504db1d1275e01ce0335cf1e726edd69d90a206b7
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 e098c131147a..3c20b1200f3c 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -2,3 +2,4 @@ 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
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 f8eaf91cb077..dea3841a0b12 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -4,3 +4,4 @@ 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
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 f31164b560fe..6ef541dc951d 100644
--- a/dev-haskell/connection/Manifest
+++ b/dev-haskell/connection/Manifest
@@ -1,2 +1,3 @@
 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
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 5d2eeb8b1dc0..6615726c1a47 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1,2 +1,3 @@
+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
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..d1f95201cdf9
--- /dev/null
+++ b/dev-haskell/contravariant-extras/Manifest
@@ -0,0 +1 @@
+DIST contravariant-extras-0.3.5.1.tar.gz 5324 BLAKE2B ea5554629785efe557a9b708a4487aa9096c963f0ef2d60480a4f155a7f6fb7c696d3a763792af209d9af7a3e77107ac7115ff1fe6f1e043119f4ce575f0933d SHA512 871e9545f8e288e6bd89a5fa5ddc93154092f713505e30120db30750bdacea40f55ed52bf9d59984fc8ee936f4e9148c3d1125b8e59fb4ed0c68044158de7917
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 9594fa003bc8..0957a89aa0c2 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -3,3 +3,4 @@ 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
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..125b0c8915bf
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -0,0 +1 @@
+DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
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..763430616331
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -0,0 +1 @@
+DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
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 26caeeeeae2a..dbc621d43275 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1 +1,2 @@
 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
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..5178bfef5173
--- /dev/null
+++ b/dev-haskell/cryptonite-conduit/Manifest
@@ -0,0 +1 @@
+DIST cryptonite-conduit-0.2.2.tar.gz 5405 BLAKE2B a2565d0d15863159dbb001584ec9e87eebe69b617efd6d18ab9c8d2ff81ae9e1fa26488f6e0bdeb07c3247aed8c63d0d4fa1376240b0ddcb54cd4a619d053a4e SHA512 5a313d1ff64992fc8f45ebf06f5f439aa5dfe745ce6f2bfc31b3ee06b489b0a145a9e6b5cf00fb557ddbebf1aa5c226dc0add9c591f62a06bd6f8776cf52dbdf
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 68520662bebd..645d0fedb3e0 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -4,3 +4,4 @@ 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
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 d890febe111e..f5a1b24969fb 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -2,3 +2,4 @@ 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
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..6dd83586955d
--- /dev/null
+++ b/dev-haskell/dec/Manifest
@@ -0,0 +1 @@
+DIST dec-0.0.3.tar.gz 2629 BLAKE2B 558b559cf5d92afad637f61ae82549e200a6042740d78ef25be5bf32212dac5027e4f1b3cb9104c65d589927e1ff8b65e62b7f46d6fd5ff707f175cf920bb206 SHA512 446911a59287b48d8b98acf588671e6ed19fc12ed8adeabdab8f21c1fefb80cac7b59b9fea52a4671b997aa63d2eadda5181490e6901e99e9882de572abdc595
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 42aa05e31a08..f29e85178ecb 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1,3 +1,4 @@
 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
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 3aef4dafa575..6f4c2bcc213c 100644
--- a/dev-haskell/distributive/Manifest
+++ b/dev-haskell/distributive/Manifest
@@ -1,3 +1,4 @@
 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
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 c0c332432495..278fd522a11f 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -3,3 +3,4 @@ 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
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..48f3fb56eebc
--- /dev/null
+++ b/dev-haskell/doclayout/Manifest
@@ -0,0 +1 @@
+DIST doclayout-0.3.tar.gz 11968 BLAKE2B 60c9b1a0f8e6cbd18f130c392b19362754b0622def92e6404ac37cc3aa304712cf947fad0dd162f7919c93524f4cb87d8c9c240d22351087f629f5fb58321ad5 SHA512 ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0
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 06e0c5516f6a..2d350626b360 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,2 +1,3 @@
 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
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 2af5604169f0..38aa6cd4536c 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,3 +1,4 @@
 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
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..95c74888284a
--- /dev/null
+++ b/dev-haskell/drbg/Manifest
@@ -0,0 +1 @@
+DIST DRBG-0.5.5.tar.gz 1547022 BLAKE2B ca70a605334a60a0c4fcb1bf55c5e2f30065e55387372bfe0068b4ffa69e79607432b5eeef395126c00801e45a39a34b94c96e526357c8bec6fce077484c1c15 SHA512 e71fc158a7961729ce10d2ca795a935d6a103f31e864f0446cc4faf2b0edb3a5938a4cc79135cf043a375e63f9be4401ce092951b4e8f47c1c3b1c2070c118be
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..6baae75f099a
--- /dev/null
+++ b/dev-haskell/echo/Manifest
@@ -0,0 +1 @@
+DIST echo-0.1.3.tar.gz 5373 BLAKE2B 3710de35b42e39f7ff9d2e5c2e32ae4c1e863f9ae844ada25dbb653aafd6ed261357c3b5046e9e0cabb03dd4de4f6252272a2b643087a61d1df5f26de329e588 SHA512 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f
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/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..aaa317c3b3af
--- /dev/null
+++ b/dev-haskell/edit-distance-vector/Manifest
@@ -0,0 +1 @@
+DIST edit-distance-vector-1.0.0.4.tar.gz 5819 BLAKE2B 8658c52e64e704dd5c52bae0e63ae0b4d84c88d6cb1e3ecdafb05191dc70e3dfdec34001b2c287ec62703eb7ecdbac9b127b3dd084bc4e484e70cd778d31913f SHA512 8d7ef7c6ca971aec5efc2e90adff2584c1e4f996df3ad4f6111f790fd88fcce1814111eb3a3bbe07d8455b03ade98f11e6343c4746e895be2ba9b82a86a33e6d
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 4f54bda48b3e..69b78ddff180 100644
--- a/dev-haskell/either/Manifest
+++ b/dev-haskell/either/Manifest
@@ -1,3 +1,4 @@
 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
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..95fd69c11692
--- /dev/null
+++ b/dev-haskell/emojis/Manifest
@@ -0,0 +1 @@
+DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
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 f5c14e5465af..4b09ef3db145 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -1,2 +1,3 @@
 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
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 563b1327d734..1d433232f833 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1 +1,2 @@
 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
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 1062cb3f4d98..41f2662adc42 100644
--- a/dev-haskell/errors/Manifest
+++ b/dev-haskell/errors/Manifest
@@ -1,2 +1,3 @@
 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
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 9e03e2eb3ac5..99babdb0d462 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1,3 +1,4 @@
+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
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 59db828cf251..0951e4828d9d 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -2,3 +2,4 @@ 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
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/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 9f2157851a01..6f209e57359f 100644
--- a/dev-haskell/fast-logger/Manifest
+++ b/dev-haskell/fast-logger/Manifest
@@ -1,2 +1,3 @@
 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
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 40618c696493..5c4615250304 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1 +1,2 @@
 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
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 db4d96a5473d..368225bee716 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -2,3 +2,4 @@ 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
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 b5aaeff437ae..4717044648c9 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1,4 +1,5 @@
 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
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 6f0e01413b44..933a46e4f008 100644
--- a/dev-haskell/filelock/Manifest
+++ b/dev-haskell/filelock/Manifest
@@ -1,2 +1,3 @@
 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
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..bf733c9e0061
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -0,0 +1 @@
+DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
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 f77d4736c7f7..15431501561b 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,3 +1,4 @@
 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
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 c071935aa8f8..a367bcfcef48 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -4,3 +4,4 @@ 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
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 ddd2cb657127..203395035859 100644
--- a/dev-haskell/fsnotify/Manifest
+++ b/dev-haskell/fsnotify/Manifest
@@ -1,3 +1,4 @@
 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
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 93ac7928a1d0..643960e663de 100644
--- a/dev-haskell/generic-deriving/Manifest
+++ b/dev-haskell/generic-deriving/Manifest
@@ -1,3 +1,4 @@
 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
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 4a9b74676672..a9fe01551110 100644
--- a/dev-haskell/generics-sop/Manifest
+++ b/dev-haskell/generics-sop/Manifest
@@ -1 +1,2 @@
 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
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..ac80c70e8685
--- /dev/null
+++ b/dev-haskell/genvalidity-hspec/Manifest
@@ -0,0 +1 @@
+DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
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..6fb0fb06ee9e
--- /dev/null
+++ b/dev-haskell/genvalidity-property/Manifest
@@ -0,0 +1 @@
+DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
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..4e36afd05fcc
--- /dev/null
+++ b/dev-haskell/genvalidity/Manifest
@@ -0,0 +1 @@
+DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
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 92f2b6d8037a..4d0a8e403c55 100644
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1 +1,2 @@
+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
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..08eaa362f74b
--- /dev/null
+++ b/dev-haskell/githash/Manifest
@@ -0,0 +1 @@
+DIST githash-0.1.3.3.tar.gz 6670 BLAKE2B 5d05a438ae6c17a0db9b2f58d3b7889ca461e12bb97e26d22319e667446be6423b0387465ecf438bb0cb94004aaeb380483d87be718b9077fb7f610a914e9905 SHA512 767f9e57819b0450a3f004e6f7ec333657fa76b4507cf89f16ccee44a8f986c972501a1177a4449dceba68568b744846f70dae9f35bfcbc1537de5cb3cead676
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 c17a4d230dbc..590d4358d0d8 100644
--- a/dev-haskell/glob/Manifest
+++ b/dev-haskell/glob/Manifest
@@ -1,2 +1,3 @@
 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
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 c8101f90451a..0ba928491b62 100644
--- a/dev-haskell/graphviz/Manifest
+++ b/dev-haskell/graphviz/Manifest
@@ -1,2 +1,3 @@
 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
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 5b0310e15d5b..20ef9ff45791 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1 +1,2 @@
 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
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 f6ba01504176..f2501064eaef 100644
--- a/dev-haskell/haddock-api/Manifest
+++ b/dev-haskell/haddock-api/Manifest
@@ -1,2 +1,3 @@
 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
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 9b35a3fd60a1..8972e788b109 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,3 +1,4 @@
 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
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 83436b2fa451..fb245c5e8975 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,3 +1,4 @@
 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
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..a6b73ffc3dc6
--- /dev/null
+++ b/dev-haskell/hakyll/Manifest
@@ -0,0 +1 @@
+DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
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..3138ec0e3c90
--- /dev/null
+++ b/dev-haskell/hans/Manifest
@@ -0,0 +1 @@
+DIST hans-3.0.1.tar.gz 102002 BLAKE2B 2344c30c2143c38b77316cb34b35b38b9228452ca1a5ef0ebf2faf6f74d66a4a264db1f4d336ae86f5ab467cde4c2a914af22cc222110f649ede0bdecaadf5d4 SHA512 4495feb3bad78e8502bf1213727a130cc4e190dae54c1876ab353a919bfbce8e2fc370f3a191223e92944b3dbbba8a57e69c126d70c4ba65801eeb22a4edb55d
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/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 55ddd9191fcc..a32c0d543bcb 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -2,3 +2,4 @@ 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
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..0883a9994e08
--- /dev/null
+++ b/dev-haskell/haskell-src-exts-util/Manifest
@@ -0,0 +1 @@
+DIST haskell-src-exts-util-0.2.5.tar.gz 6428 BLAKE2B 42211d72756d97e7761148b8cc0d7b2a548db38b007d506fc1cad3ef2e7003e352c225201e047683c82b4ec8561825170b6976f36a4d824d3595173023f2b76d SHA512 0497d8e2206402cc295289b1893f326c8f5fa7fc00177279b7af389b3351a94a123d7eb754d8a245981bae51d1a978684791d9b111befca2888bc7fe22f07147
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 4922eecef600..95fa9f89aa54 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -3,3 +3,4 @@ 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
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 1563c23e23d0..2abdb3376e56 100644
--- a/dev-haskell/haskell-src-meta/Manifest
+++ b/dev-haskell/haskell-src-meta/Manifest
@@ -1,3 +1,4 @@
 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
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..13915bc9d3bf
--- /dev/null
+++ b/dev-haskell/heaps/Manifest
@@ -0,0 +1 @@
+DIST heaps-0.3.6.1.tar.gz 12440 BLAKE2B 560a605d91b1481ec9e69510d1634e45bad2dfe589ba2fa6d3eb5391837904a9bb41fa7bfc8a6472862ae163905bc178fd71d6e60fb92c6ab8c630d3bb2ac7d1 SHA512 7c3cfb4ca95538a51b418ab2d42171883c9c51860f63e6836d42845a43cead825016fce74ed5e866decf0a6812433c3ecd6989161f2303939bbcad8ef4aab0ef
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..39c3d7617ff3
--- /dev/null
+++ b/dev-haskell/hedgehog/Manifest
@@ -0,0 +1 @@
+DIST hedgehog-1.0.2.tar.gz 66986 BLAKE2B adb4e40bedb3ffa76b39b8ee87fdd4a05d467c5a0d9e225257123ea02721a5bae5146a9e0d2d0fb79ca0d0dd41987559da2ae505662652b9e97aea3c25d362eb SHA512 b34004210f4af480e10e6fd0a715ee0efb7d718a7c0d8b84355639064b105840e59be223e90cc4fa26a9fa564df6d9686e77b03d996a8820955b19a6ef42c1bb
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/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..39e834a4ea0c
--- /dev/null
+++ b/dev-haskell/hi-file-parser/Manifest
@@ -0,0 +1 @@
+DIST hi-file-parser-0.1.0.0.tar.gz 9344 BLAKE2B 4fc453a2a14c43b59ca060cfe69464693fbb3e2368919a1ccb7a01e3853d8706ae86c4d674fa28b66ef454af1092b303f1e57d774992aeee3519014d1a100a9f SHA512 e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f
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 b29ef66dfbc5..d61c77299b19 100644
--- a/dev-haskell/hinotify/Manifest
+++ b/dev-haskell/hinotify/Manifest
@@ -1 +1,2 @@
+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
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 04a75006c50a..b5094d40065f 100644
--- a/dev-haskell/hlint/Manifest
+++ b/dev-haskell/hlint/Manifest
@@ -1,3 +1,4 @@
 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
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 b619f116a663..fffe72baea40 100644
--- a/dev-haskell/hpack/Manifest
+++ b/dev-haskell/hpack/Manifest
@@ -1 +1,2 @@
 DIST hpack-0.14.1.tar.gz 38373 BLAKE2B d5c3b900e3e2fd852081934f4a7b4a327f4647608ceecf76ac65faf4e464bed7428e4b444f7b06f8a0e7661458e1817aedaaa2ea2dd8161a362be9f596f7f0be SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04
+DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b
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 7950adf540df..9a8e45a92cca 100644
--- a/dev-haskell/hs-bibutils/Manifest
+++ b/dev-haskell/hs-bibutils/Manifest
@@ -1 +1,2 @@
 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
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 036950555d38..7c282332a295 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1,2 +1,3 @@
 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
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..60559694bce2
--- /dev/null
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -0,0 +1 @@
+DIST hslua-module-system-0.2.1.tar.gz 6339 BLAKE2B 0019478bf29dac977ff5124e77765eac86876879514e0346a6126574b8ca948a89a66f8417842c45357124e2990e2394275be886b43db59e05ea9065dd2b6b5b SHA512 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
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..eeefc9131377
--- /dev/null
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -0,0 +1 @@
+DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
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 feca752c5509..54c702a56ef8 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,2 +1,3 @@
 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
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..8b105ff547fc
--- /dev/null
+++ b/dev-haskell/hspec-contrib/Manifest
@@ -0,0 +1 @@
+DIST hspec-contrib-0.5.1.tar.gz 3034 BLAKE2B 273709b1661fa02e87e8ffce37e91968fd824fca18003f6275233718ab77a6d56417c09a8ca551925a4cfbccc7f0c6086169510ad9b63f21408e44c44846aacb SHA512 cc6ee847d7c99b2607c36b2200bf0bc05ce30437110f216f82464069ffdf80a76d836ad7aace3d69a00cf9da4b28d39491a251c6f60401009a6f9c85d20043e0
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 40beb02825a3..7b7ba533a36d 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -2,3 +2,4 @@ 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
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 67c348dedc14..abfdf74ddd28 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -2,3 +2,4 @@ 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
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 bc679fb96a01..7e8d2a5fb88f 100644
--- a/dev-haskell/hspec-expectations/Manifest
+++ b/dev-haskell/hspec-expectations/Manifest
@@ -4,3 +4,4 @@ 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
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 75d5cde6518d..4315600f447b 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -5,3 +5,4 @@ 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
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 a0b89fd2ea57..53750dba0017 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -7,3 +7,4 @@ 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
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..7b09584c0b17
--- /dev/null
+++ b/dev-haskell/hsyaml-aeson/Manifest
@@ -0,0 +1 @@
+DIST HsYAML-aeson-0.2.0.0.tar.gz 11095 BLAKE2B b168c5d676718c99567835aaaa53321ccecc7b089e15850676a0b600f6ea2280facd4cf22e0212807c6c952287b125d52974ed19240390c0bc22d54c7047a641 SHA512 09da59c38e9fead3b11bbb6752cef803ae2d60392b710ea3958091d6256ff267f0b0f9b27293bbbc96a9d3af08464e463feafcba4a7caab6fd78286127f91527
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..68e65ca3a7fd
--- /dev/null
+++ b/dev-haskell/hsyaml/Manifest
@@ -0,0 +1 @@
+DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
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 f40a0c5888cc..bd5a1a4fef5b 100644
--- a/dev-haskell/html-conduit/Manifest
+++ b/dev-haskell/html-conduit/Manifest
@@ -1,3 +1,4 @@
 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
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 ecbede843e6c..f01a7d16413f 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1 +1,2 @@
 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
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 01954f291111..8a7a345bcac7 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1,3 +1,4 @@
 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
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 7b0fb2ecd83b..dac32c093c70 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -2,3 +2,4 @@ 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
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 ec119b104be2..7ce590b81a6d 100644
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@@ -2,3 +2,4 @@ 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
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..46f594e22d27
--- /dev/null
+++ b/dev-haskell/http-download/Manifest
@@ -0,0 +1 @@
+DIST http-download-0.2.0.0.tar.gz 8946 BLAKE2B f8b52744605ac8bd9bc922e23a5ffa02d0d7c10af7109594e0273cd46fec8afd0e20e2cbffed04ac206234d3635b2c53f6adfc8e11467e05f1b3544f02c7a271 SHA512 b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae
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 ef23fc7f6b5f..ef30cec235c7 100644
--- a/dev-haskell/http-types/Manifest
+++ b/dev-haskell/http-types/Manifest
@@ -1,2 +1,3 @@
+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
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/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 248683f68fa6..95282eec8075 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -1,2 +1,3 @@
 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
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 426c5d3e7c61..c58ae1dfea56 100644
--- a/dev-haskell/httpd-shed/Manifest
+++ b/dev-haskell/httpd-shed/Manifest
@@ -1,2 +1,3 @@
 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
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 70e0b2f19ac0..b39064539f31 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1 +1,2 @@
 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
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/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..34ad5dc76572
--- /dev/null
+++ b/dev-haskell/infer-license/Manifest
@@ -0,0 +1 @@
+DIST infer-license-0.2.0.tar.gz 48173 BLAKE2B 27b7adb74c897c03d6e8795d580d165d41ffd527ea4d6b6bed4c730a46d23177babeb57fc6e33ec379a285a76a89727bc10557f925bcc81f4bcb6c50f10bd989 SHA512 266651d9890ccbd9281ef3f9cd16df10f9c6fa8449990b63e956bd13559b1ef773c9dee92ad80de5b9d03599ac6a09766a1f4f3425884007982ab14d01697d45
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..6ff7af00eb81
--- /dev/null
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -0,0 +1 @@
+DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
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 99c046b908e5..3c0470fa5f69 100644
--- a/dev-haskell/interpolate/Manifest
+++ b/dev-haskell/interpolate/Manifest
@@ -1 +1,2 @@
 DIST interpolate-0.1.0.tar.gz 4894 BLAKE2B 1b8438ae6e466fddf66161314e5046dcab862bea29fe136e0c4f7b374c8c337b310d546ff714aec4adb00ed63385a600f04f6f3d6b8313f068299ee2a827c032 SHA512 5273195c77ef22919dfcb8df9e6db4a1ee186ca0d218f24e94a53236b0af20897d01273e027307a7164bf15a66ebf47afcc9ecc35f6e867c3c2a0e1572eaf435
+DIST interpolate-0.2.0.tar.gz 6889 BLAKE2B 548418c34af569e4ed0f4bfe5189f4d2957e99a7e11d70dea18f6584cb497a89b3ca458d933301798fdff29e98ba90ae75fc45aa454599f1709bab5f7f1319c9 SHA512 adc90d7da696c4aea0935c5f85dbf37a1738c89ff3b940804cd7bb4f888e28a445c51db9e0f2e1e66f98646f60964c10d135cef30c13efaaaffee3c65b93c89a
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..1e2f56cd99fb
--- /dev/null
+++ b/dev-haskell/invariant/Manifest
@@ -0,0 +1 @@
+DIST invariant-0.5.3.tar.gz 24394 BLAKE2B 5946f6419c74a0697f6017b1178f6a5a99d62b26e7bbf08e9a08430ae22f4e15fae032a5257d9c5589767125d1a5f53ce9c16e1d6c15c90081b355ca102c8149 SHA512 0a488a800b0eec85e865b100e3944d5e9dd45e6c12a411f67b4ba7f40de6fe0b8e37900f72c83ec7b92033a3d15e754dc11d991ecafe18d8f257afdaf67ca9be
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..ec2ece3b5096
--- /dev/null
+++ b/dev-haskell/ipynb/Manifest
@@ -0,0 +1 @@
+DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
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..6281c72cc9b7
--- /dev/null
+++ b/dev-haskell/iwlib/Manifest
@@ -0,0 +1 @@
+DIST iwlib-0.1.0.tar.gz 3393 BLAKE2B 32df17beb4b9df6dedb12b729249883846ca8975d41d34dda047264d5b8544ab646877705d0c02fa8478ecaad735d67dbbf3d1bb86ca463d3f811e5179c1e80c SHA512 a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93
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..a3acd6b786c4
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -0,0 +1 @@
+DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
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 18f0749b389e..2f68514fc12d 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1,3 +1,4 @@
 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
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 2f4de8edf1f8..84d8f328746d 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,2 +1,3 @@
 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
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 065af31c9a92..3a42b129a45c 100644
--- a/dev-haskell/keys/Manifest
+++ b/dev-haskell/keys/Manifest
@@ -1,2 +1,3 @@
 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
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 5ab1344a47e9..2e9d4be9d0ee 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,3 +1,4 @@
 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
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..c47e46f49b7f
--- /dev/null
+++ b/dev-haskell/lens-aeson/Manifest
@@ -0,0 +1 @@
+DIST lens-aeson-1.1.tar.gz 11022 BLAKE2B 4291d060db6e6da1eac5f9ac11dc700effb3df8bdf91c4a0ae34c443cbe4655944f210bd13de78c9185465d9bf814111a649e98a7863cc1cf40fc737ffa66961 SHA512 a5e1b98cc50342ddbaf36a9c6f7a87cdfd8e8abb66852777ef8fc3362a3cb7bac473c3dfd7a4ad2f57f3318c5dca6ec7a07e2a4eae05bdcc34308d188d791460
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 ef18227cbc7a..abf2cc6df036 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
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 75a596effc1c..6f56048fdd52 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -2,3 +2,4 @@ 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
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..2014743378b8
--- /dev/null
+++ b/dev-haskell/libyaml/Manifest
@@ -0,0 +1 @@
+DIST libyaml-0.1.2.tar.gz 63635 BLAKE2B 36f702016e5646671c4f56d4b717bf99307bc4c27b73f9d136558b1a95c5c1007553a89a256540cf32bed30399d886f18d119cf4a7f7067e318ca2c44f94c991 SHA512 0423fb36f1fdeeb89244a81930558ad272f8ffe8161ced3cc542e180937a1e5f264f188972786830b0bace6851adca796756abe100dffa8cb969eff4cb0e3121
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 93dedfe408c6..8c07fc41c97c 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,3 +1,4 @@
+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
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 f2bedac1ed17..acbf95ba2137 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1,2 +1,3 @@
 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
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 9eac87a49693..5a858c9a8899 100644
--- a/dev-haskell/listlike/Manifest
+++ b/dev-haskell/listlike/Manifest
@@ -1,2 +1,3 @@
 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
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..0a5230e75708
--- /dev/null
+++ b/dev-haskell/lrucache/Manifest
@@ -0,0 +1 @@
+DIST lrucache-1.2.0.1.tar.gz 9224 BLAKE2B d29cfee3d21fcf66318f272011551a1a04e17ccac5ba58da0a80591502488ab7446a5b2137c57c91ded80b2486d95c28f5449c5417c88a99f2e121dd17841eea SHA512 fae5c8a10bb7ee781ed84ccf9c342bd583e112eb840d07aa72803affe3fa7dd394b3d6b73212e45005ec9155a409539902c4893ce20dc0a2a0e3f4a44b2c715b
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..4bd93cb9427f
--- /dev/null
+++ b/dev-haskell/lukko/Manifest
@@ -0,0 +1 @@
+DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
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 db5f70654521..4af01e43768c 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1 +1,2 @@
 DIST megaparsec-6.5.0.tar.gz 91498 BLAKE2B 339e68e211e871d77236770ab789523879a1a44286d5ff5567b75f32278826f79ee6a76a80309b07771703a415c252e92d8327e6a34b86f0670b1ac89c742d6c SHA512 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011
+DIST megaparsec-8.0.0.tar.gz 59692 BLAKE2B dabde94500b5f4e27437779fa2db288f71c7b493201e2150eed3d2ed6d2117bc9d9ba8100c1ffad7a6ac6160ea03d373fd3360e549d7f20284dae2257ba10e2c SHA512 ab550a99548da2739a70cc4bdb3313085b3179c58d19a84d30744d89fe2d7556b9b552d4ad7b177b18f9f5821daa5417c2b9267eadd9eb537132666c151513c3
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 c6f6dcfbdaab..3d46083f4b6f 100644
--- a/dev-haskell/memotrie/Manifest
+++ b/dev-haskell/memotrie/Manifest
@@ -1 +1,2 @@
+DIST MemoTrie-0.6.10.tar.gz 8403 BLAKE2B 4d8d3bbefef13d56c16fdd4e3584a811e6cfdca6de27df7d8eee7bd684050275c0e7299073e7ad3edd231db0dec91f3e42725295f21a096796f2a8445d10822a SHA512 73be7e356ad2aeef49abf43975d2e24ee8b883e12453f316366b52998637ac26d98feef34388c2a46f683027dc7132444b17a25a12d3e86748088fadf081b186
 DIST MemoTrie-0.6.4.tar.gz 7695 BLAKE2B 4bd5ae0fa7b0ec6e95e221903e28367773d8cc310963d73cbba110f3d3285f2cf5a72a62d3a53f9b5cb46b86efab182089440bb142927eeccbbf4ed9b4765f29 SHA512 5700a36ae2a53e84bc31d80765afff3041972b4b64da359e16e7981009cc581d9c8aac019eb46d44d5dba7080dad494587ad1f4256f101387eb6de2959dd659f
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..d7a51c7818d0
--- /dev/null
+++ b/dev-haskell/microlens-aeson/Manifest
@@ -0,0 +1 @@
+DIST microlens-aeson-2.3.0.4.tar.gz 439564 BLAKE2B f8077c78ffb86f8f87afc165651e79c1f2b4737d954c5a720a1e9da0133245e5e8082969af177c4302469c339eeff9a659e334efbf8e5c8320d4683661b2c0b9 SHA512 34986eda7737947357999992f617bfd00079048f9fb75dd60f533e58a9671906d9bd0e4fcee1f4a3df309d98ddcb25144fb59f1a779675b119669c27739c3f6a
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..8728384c620c
--- /dev/null
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -0,0 +1 @@
+DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
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..c9d05599b46a
--- /dev/null
+++ b/dev-haskell/microlens-th/Manifest
@@ -0,0 +1 @@
+DIST microlens-th-0.4.3.4.tar.gz 21662 BLAKE2B 0c228791dae5b4ab10bd47d574b2dfc1a9bd046ee7941ba15be02d5c60f78f495c719ab64cd74434734c7a7ee1ca67eb083621319325bb3fbd518a1a36c1aa90 SHA512 456d0cfe6f93a4adb8c5d0004983bcc7906f8750787eecd2ccbb9063d3e63da824c1bec29f81b37485aeebc356baa478bc26cc439e45ec03642f2d61217cbb7f
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..f7b33075eeee
--- /dev/null
+++ b/dev-haskell/mintty/Manifest
@@ -0,0 +1 @@
+DIST mintty-0.1.2.tar.gz 6945 BLAKE2B 6fe05a5d130c807b8dca29e5c207bff3ce73778ed4ca9e27f2a54c1b28410a7043b8d7f8ad4de7b8c93e555f8577e9644a1d7e86cae0fdba94098d34e3fadfce SHA512 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667
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 67e24aa311ab..14e242c982e5 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,3 +1,4 @@
 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
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 d541743391ee..76dd1959b4ea 100644
--- a/dev-haskell/mmorph/Manifest
+++ b/dev-haskell/mmorph/Manifest
@@ -2,3 +2,4 @@ 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
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 7f43c0c7c2aa..bafba742f815 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -1,3 +1,4 @@
 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
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..3d0205a7021b
--- /dev/null
+++ b/dev-haskell/monadlib/Manifest
@@ -0,0 +1 @@
+DIST monadLib-3.10.tar.gz 11475 BLAKE2B d77ba15ab1e4a535a265d4d8f4cd9b6f6cf57e030cd241d5d92e96ab943f895b1102174b65e229f2f39b80732d0a203615c65ff44cd9b24f970ae6dd62f20dfc SHA512 db579c362e1a5d7737c3cadd8cc3cfaea620fc9ee3057a00f1400c84b3d25b52d91a192553898c4ee51f0d8a6ad4a66a4e97bc10bf132b1955abb89cfc4b053d
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 72392f3ad333..127741ba8055 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -6,3 +6,4 @@ 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
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 9141275b00f5..7a243effbe25 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,2 +1,3 @@
 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
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..b595bbadb82d
--- /dev/null
+++ b/dev-haskell/mustache/Manifest
@@ -0,0 +1 @@
+DIST mustache-2.3.1.tar.gz 20207 BLAKE2B 87691b14e85ac5934c08d1b3f8261d6e7bb3786b808d0f1a04630b96b4f2ed4aeae4d049ccf0e408b47586e990db2bbc09e3eac56af67922538e73250ef486d5 SHA512 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3
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 368bb91d8b62..210cb70ae67c 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,3 +1,4 @@
 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
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 6d13e081a278..f34022ca99ea 100644
--- a/dev-haskell/neat-interpolation/Manifest
+++ b/dev-haskell/neat-interpolation/Manifest
@@ -1 +1,2 @@
 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
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..7f2443252f3c
--- /dev/null
+++ b/dev-haskell/netlink/Manifest
@@ -0,0 +1 @@
+DIST netlink-1.1.1.0.tar.gz 49444 BLAKE2B 620cf5a4b52f86d9410534d5ed0f4ede40961e976e811c0e2f07c46c95b1ceb1452b9b19cdf4f9da9dfd60166fc7899550b060569dea956feadd6c1293c20f6e SHA512 2bb3d3c1a86e2de61e18a50366d9ecfa863df4959533db5ab3b127b4e02853cf4295ce7519a8ba7bbee9af0534c510aae99c567a5b23e8587e8e56113f530da3
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..11a48cf55140
--- /dev/null
+++ b/dev-haskell/network-bsd/Manifest
@@ -0,0 +1 @@
+DIST network-bsd-2.8.1.0.tar.gz 8584 BLAKE2B 9864cdcab82d77592574983c70ddf262a4e836807d9141cacaa638d109f423e8332d9cb0b7d07661121970d9bd0b0ef9dd292d7e57010dff106a62003592d738 SHA512 b2f66c6705c490e1cbaab6ca88444294bc90b3711da4039046a9279060ed41228ab855b40039f56bd02eabcc0351200de3e043a108a0cdc98192d563702de7f3
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..066a7079849d
--- /dev/null
+++ b/dev-haskell/network-byte-order/Manifest
@@ -0,0 +1 @@
+DIST network-byte-order-0.1.4.0.tar.gz 6426 BLAKE2B fc4f414622f8feab70bbc76dec977a591099bf81bb050aa0426791523d75bc4bb7fed877d08e9c55cda881638b47d84beee9a6c5ffbba89a95b3e40afdade3b8 SHA512 b0b9f468df51963bb6ef6cd6dcd90345cbee7ec96686b8c4f5b94639f6a78280f30af55779208a14f468ec9c5509aea0e65865a7e8966f9779d4c0eb83933dc2
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 a104438fdb6c..3bf34af16ce3 100644
--- a/dev-haskell/network-multicast/Manifest
+++ b/dev-haskell/network-multicast/Manifest
@@ -1,2 +1,3 @@
 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
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 585c7fb2439a..8d1ab37065bf 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,3 +1,4 @@
 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
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 06c74353400f..300618fd5429 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -3,3 +3,4 @@ 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
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..bf45efe58281
--- /dev/null
+++ b/dev-haskell/newtype-generics/Manifest
@@ -0,0 +1 @@
+DIST newtype-generics-0.5.4.tar.gz 6878 BLAKE2B c260a0eeaecfe3d97aa6b7f794f588d64252373ecd92a5bbae55ab373620d96b4dece32fae0e96a74b1c9c1a0744fc222480c7271cd21addf93a7747465a14e5 SHA512 33128015f68a01633b778b8fd7f3d3df8f13b33479705edd4b47036641d7b358667998eb56a6fecdb1f65cb7fb0ac456b8d08ef264e1c17b2fad08ce0a0ffea1
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/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 1e944bd4ab84..e9230703ca47 100644
--- a/dev-haskell/openglraw/Manifest
+++ b/dev-haskell/openglraw/Manifest
@@ -2,3 +2,4 @@ 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
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 7614a620ee52..054f199631b8 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
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 e2eaf6825b18..d6796a4f1101 100644
--- a/dev-haskell/optparse-simple/Manifest
+++ b/dev-haskell/optparse-simple/Manifest
@@ -1 +1,2 @@
 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
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 4c007fd31467..64d4910d697a 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -1,6 +1,7 @@
 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
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 3e283ecfbc46..eed78ef3a0e9 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -2,3 +2,4 @@ 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
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..84a03e48f0b6
--- /dev/null
+++ b/dev-haskell/pantry/Manifest
@@ -0,0 +1 @@
+DIST pantry-0.4.0.1.tar.gz 89571 BLAKE2B 4d378ab3a1e951ccb651cd246cfa7328ccbc4dcb8e382e0332122a1bd6334bf3617cb257d8e22865f9dd32f6c75936a0e4871936a25c75596a730df8fcc88d97 SHA512 0fbed425e3079bf1a06805efff092345c5f09bca430d2167d132cba4cd4a4c66567ce1aba921a9ac01d0db368f255395b2ad38d8b16ea5d81e263b100ad5a51d
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 26c7318053c5..d70105a771db 100644
--- a/dev-haskell/parallel/Manifest
+++ b/dev-haskell/parallel/Manifest
@@ -1,2 +1,3 @@
 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
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 d5d3a5b16cac..685a08327fe9 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,4 +1,5 @@
 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
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..be0190f33d01
--- /dev/null
+++ b/dev-haskell/parsers/Manifest
@@ -0,0 +1 @@
+DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
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 23f8f8e2d062..e82504fe5938 100644
--- a/dev-haskell/path-io/Manifest
+++ b/dev-haskell/path-io/Manifest
@@ -1 +1,2 @@
 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
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 ff54a9763b45..82cddbc1a3f3 100644
--- a/dev-haskell/path/Manifest
+++ b/dev-haskell/path/Manifest
@@ -1 +1,2 @@
 DIST path-0.5.13.tar.gz 16988 BLAKE2B 4fbc3464f674a15a2dc3c543cbf9d705f9c189224e45c6bb4f180e46483547822ed8a90920c183c756ebcd3529ceaa142b7a644b6e2f28a474e1302827b37204 SHA512 bf1e4750aa025382735f0b8329daa092501f1bbcb25ca3951be653cc3193d19be4339697e966db7dbff7ea2f78b251259c9f6f4cb36402a51221b077af388284
+DIST path-0.7.0.tar.gz 24227 BLAKE2B b2f3347c29dfae0e7674f4de39f07bb7ee681735d1509c7eefd29cc2141dcf974212fc970095a783fdb47dbffaac9489097116768bfe996a160bb9b8886cc9e6 SHA512 b07fc95eab12188d49e4525ea5bbadfda9d5bfb61cc306d624730087d2fc1f946407e4861f7f66de48d9cdf2541591d4518fcc77f28d65671bfa65a963e18a9c
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/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 82b8d41395e4..69ee9cd94c35 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1,2 +1,3 @@
 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
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 150ab4d35df1..1374e9cbc9d3 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1,2 +1,3 @@
 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
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..9c8f14d6ae45
--- /dev/null
+++ b/dev-haskell/persistent-test/Manifest
@@ -0,0 +1 @@
+DIST persistent-test-2.0.3.0.tar.gz 24642 BLAKE2B a1f94ffd7d574ac575db79f2afcd9f627be9dffff8c29811d104b1c30239f0518c90b096a34689c18e9e1a4fa63a3dccb819bd910ecfdadb5239806d53e5cb17 SHA512 511aa72db39687b2b90ef262d5dd83a64887902c2fe57bb87bfd437421170f39af4ebf54ba217eddce80d2afac54ed7e546214775f056e478f20de27c518fdf1
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 4e47882ee140..10285fc1bfff 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -1,2 +1,3 @@
 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
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 a31de602c34a..5f47d615a133 100644
--- a/dev-haskell/polyparse/Manifest
+++ b/dev-haskell/polyparse/Manifest
@@ -1,2 +1,3 @@
 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
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 5c1c516ff5ea..be81f85d182f 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1,3 +1,4 @@
 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
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..de0fdbb50de2
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/Manifest
@@ -0,0 +1 @@
+DIST prettyprinter-ansi-terminal-1.1.1.2.tar.gz 6378 BLAKE2B 5c8c4a224bb2832f31ce8a52b8cdc35ee84b3e288a38f507f7bec22beb5fa2877c6ea178a60bcf189bca75be1afa35903582614f0a209f4d6f5d8072b3683bda SHA512 b2ac6c76ce6570b285370c9b1a466272aa5a3ba86a9f1de996392d750d212ff62a743e9c3c28f7de7951c9b270d64c97cb695166b65d642751942d682ff1a71b
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 51cd2bdd661b..4a538b99a7f5 100644
--- a/dev-haskell/prettyprinter/Manifest
+++ b/dev-haskell/prettyprinter/Manifest
@@ -1 +1,2 @@
 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
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 73ae0f7dafd1..1f3a946caf1e 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -2,3 +2,4 @@ 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
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 73b280e857ac..003833b1826d 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -4,3 +4,4 @@ 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
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 d66dbf427909..f858dafdcc4a 100644
--- a/dev-haskell/project-template/Manifest
+++ b/dev-haskell/project-template/Manifest
@@ -1 +1,2 @@
+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
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 bdd6317b86d9..a229679b8021 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -2,3 +2,4 @@ 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
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 65db77d7ddc4..5459a6aa7e29 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1,2 +1,3 @@
 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
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 59f776da861a..c3d08e82f50e 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,3 +1,4 @@
 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
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 8ad81ec4e1be..e20d07005e36 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,3 +1,4 @@
+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
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..2f24e814cad4
--- /dev/null
+++ b/dev-haskell/rebase/Manifest
@@ -0,0 +1 @@
+DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
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/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 e2800b4965b3..e2941bf0a858 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1 +1,2 @@
 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
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 61cbd01e229c..b093b0d53a05 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1 +1,2 @@
 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
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 777ac574231a..5b507e4effa5 100644
--- a/dev-haskell/regex-pcre/Manifest
+++ b/dev-haskell/regex-pcre/Manifest
@@ -1 +1,2 @@
 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
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 9af34659df95..be0778ff3890 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1 +1,2 @@
 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
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 3da2987e7dcb..16e3a5357f3d 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,3 +1,4 @@
 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
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..56c9eac9ea2a
--- /dev/null
+++ b/dev-haskell/rerebase/Manifest
@@ -0,0 +1 @@
+DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
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..0fda8cf1bcc1
--- /dev/null
+++ b/dev-haskell/resolv/Manifest
@@ -0,0 +1 @@
+DIST resolv-0.1.2.0.tar.gz 156710 BLAKE2B dbad867d764db2075724a06d9f9dfa8dff882683849883cb9ade6d0654fefe9f024445cd137dca516b80cc2982544b794de7c82fd5d5f482a3891422a699f2c9 SHA512 fae2d0717a109b0d6cc19c51c773bc68c64c0048b9d930528cf5622ee270ebaddec180c1d444542e8eb036262611f5b88deadeea223fb2ef2b15b41369a2376e
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 2b6b762106d4..7b514196e601 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -4,3 +4,4 @@ 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
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 022a63d90838..0328d71aa28f 100644
--- a/dev-haskell/retry/Manifest
+++ b/dev-haskell/retry/Manifest
@@ -1 +1,2 @@
 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
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..ac4e731f10f9
--- /dev/null
+++ b/dev-haskell/rio-orphans/Manifest
@@ -0,0 +1 @@
+DIST rio-orphans-0.1.1.0.tar.gz 3098 BLAKE2B 83308c4dc8c1306e8c00c6ef0365169e6787a159a17efff86a754eb2ba797328eb8358a6a83069b97389399a0416a45c945fc636c941bfc5930a76e25c6b41ff SHA512 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a
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..03395cff4980
--- /dev/null
+++ b/dev-haskell/rio-prettyprint/Manifest
@@ -0,0 +1 @@
+DIST rio-prettyprint-0.1.0.0.tar.gz 11154 BLAKE2B a9b4dfac2db221fa97f16e4184325d336a705465920d92e283a3d9783524888e3f8c3cec2ec39d08604ad6d8184cc70cf544a32967b53ba5c33c056a0b7ae1d2 SHA512 96599c19f5c49824d5bd76c109e2304153170269ecd4c6595f03705216154750670542110fdab450a7e36db00d6a6a0d3acca30e5c7c24a855760b09703a4658
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..136081a176fc
--- /dev/null
+++ b/dev-haskell/rio/Manifest
@@ -0,0 +1 @@
+DIST rio-0.1.17.0.tar.gz 57839 BLAKE2B f5e2b85b10e20277214a6fc52985ddb51b9c7bbcdcd8e04227f3588a367bba486f42cb1a141973e5f67d6989a524dc3e2d0acc49e3ef3015da0092ab091b1d64 SHA512 a6de6217d3e661063a77bc2af4d8800f5df2967bafb12f30315c59e88aafa238f24a9ed46a6648980cd2e17f14b80e0feff9e1323798e37498a739f7085fddec
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..86a9aca3dad7
--- /dev/null
+++ b/dev-haskell/rsa/Manifest
@@ -0,0 +1 @@
+DIST RSA-2.3.1.tar.gz 14705 BLAKE2B 065341bd3360410ca1e2ae1057b6b8112bc6cf1253ef12733d9d9564666b7c97e8088d35e0736a76768ebc8d40f497536ec0bb84565d849285666c591f1df3c6 SHA512 b4d3f406cd7b97237c2b36e2ba659f35871e02a6144b6cb48482fdc7999d9822758472c25b9eaef9ef6aeb8c503fa49b424350a543897217f3aec3084dd7572f
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 d64acd928ad7..74902e28724d 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1,2 +1,3 @@
 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
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 ec58e74c4f25..dabb52f52f71 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -2,3 +2,4 @@ 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
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..ed11e54467ae
--- /dev/null
+++ b/dev-haskell/selective/Manifest
@@ -0,0 +1 @@
+DIST selective-0.3.tar.gz 29161 BLAKE2B 786df49e4c05a53537e34f4ab4ba56075166140cee721db1ff517dfcfea92889a97dc3c558877a4a4c91a390e1cbcf684ddb6c2287079cfabeb75f19f3be7c35 SHA512 ecc5777c4692680032c2b758c0447200df3f42d4c97de0aef3d732d38c0813f85fec2d6f9825b044cf20e918631ce649b6f6cc932580277f50692ff609973dc6
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 652031113711..4d0d36a89c48 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -4,3 +4,4 @@ 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
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 63c7710ac11a..c61a511c2b2c 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -4,4 +4,5 @@ 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
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 c27d3f53848f..686e6e51a44f 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -2,3 +2,4 @@ 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
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..29aa5b9a31e8
--- /dev/null
+++ b/dev-haskell/singleton-bool/Manifest
@@ -0,0 +1 @@
+DIST singleton-bool-0.1.5.tar.gz 3598 BLAKE2B 3825990751089e403b8056e6f8d39714b19a06dd895e422bc04c7539131d63435ac351971a400310c2ee63ae745203f64d8edbe93487557108d0e9a9ed158c80 SHA512 a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a
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..b0366c25c958
--- /dev/null
+++ b/dev-haskell/skylighting-core/Manifest
@@ -0,0 +1 @@
+DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
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 528f41298b05..67169a956c96 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,2 +1,3 @@
 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
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 a99e2dcfc9dc..c9caa6a9b8d8 100644
--- a/dev-haskell/socks/Manifest
+++ b/dev-haskell/socks/Manifest
@@ -1,2 +1,3 @@
 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
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..b0ee8f52ff3f
--- /dev/null
+++ b/dev-haskell/sop-core/Manifest
@@ -0,0 +1 @@
+DIST sop-core-0.5.0.1.tar.gz 28666 BLAKE2B 66e40ecddf994165a37c7aa6d6d06cff3a114b15ca380fadef135df6fd19e3aa31c8602b2e58fa794ce4dce0e10fe8fce17e8d9e1f06dd30f0610aec7e1f32d9 SHA512 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
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 fe8736167a23..3fe4f885a311 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1,4 +1,5 @@
 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
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..e5d4f6bcb517
--- /dev/null
+++ b/dev-haskell/splitmix/Manifest
@@ -0,0 +1 @@
+DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
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 a7311e4f2e4b..856e6f072564 100644
--- a/dev-haskell/stack-bin/Manifest
+++ b/dev-haskell/stack-bin/Manifest
@@ -11,3 +11,4 @@ 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
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 774f6aef753e..dde9cad34d02 100644
--- a/dev-haskell/stack/Manifest
+++ b/dev-haskell/stack/Manifest
@@ -1 +1,2 @@
 DIST stack-1.3.2.tar.gz 502764 BLAKE2B 13becc53cc3b24036c3718a2d2f9d581239f231f948fa8dc610436d71201461f614695addaf145bad4bff18da0f8f3c923b317be3515fe64054387e9ef976851 SHA512 1805268fa548ea8c120abe2498b0de75d0e6a265c1a53aab1a6da51e8c4b00bc8b5c100abb1e1e822a3a68b2f469c3c82ba9c12ad7753a20a0819f8e0bd27d12
+DIST stack-2.3.1.tar.gz 570880 BLAKE2B 7bb2304f61ea58b0d76340a3f8a2b252b904a65ea709e5b0d376c79878a67e8e5e7456e6361143d1d687502b00bd0fdc12fdf98fbfd085b452174d2701c16b99 SHA512 b5bab09697d2be10445500911ff0b038adc0e9e27baa2b015de9dd3c7d18dbac8d813c20451ac660c43d3ed2c2f587b4dfffd759653ce9c23b159a936e345aa5
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/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 6ccd678b298d..be8271ae99d3 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -2,3 +2,4 @@ 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
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 027808647532..d8eeb1b8015b 100644
--- a/dev-haskell/string-qq/Manifest
+++ b/dev-haskell/string-qq/Manifest
@@ -1 +1,2 @@
 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
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 f9887d39b289..a1c41868c2d7 100644
--- a/dev-haskell/tagsoup/Manifest
+++ b/dev-haskell/tagsoup/Manifest
@@ -1,3 +1,4 @@
 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
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..9ee9b6e98f87
--- /dev/null
+++ b/dev-haskell/tar-conduit/Manifest
@@ -0,0 +1 @@
+DIST tar-conduit-0.3.2.tar.gz 44525 BLAKE2B 2e978f73fa78b3254106bdcbd7c2a5d6d6b7d624c717267b5f95cb69497675e64d9367f0dd5ea18575cc9574143baecc9e4f84b29600708b3660fd7d7b15477d SHA512 18efa362953641092ee5b4f65b32a3337af077608487e02421cf6427209592654b3b2d15f9b21835f4596434b65aa9a1f80b9f3408050c09b57f6be5cd2c73f7
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..68cb8ad5cc9f
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/Manifest
@@ -0,0 +1 @@
+DIST tasty-expected-failure-0.11.1.2.tar.gz 3781 BLAKE2B 04101b477457747abbf1a90fed80ab8692e3f771f27fae8310c0451839b38efadf1751ae302a1bac0f020e01533030563c45a2c0d75b03f9cda88ee23d1d8e12 SHA512 31f89d64a1f700a2563b291d287f559e023b0b1059cf5ad35eb9a8b2d4a7d90b2ffced828017b3e86d7ece0b125787f7512e9f4745c75d38bbc688e09031aae5
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..dc65e49e6cc3
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/Manifest
@@ -0,0 +1 @@
+DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b
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 9bb0ae13b4ed..906e0d08c155 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1,3 +1,4 @@
+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
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..c4ed8546099c
--- /dev/null
+++ b/dev-haskell/tasty-lua/Manifest
@@ -0,0 +1 @@
+DIST tasty-lua-0.2.0.1.tar.gz 6830 BLAKE2B f32d0e593a54071aac5b12e9c8b0461e122864994bc43c5d8c2039dfec5cb67a9e22ab91ec2c74926fe1f45bc5811ea47a98f635c1c22c3e364c0fe781e5c97d SHA512 25981f483b1d890b74f5b0f16b273413de2dc2a2da1a0443014e605e41c93d276bca325717aca58d194c68e580dbfde8c1dee166c1974f4f2e544887e0ed0d12
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 431accbc951a..2e8670c5fde6 100644
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ b/dev-haskell/tasty-quickcheck/Manifest
@@ -1,3 +1,4 @@
+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
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 4b560eea05b5..5f48362247af 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -3,3 +3,4 @@ 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
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..d562aaaecd20
--- /dev/null
+++ b/dev-haskell/template-haskell-compat-v0208/Manifest
@@ -0,0 +1 @@
+DIST template-haskell-compat-v0208-0.1.2.1.tar.gz 2892 BLAKE2B a4d941c715115a1e4bf01ad5bd9b935162407cfb697d2442838682e59183b67fa9e2168c8d0675572911fb2a473862790204e03632c64b5674b766a521db08ea SHA512 864cfb6a9fdd24f9a17d6e9ed2dcf8b00c6dc289165b2f34fb90384a90c03f554705437e15f87d53cd532c78243bf89f141d93a880aaeb7c6af9dc51e85ac96f
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 df10c01863d1..07539175700b 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,3 +1,4 @@
 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
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 151de94f3c23..257038e15b43 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,3 +1,4 @@
 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
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 90aa1fa31dd8..026f84289d83 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1,3 +1,4 @@
+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
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..245c5eeb144f
--- /dev/null
+++ b/dev-haskell/text-conversions/Manifest
@@ -0,0 +1 @@
+DIST text-conversions-0.3.0.tar.gz 5232 BLAKE2B d06232313990941dba2c300703a1b6b9b65c68583b8e8a77d6f8536104e39af2d7fb5529e52fc39b1c554fe50efc5df9fb4397305bf4e763b3fa5425b8b72189 SHA512 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
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 606fb038b913..08373f22e38c 100644
--- a/dev-haskell/text-metrics/Manifest
+++ b/dev-haskell/text-metrics/Manifest
@@ -1 +1,2 @@
 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
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 d3bea500a1e5..d297203e0536 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -3,3 +3,4 @@ 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
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..d27153b169ce
--- /dev/null
+++ b/dev-haskell/th-abstraction/Manifest
@@ -0,0 +1 @@
+DIST th-abstraction-0.3.2.0.tar.gz 35111 BLAKE2B 18fc993256f6d49ec1e7911d152896cb7e62c3397030fdfb8179879d8b98a666f3f2bf73c3783276f92911698da94338cf5cc6b71df3631d9588d3022085a414 SHA512 d03087e52c51f6038d41a35fbfd0c6ab8b890c6d0aa91bc1a42c46f746f60d3c19c41766006977e0ebee4517bab5aab0f0439a2ed2434e5d41a7086eeb3ecea3
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 0dfad2dd9772..8e6e47dfe4cb 100644
--- a/dev-haskell/th-lift-instances/Manifest
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -1 +1,2 @@
 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
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 dbc58198569d..ea9ace1d5aed 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -2,3 +2,4 @@ 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
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 66c6c28384a6..d699e82ed1b9 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1 +1,2 @@
 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
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..ee6d81194c57
--- /dev/null
+++ b/dev-haskell/time-manager/Manifest
@@ -0,0 +1 @@
+DIST time-manager-0.0.0.tar.gz 2726 BLAKE2B 911ee2ac8bb028da7bddc472deae76ac4af38c2998e2084bdc5e34567d4a2b367c8ffa9038e20abd41695f0e46a0200c5f95b9693f88cbf6e980d2a0be38cefa SHA512 aa8bd9dc9a66ea097fe2d6a6d9e77eff67debc58a588da7ae1d6fc312b6bb371da58b413b58cdba21623e2da26633595f379ac9e0a7a6dc7281ad42353231054
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..c18b1efa8bf5
--- /dev/null
+++ b/dev-haskell/tls-session-manager/Manifest
@@ -0,0 +1 @@
+DIST tls-session-manager-0.0.4.tar.gz 3821 BLAKE2B f86aefd6d6ce07383ab7969bb877cabf301530685095cf29a7f5d037ad59a227bddcb0629bc74bd9dfb594727fee1c32619896e3677cfdb8c5ef2578b89721dc SHA512 8516a2a6a12ee33ca3cbfcf33f5108218dcfea54b092a5292cbe0935b1c181d1aa26d171eb1f62d93ac80bebca21221598a07e225be5513743b227ef6908fbec
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 cdc03e94116a..747942a29958 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,3 +1,4 @@
 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
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 f988f0c08a6f..f457b549ccd0 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1 +1,2 @@
 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
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 0671d49dc5e3..6d23ac621250 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -2,3 +2,4 @@ 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
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 c041ef62afd2..f3162750df42 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -3,3 +3,4 @@ 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
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..f091af93eab2
--- /dev/null
+++ b/dev-haskell/tree-diff/Manifest
@@ -0,0 +1 @@
+DIST tree-diff-0.1.tar.gz 21644 BLAKE2B 0cd1633970216a994100f852b0982d43b6f1d0dc1b0550e759009250e016d271c5358460ef3999267da597b4e58dd28c3094e0ba4f618ba5990e91740eb63881 SHA512 a4ee703e4b6a18055c7749020863a9571af4620dbb7ea05903693c752e10e3ffa4fee8da0dacc0e4bbf92173e34c9070251881597ca1cd9f7c8ed365e840563c
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..e2aef0f1696b
--- /dev/null
+++ b/dev-haskell/trifecta/Manifest
@@ -0,0 +1 @@
+DIST trifecta-2.1.tar.gz 64406 BLAKE2B 31829c010ad48d9c506863138379d4694318235c3cea7f43ee46bdcb22fef4ccd9979990150486813a3b0f6297c34597888cd52e987f0fe8102882a217a85a7d SHA512 0929ee4a3d9a53c211b13a711814b4b6ea488ad40f373befdc7e8a479b2a95c4e97a19381873af54d377ff2af49782677fa2ea892ea69522c242e245debd3a25
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..8b377906366d
--- /dev/null
+++ b/dev-haskell/type-equality/Manifest
@@ -0,0 +1 @@
+DIST type-equality-1.tar.gz 4525 BLAKE2B c93061cbf7ad6a02586770dbbbb8c4e47fdee48240b85cb8fc69f78ee8cd05c493585cc14129969814042d3cde2cd4e9468af86e61cfef486b4c3d424b5f413d SHA512 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8
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..cd4d0143b3a0
--- /dev/null
+++ b/dev-haskell/typed-process/Manifest
@@ -0,0 +1 @@
+DIST typed-process-0.2.6.0.tar.gz 17363 BLAKE2B 033c1da191fcf10ca36b1215303793d26b3435e7241ee07e4c3389a9892be496779f70ae62b6bbad7f07704866473e16d4f15bfb6f22efa41243cba6ad72e941 SHA512 a40b8db4ef2179273943a3aab0200891bd3dffe584bcd51037ddf9cebae88d4d95292883a745a0c31900c7bf2eebe2c71175fbb86dc470b60660b443f8b1e3e0
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 8dd4407f9433..e73f9d236689 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1 +1,2 @@
 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
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 218e5bb44ad1..59aa37d9a5e4 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -2,3 +2,4 @@ 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
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 9d63abcb2419..dfe82bea50ba 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1,3 +1,4 @@
 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
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..dafac5b5da19
--- /dev/null
+++ b/dev-haskell/unliftio-core/Manifest
@@ -0,0 +1 @@
+DIST unliftio-core-0.1.2.0.tar.gz 3631 BLAKE2B 26829fb8d218fd1b73f1bc86b1d673cedef8894345a37c428d73875c0e1c4a47a7107c0a7d9818ee03e6abd75c7da5cd7afdf4c2be02845ff78527c80eb86351 SHA512 5bd46d40be031b398b3238a5170f45641861a30c8cf20ca5a202b47367f00bb52e7391a53301edd47f8d688c713c06ebfdc51b1528518e28f8e8d6ad619e10eb
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..855bad213f2a
--- /dev/null
+++ b/dev-haskell/unliftio/Manifest
@@ -0,0 +1 @@
+DIST unliftio-0.2.12.1.tar.gz 53520 BLAKE2B a8f1e044400a5cc49af3db66fe3e79f8441b2a742e11493eddb59bedba94a196591ef914c5ab1cf998f337751fcc931c92e20efc62ef7989d460072cb44abb96 SHA512 fb2814860cd2b59ae1a17dfb5892198666b59b737264e46e303909a9f5ce2377f92e70ab7d666fc7f927b9cad6593659dd2bb2168478021927b184e54ae4b44d
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/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 f2d8ed08c06c..6cacd27d67e7 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -1,2 +1,3 @@
 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
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..74889abb809a
--- /dev/null
+++ b/dev-haskell/validity/Manifest
@@ -0,0 +1 @@
+DIST validity-0.9.0.3.tar.gz 8015 BLAKE2B a14f2dfb2a716251bf7e65548fad61d3525685c2b5065e4b4f74c9fcabe39f4b588a0e5d422abf9b3c734a0be528a59fd660833dcd65e1e0dd06283a0db95552 SHA512 f60faa65677f4a306a289d2985cd1827c3b2fbac18f25802f37af89bb8e0e9dfa23bebff6c2da4eda7824b94e9d26e5bcde55a3756b4e25b86f14ac0aee8446e
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 db63f0026a7a..95ffba10192d 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,2 +1,3 @@
 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
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..fdf9e0514f40
--- /dev/null
+++ b/dev-haskell/vector-builder/Manifest
@@ -0,0 +1 @@
+DIST vector-builder-0.3.8.tar.gz 5045 BLAKE2B 1e599a0e50102c50cd6057cf892d97f9dad7468b0e49500743bf422b8a9e085d062b9b4e13ae9bb68d3c59e6bb549e77a962fdaed91d5a3e3e5d74b8ec45a6b7 SHA512 e7ca1b6ba35aa76e16ad485cfd5e326c2b257339d2aadc57b7ce2a5ec3d5790fec99e5546ea18351cd9cbf31e7ec99c737461950acd355f62be27b53edb2be17
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 e14e8529c963..6ebe657084e2 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,2 +1,3 @@
 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
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 afc19d9883a5..53af146813af 100644
--- a/dev-haskell/wai-app-static/Manifest
+++ b/dev-haskell/wai-app-static/Manifest
@@ -3,3 +3,4 @@ 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
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 6eaa485b0141..7b5504936403 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -2,3 +2,4 @@ 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
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 fe0d5a3ec710..af60ca896a39 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -1,2 +1,3 @@
 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
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 c7004a369fdc..daf061c21d0c 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -4,3 +4,4 @@ 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
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 649ec39fc547..f34696348a6c 100644
--- a/dev-haskell/warp-tls/Manifest
+++ b/dev-haskell/warp-tls/Manifest
@@ -1,3 +1,4 @@
 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
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 5847cc0fa14a..f5bdb2d22439 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,3 +1,4 @@
 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
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..dd3dcc4dbd78
--- /dev/null
+++ b/dev-haskell/wcwidth/Manifest
@@ -0,0 +1 @@
+DIST wcwidth-0.0.2.tar.gz 4168 BLAKE2B 4c6f3b490934aacef35b4fcbf8d9cc8f2c93b2d34a705e78dae4750f2adaf37d4d16d89e6595a50bf545d7a7dd486f589b1000f7d2f5b2893b45680ed31f1c4d SHA512 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649
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 ecf570d81901..9b922ef0fffb 100644
--- a/dev-haskell/weigh/Manifest
+++ b/dev-haskell/weigh/Manifest
@@ -1 +1,2 @@
+DIST weigh-0.0.16.tar.gz 9070 BLAKE2B 9d21313445541701460267fc605056bebe17cd409a733a05c306602129f8850ded4b9688c52084f35cbfb9105e397779d9127c04a74556796a0091b413d1d16b SHA512 a7889b891f8099e23922f37c9a770c94c8bfd6e7e7740786ba1595c0c153dcd60a320d79647952a1a1275a1cf06e2a2aed9ee0ce60e34583a91d186e246f9470
 DIST weigh-0.0.3.tar.gz 7028 BLAKE2B bee320438a986d8a3fd21c8680f7263a4394e9eb713d8b503dc57bb823841ada5d6395e813685fd4e4c7f19f0b5153e70dae1fb2a7f9e4a81e9c674dba0be0d2 SHA512 26c33c4079b6461be3cd93c9ba07deec9f5e1945bf9a2baddd3608d19fb5a3c5e103415dd37f931a7f63e3d62c42cac5d7e156d59e9a1a2789d46c27c24b550e
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..edd0c46ff4ac
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/Manifest
@@ -0,0 +1 @@
+DIST wl-pprint-annotated-0.1.0.1.tar.gz 15458 BLAKE2B 8699ca505a0c72790d70890ec290bbb602d259015554a6260d52445574d8e0f86c9d4e4a05bba155f59730595073d0613cda00fcecbf142c97afc0375eaedcf2 SHA512 45f1881254f8b20d9992a477a36a7408d2df8d94f99c71d72d75cd04aee3831966886c94b6e6a68791acda24aec8c4a339d052b9a188af8c2ca24e74da1e9596
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 0ef2e5d5b197..3d12106a5a8f 100644
--- a/dev-haskell/wl-pprint-text/Manifest
+++ b/dev-haskell/wl-pprint-text/Manifest
@@ -1,2 +1,3 @@
 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
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..8a75bfc17d78
--- /dev/null
+++ b/dev-haskell/wreq/Manifest
@@ -0,0 +1 @@
+DIST wreq-0.5.3.2.tar.gz 57521 BLAKE2B 2265e7f8abe371371d079f735d61917c0efa5b78e2d3e8965e3b720a94e89b3a7ae05824f54d6fe765c643ed81f506b12694355b0bf1d7b4c2e9198d08c2317c SHA512 5a2c62b973758cb8ce2bf20504e328090896fa25e7ee1f77b472d7cf5156e08b6d85bf4341ff45e44db1724070fcf3c0f21037fa0a79211a1767024328f7c779
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 1917fa8c8d7f..d36936af2a28 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,3 +1,4 @@
 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
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 ad9f83938072..f7dcbd4fd9e8 100644
--- a/dev-haskell/x509-store/Manifest
+++ b/dev-haskell/x509-store/Manifest
@@ -2,3 +2,4 @@ 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
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 cad6584044ef..8fdfc85bd469 100644
--- a/dev-haskell/x509-system/Manifest
+++ b/dev-haskell/x509-system/Manifest
@@ -2,3 +2,4 @@ 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
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 39c5ab85998f..29fc16ff3669 100644
--- a/dev-haskell/x509-validation/Manifest
+++ b/dev-haskell/x509-validation/Manifest
@@ -1,3 +1,4 @@
 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
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 bb61cdf7406a..cfb7d31d8c1c 100644
--- a/dev-haskell/x509/Manifest
+++ b/dev-haskell/x509/Manifest
@@ -2,3 +2,4 @@ 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
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 9ab8fa5c79cf..0cae4d446f0c 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1 +1,2 @@
 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
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 aecaef43db50..98ff2af95f20 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -3,3 +3,4 @@ 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
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 91fba38f3d9b..7a79ff60638d 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1,2 +1,3 @@
 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
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 91472f562de0..ee853abc685c 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,3 +1,4 @@
+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
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 ea69c9041245..2c1593fc164d 100644
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ b/dev-haskell/yesod-auth-hashdb/Manifest
@@ -1,2 +1,3 @@
 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
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 2564ac1ca84f..40f5be4af659 100644
--- a/dev-haskell/yesod-auth/Manifest
+++ b/dev-haskell/yesod-auth/Manifest
@@ -1,3 +1,4 @@
 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
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 88339eb5a46e..aa590b818914 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -3,3 +3,4 @@ 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
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 9f303a8e39a2..1df60affa023 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1,3 +1,4 @@
 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
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 255163c789de..9883ec097f1c 100644
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@@ -1,3 +1,4 @@
 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
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 2a2bdd43854c..41c5b0d3c615 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -3,3 +3,4 @@ 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
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 af0de4ab40fc..c92d99da5752 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -4,3 +4,4 @@ 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
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 2d9c3db07bdd..92fd4e1fb789 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1,2 +1,3 @@
 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
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 51e73c8a7148..2f700d2dedfe 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,3 +1,4 @@
 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
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 1405b0779d89..0235ffc940e3 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,3 +2,4 @@ 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
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/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 cf08663261ab..535bf9a5e293 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1 +1 @@
-DIST nim-1.2.4.tar.xz 5680128 BLAKE2B d8bb186862bf8c8e7e20dd5d1035013c6d48de777512658736ddcd49723e5789dc1e8fe6b5dc8bfbda36d204aeaeba3fdb4e10c6d7955fdc47d9fe78ce17082c SHA512 ed5dd7a744229685c9c034700eb0f7d7c51030ea344c1c371cf2731632fd3376b577a3a9731ed79d65a8fb69f3507a8a88408f2e5c46359a8bbd3b3092d991cc
+DIST nim-1.2.6.tar.xz 5688752 BLAKE2B 8865df1c508b9c21a2808c0eed8c6cd294f57829e8b75a3c3b70964b45ae7a29ae1670763447ba4f7135ce8ef55e696db1a5cd0a9d563d2174c7212c41d9d268 SHA512 ef59bbb0d4b05bd13624ea7da7182f1d73ffb31c7b34f5928b7e0411809fd70d1898fba9bb02441dc9ce802cd8accaf59448aef5b457e64de73c2ffbbcd53fbc
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 0bca1dc98d1b..2c619a1415d8 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,26 +1,14 @@
 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
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 63206de66ce3..090b9c55b722 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -4,6 +4,8 @@ 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
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/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/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 89aa9afc7013..0bad9ba405ac 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,2 +1,3 @@
 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
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 7fb88bca2853..40a66ee39d76 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,3 +1,4 @@
 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
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 d37345743d1d..0282dedfe534 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,2 @@
-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
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/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 3f043247ee97..828edf55d58e 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,2 +1,2 @@
 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
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 4182b5753a51..0d78f3a2be9a 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -2,3 +2,4 @@ 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
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/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 33f183b8a31a..9bf331c4ba22 100644
--- a/dev-perl/CPAN-Uploader/Manifest
+++ b/dev-perl/CPAN-Uploader/Manifest
@@ -1,2 +1 @@
-DIST CPAN-Uploader-0.103013.tar.gz 20961 BLAKE2B 9da4ae22e049f05598a4d916410619a93c46fdfafc51242836a85aa2ed2ce2806fc6970da082d7bfa72d18f82c47259367ba1fdb478f072675018bd097d8424e SHA512 28133d7e5a9b12abf9f089402108314ca9fd68981d52006136b82a754b56581c7c5b38ad69b6080d247b46d0c68d258674c49218c1c5d61811bf89bcd9d773fd
 DIST CPAN-Uploader-0.103014.tar.gz 21562 BLAKE2B 09596c89e21eb3a4e8ee8b3375f668e156508857828f0d421ea4f2ee5f831ae58e10091e93be7c362fd4cb7cbd42b03d193974497ed8749ed3cf9b6e4b16671e SHA512 2c7434e0bb6afb6aa73b9ac5cb4d1a865d179c63eaf1f985fc2117ced877b9845c71144e5fda29cad24dbf0073d3e167235f4ba359adca58a081c167f5aabb80
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/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-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-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 9e8ff2a90a1c..e98867488b69 100644
--- a/dev-perl/Config-MVP/Manifest
+++ b/dev-perl/Config-MVP/Manifest
@@ -1,2 +1 @@
-DIST Config-MVP-2.200010.tar.gz 32947 BLAKE2B d49ef8bf74ee740ff4eac13696fd6bdb943030590e54fb80f14d3cb6a07b38b2ec4b0b5bc3623e89620669fd85139e2eeafc7492208cd01850f46602b6f31075 SHA512 b0febad2c80ab3e9d8c19b2a8b6c8a6bdb1e2358fa7a3c436e639d75ad15560ac4aa08f88c67f32f28dd9fe491ae7b156715e93d0078d27cee20e16016154052
 DIST Config-MVP-2.200011.tar.gz 33387 BLAKE2B cd57bc21b3106ee991dcaf07017a41dbec4453bc98b823820f431d86101ed0c0a0814a8617c37b3df1bf1a264ff07a184fedc94920c68946837e3852076b0f92 SHA512 8e4c178b355a5e4ef4a1d7f8b304a1411f19f6ca601e6ab6593b0b3e9002f7f5ba64eb49714bc155741651dc501b87296e2fc4a3388e7616efdd4dd893866606
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 29faa0b79ba3..bf14cb0fb787 100644
--- a/dev-perl/Context-Preserve/Manifest
+++ b/dev-perl/Context-Preserve/Manifest
@@ -1,2 +1 @@
-DIST Context-Preserve-0.02.tar.gz 25305 BLAKE2B 6974a9a8827e67652e407dfb05099449bfd2ed8c672552235746dd13b1504799694390e537795946eb4fbdc703e5aee129b40128d35d0d9145fcfef56931d229 SHA512 e5c230e38430c6ea9b7ed75e075a12454262adf1883e5ab6ada4696099e2f246d0f9b613934b4197b0529e126ea083d12d9bbe4ece5cfb82a93f913b7d70b068
 DIST Context-Preserve-0.03.tar.gz 25915 BLAKE2B 78866e1c0d20f12fd95da981d42f8de2405a9bbd092d5518c777d7897955b8823c8607f49469b556fcfa58dc48643ec50a394e7e3e938f5777f8b3c65602f21b SHA512 a5f412d553ba2ded7302f594b920bd9c04021c5ec60e94939da097a0fa2de61a0b49dd864e3212eb9b3a7d5236295e1923452e81d56789ae6852c73ec3086cea
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-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 02ea36f0e268..380760f6c1ca 100644
--- a/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-CopyFilesFromRelease/Manifest
@@ -1 +1,2 @@
 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
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 41475b1472ff..0fd1ff96f207 100644
--- a/dev-perl/Dist-Zilla-Plugin-Git/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Git/Manifest
@@ -1 +1,2 @@
 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
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-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 badadf2405c2..b7832a916956 100644
--- a/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome/Manifest
@@ -1 +1,2 @@
 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
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-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 a9221626a6f2..d78c605f6780 100644
--- a/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-OSPrereqs/Manifest
@@ -1 +1,2 @@
 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
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 12edf421a8fa..4096cd7e445b 100644
--- a/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-OurPkgVersion/Manifest
@@ -1 +1,2 @@
 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
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 3e60ca35e1df..7da3bba1ca7c 100644
--- a/dev-perl/Dist-Zilla/Manifest
+++ b/dev-perl/Dist-Zilla/Manifest
@@ -1 +1,2 @@
 DIST Dist-Zilla-6.010.tar.gz 198805 BLAKE2B 82c5792f81174d74cd917e77f9e3899d0fc8233b6a36147618cd324dfc672c47e91305b2e5335a376846a8f25a5ab1b6d10c5ce1e11def5eb17a7af88d03e12e SHA512 707a736c43b1a52038a01c2e238ac39fa35c5eb7120c7fa11a06248f5fc3518c5c75e3660553058085c5b930e6df6cebfd1957435b78ae48f8b4d45d3b99300f
+DIST Dist-Zilla-6.015.tar.gz 202822 BLAKE2B e26d50d7cf90940e3e003f1d056885481878aec8a2b16ed8413c237aeafb878bc002ee231a0edbdc4b5fd584480f1b245b3469a27a2c5edc93fd79a57de96dcf SHA512 956a32d2123fa371f2589f2d18d87b6408fd13ebdf0e711da4cac8ebc3dd82accf9e97d6dd577d69bf795c589b7246b9f9f1124835a6dcdb89730fdeec547715
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..85cf4d8c4296
--- /dev/null
+++ b/dev-perl/Types-Path-Tiny/Manifest
@@ -0,0 +1 @@
+DIST Types-Path-Tiny-0.006.tar.gz 15614 BLAKE2B bd35285a3e53f1af1d813eb485aaeb98f7c8ea07cac6b81ff223bfbaacc551364f3b349b88c48c5bce6439529d917f45fbe1fea5013b51ae392f203f6ba24c64 SHA512 9820b5e23bd916895d64573273dd0ffcf8fdc1f0cf6af2db02400bcbbc3611628f03e2ca83f9297dae3b28784279689ba40256f94f0e7ef841bd08e026941b0a
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/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/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/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/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 19732d3149c8..6a3f57ffa2de 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1 +1 @@
-DIST amodem-1.15.0.tar.gz 28779 BLAKE2B abc2afbce47cf5e3b2ae34bd54228618e887b3f0b919d421114ce5e56e3e8a14477f130f03d77851c1e256afb22d4b657367c8e59954438dec72f3059278de64 SHA512 5d39e08d47410a55c218ed2dc5a413cbbba602fe1049d3e8824ca62b439d029c42294b2a17e4077b2c746336b1471a4a94ffa19b9eb3145869dfc158404bcad8
+DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
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/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/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/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/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/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/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 f8e008f663e3..4f136daa4464 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1 +1 @@
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
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 18a3f4492a93..eaf41cc7a2da 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1 +1,2 @@
 DIST blessed-1.17.8.tar.gz 6697594 BLAKE2B be279f1962e8643fdd2f03c63292700ebcdd89f29163f72de89d649990663e9677391a134e19e97fc51c64341f2efc9dbb8a13a467f864c04341a55fe31a87c1 SHA512 fbdeea8159f535824600bd4e9b080998d0a8336731c1d53ff5b89c7488363d35b87752b8e424317f64f2b90aec3c62ce3368503b1a864a67c1de48245dc2fbbf
+DIST blessed-1.17.9.tar.gz 6648453 BLAKE2B 75de7585de7712cb4314ca22fd30ea811e446e1373ccd9a8750526e9fd0b5ea31d4bd0cedbcb35f7814bda32c75f8d58141beb32f131cc8fcfa127e89c255c25 SHA512 0ead3e3a4b96213acb2834fa8a0d8f0c590027a1d3bd49253ea58af9da55fd687beea6b5dfe3a8f7e6f9868967e24e468abcbe260a3cd55018f32d7b81a58d6c
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/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/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/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/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 7bc87abcab73..87036d1f4998 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,5 +1,3 @@
 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
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/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 d0814d56c0ec..fe3c67a77500 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1 +1,2 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
+DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
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/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 65b2f7241fd2..497e326a6d37 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1 +1,2 @@
 DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7e4f4ff89697c254efc365091a61b298333b0f8d660cc9f760d3960a355beafde2555dfd912606dbe4a49db1 SHA512 c00886768b331f48ac9627f81c39368afbb4f1083ee9f7e3ebbe64352cc48c3c580fccef8d5466592f5bf772f873bef2ac084a972d30e7c1b4d1028e1d456059
+DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe56a786bbb00215ade5ba5fa7687176f70f12802b06bbcaf00db76f0c97eaa5b87cb65fc28bbe3e37c8b55f2a6 SHA512 90d6391a8dfc36788e819bf09f4ea65a89f37b14d0755fe4ade9179e5d3edd6dada30d5c08ad730f4ac9e08a0cc64a354933f52b92eb13fb8e60093dbcf28567
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/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/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/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 b981d1c7c599..10c714c050ab 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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/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 2152590cb12d..f348eb423328 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1 +1,2 @@
 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
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/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/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/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/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/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/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/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/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 79b4624a8341..5f5ebd1cb35c 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,3 +11,4 @@ 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
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/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/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 99cf8edfe594..5e4660a940ce 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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 ec1c551a5de7..e686eef9d2de 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,5 +1,4 @@
 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
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/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/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/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/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/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/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/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/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/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/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/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 12b0ab54d78f..e8fccf3749ad 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1 +1,2 @@
 DIST mongomock-3.19.0.tar.gz 100891 BLAKE2B 3a5f31be32f209527d371a6125f930f2d9e3c9a105554e6c4e34c68e390333179198c7c54b54d4f25a6032152b71b1f62a7c393c3d958e913d222ffc1230a9b6 SHA512 591fb398917850ba4163ebbb58470e4fc51a057f9b1a8c92897fceaba3c8e4b95645dafea6f8e58d182f629ab767923c5b75fc474cf2ac6ea952ada5b9522310
+DIST mongomock-3.20.0.tar.gz 109297 BLAKE2B 9045a74b4478f00ce4959b6890d5e5aedcbfd7dfddbfc8b7f77c60e64bfeef7c2bfc80c5e30a085fce7f5cf1411465c3551e585b0bc521f55597cc5806c977b1 SHA512 37b96634790eccd9874a68e7d74b234576ce928fdbd8705a7b1cf09d7c3dd69af5adab15ff6be5efefccbbf6e994f836e7b18fef5ae7e825fd22117449b6b983
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/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/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/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/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/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/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 30bcf5dc9ff1..80c1229caab7 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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/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/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 f0be807095a6..770386da5c0c 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1 @@
-DIST peewee-3.1.0.tar.gz 705099 BLAKE2B 1dc528082337ae509fc9f91c521d7bf036179ad6b1a5a93e113d594ce819d3a9cdbb7e687b51acacdaf242d542dad138ce2a21f9dcc19483c7361788329a53ed SHA512 628eea27d51017a6ab87aae9ae851d749b0f437fe1806957b23408ad3c97bbb93e5b84c66c5e70bfb7b55c9f29a0c517b84e65adc0f979da450987d670661e84
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
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/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/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/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 8965646b1334..42cbe402c60e 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,2 +1 @@
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
-DIST Pmw.1.3.3.tar.gz 451232 BLAKE2B 2ea74cf010b094539b1e052850b358e05a561aee1990de7184244b77a4133c1259ff54fa6e47c5368dac4bf81bf23e9217742ef1327ab7e20b8dca27ebf5f333 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668
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/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/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/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/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/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/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 8ed273f0f2d6..22527dde5db3 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,2 +1 @@
-DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
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/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/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/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/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/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/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/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 70883cb9ae0d..e2878553a9ea 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1 +1,2 @@
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
+DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
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/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 c59042850469..bac20fb25183 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-1.9.0.tar.gz 42584 BLAKE2B b479fe5b780f6dbd30f20c0e183205ffe87703f26fe8ff04170c7f906705bfe737e965c2a7ebc562943c96a8f9bf7710e84999656d1ff22820254e4f4573f0e2 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
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/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/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/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/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 539f4b1e1183..1f9477170bce 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,2 +1 @@
-DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
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/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/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/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/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/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/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/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/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/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/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/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 5ce83b0cf452..76387d4b5ce8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,3 +3,4 @@ DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa
 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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 0734bfc2e92c..78fe4fe4eb72 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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/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/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/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/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/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/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 811664ffa6da..98d1d7fa67e1 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1 +1,2 @@
 DIST u-msgpack-2.6.0.tar.gz 19911 BLAKE2B a6599a85fcb386f91dce4d11fd8d10c6be75c1fe4e80756c58058bcb7c2934c2174afe65bc0b88e11c5c9e3f66b46c956c9209bb6faf74ab5c382bd665c412fc SHA512 b0f2fa677001705a8a1e96e590fd334d0561065e0617a56a31abd506907dc2446c93f8c4429e65e86c87f6d2cf3e19a921fa0aaccad5cdaf1acd1ae0a1235688
+DIST u-msgpack-2.7.0.tar.gz 20427 BLAKE2B f4e4447635fc20ef5246bbc90ee9cc0b93eaa9d13a0384423145531bb8bbb21dc9d1ddadc075a4a5e456dd8cc758fed3add4b2b43f83c0115c78a0095030ff70 SHA512 b5a6676aa3eea878e3f1cc6ca1351f59ae0fdffdfe4d68c43303a1c5d257449bdcd08bef0fc75117b238544366e42b43c6444bb93ba63d1633aadd0c32061c8b
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 f6cc163250e9..97eef71a635e 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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 899e2bb966f2..f40e6e3a54e4 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1 +1,2 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
+DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
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/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 754f97797d1f..3b7871a31c86 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
 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
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/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 c2815eaec489..7c3121c75dcd 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,2 +1 @@
-DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94230e000c6779920fc84e1e690d5e34f080c5fb1f5a9f71769597c349fc55e12d339280836a47969314e63f6c5 SHA512 db02dcfc542d1fd08fccad815a02cbe01012a942329c53d468c7f9b6e0d628dd38abf4b2633bc8992fb914932ca4455e54c7ef98e101ca86d34825edfc3c1feb
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
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/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/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/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 2e8f5cc339b2..1e27da6ae967 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,2 +1 @@
-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
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 adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,2 +1 @@
-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
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 adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -1,2 +1 @@
-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
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/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 adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -1,2 +1 @@
-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
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 de2beb1cd005..00d95d9416dc 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,3 +1 @@
-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
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/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 5ff4d5727a13..ef5990b98239 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,2 +1 @@
-DIST omniauth-1.9.0.tar.gz 26060 BLAKE2B d0b7cd7536fc19184f56cc2b383ff70d7556d4794fb2981738216b770c340cc14025f1241a40260c0620a7bae73906c4baad1a9ce68402f0e7882128b620005d SHA512 8505fb5081f9f4daa143925b56804d81f656523c2e65c066668f2bc5c1da50cd17a06c86856e9f6560a71ee440804a536d3e814eb5dd34a0fd0c4ababe2fdadf
 DIST omniauth-1.9.1.tar.gz 26528 BLAKE2B da096ce924972c867ade4cde7e6ec90f5a7de41947f5d04ad092174baf3073ba6b235ff998551d9bbc7f6dfa2a4290eef1e1d962590591cf29f89395a554f3a9 SHA512 687ab9ad47d57d1cbe01fb7ed37754fecb3b75b7e62853070b5880ad6347a2834524a8d4042271ecd7f708ab35b7b5bd3203058ef03c3317f26f88a7639c2672
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/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 66a9165897a0..78d2eb57965e 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1,2 +1 @@
-DIST optimist-3.0.0.gem 29696 BLAKE2B d078a21fc95d64827e3f9a4539339ba3e3ba9f9649cb70d4e5a830f2523b02c4bb6aa1dca159a913d852aa2a320002beb6276d920ae1804bf65c9cf1535fc341 SHA512 1fcdc4dd01fb26d5b1d181913ad28314df05e60277bcf73b98e04a7463430a6c73396fb729e3cf34bc89e2eb8387d4d3294e93fcd530129a7bcd7efdcef5223f
 DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
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/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/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 e53e668c44f3..77ea3ead0b9f 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,3 +1 @@
-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
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/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/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/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 ce81f299e2c0..f87d95555f08 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -1,2 +1 @@
-DIST bibtex2html-1.98.tar.gz 92719 BLAKE2B d9846c1ee03c7f003fe9acf586a0833715f8fc0a675ca4d3d2b2f070206aa81112ce5de1ce84c17fad4f3f5b5972bc6820b67428c73c56709875b2574b03cf19 SHA512 7d8480ed87bef74a1e0c970446fba4d30b103df3e78f127a051efff875032ac7f52d3d6baab0c6a2fc67ca11f3d558d7be4439311934f99067993b5891ff6ad4
 DIST bibtex2html-1.99.tar.gz 93073 BLAKE2B 9cf7f98f9f8ef6f82bd54554482ac8130e88b98e845a6b66a52f7c6bfac326136d3c04b60801f4b1e607818bc0516f9ff75e206e31c531ce7a36217534a40d4a SHA512 70f7465bd51ad3ddb40297edd7b50732088d150692f53f33b2dff276a8d223d972f0935f30fc731fdb3bc693275743420eb0d670109054c1e170fbb49015bbeb
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/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 337f153a7c9e..000000000000
--- a/dev-util/cargo-tree/Manifest
+++ /dev/null
@@ -1,39 +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
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/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 12c70370a972..d775576631c5 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,6 @@
 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
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/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 eb3a66cf3a8a..a1884f8b0e7f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1 +1 @@
-DIST diffoscope-153.tar.gz 1571168 BLAKE2B 3fea8884d733b947c629f2797c2f3f27e41233494e4e930bf4913f444d5dbd815478f7acd7f714e30ec711c23a7cfe41191e4edee0e08edbd583953397a4d9de SHA512 500f866cfd0d0a5adfff3d98be68fa4d52c1f438668b5dbd30f40913523de069e7b53bfae3ece854b22e4860c56e4359240e92419b3b2a7a1981dac9358a3876
+DIST diffoscope-154.tar.gz 1571220 BLAKE2B 84b7a282180b4f8d3b374dac8e3514b3bb7d3fda3b40db757dad98e011112174da27a35243bd9b23f2b905ea59dc8c9a85d9cef6d436d9c705ca57b379dfb7b4 SHA512 f3a21deb9542c7ec7fc9929685d57ef97739d86f8e5227e212aaf3984a53df88f3224b2f4ba6254fde76f1858cbae83fea138e3c914a47625a62c6e6607ed28f
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 a94d3df0e25b..d9e366842351 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,5 +1 @@
-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
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/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/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/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 6fe5771f69af..a9e35eaf3fbe 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -3,4 +3,5 @@ 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
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 ab38727420f8..8f97fa423e27 100644
--- a/dev-vcs/git-annex/Manifest
+++ b/dev-vcs/git-annex/Manifest
@@ -1 +1,2 @@
 DIST git-annex-6.20170818.tar.gz 1111837 BLAKE2B ff18ffd101b3f9dc2b74caaed57c8f8f568fc51beeedddccf7f76ef5a27a99801cb994a52f09e5467be2f030842f4fa3b38bfd0a19a207057ffe269dfc8f240c SHA512 06587bf0d3056e4b94d4c40aaae820efda133dcbc876a2ac3db3183fb511ec20aae4c495323b4886868a3e66b5b1f53a04c5f3abb0362c718bbadc8e2f6e15d0
+DIST git-annex-8.20200617.tar.gz 1296190 BLAKE2B 3731641ff6623d7f0b2ac5402fe6acb41e4c8210e958c5c4383f401486d4307a921cc9072023ec62fdf2da78ec432cf0707a06265345681d7646af2974917cbf SHA512 736d10c1442bb6d8eaf67337da6b606e8b79970f1bbd10cfc15caaaa0376780c14dee9ece066dbc6b378f0a750d11d5b7b87687252899e473748828939dc03ae
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 b0cc36f4a4ff..371ab8b19870 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1 +1 @@
-DIST hg-evolve-10.0.0.tar.gz 808587 BLAKE2B ec6c5f3edf8967df9556413326d2dc66830461c65a4697963513429aeb601999461012ec19a17ed8ba0d88a7fcf9ef41749428b71819e99a39b261d6d2541157 SHA512 4c88af31584d61df7fe397015e185d0191a021f89a23630b6d71ead5acb233f4b71638f3637e12e1d04b03fb79f127a754eeac0e85ab2b8d045665645d528d13
+DIST hg-evolve-10.0.1.tar.gz 810363 BLAKE2B 8d9de203262a90a37120f2a0fd4ec29352719f8aca6ca91138a5efa99087ec0084d4ed8b1f828f6df49dd93d2c3d3327119e8f4f17815e5fd1022af6b7a1f803 SHA512 0ab0d64962671f2a107a0b5d56d3c8ec3d29325ac425ee109c1e08d899c1c4124af5676deb60bb4e82f9786474c47f587fec267e27b741b9f73ab18fc473ecc6
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 98108d859b7b..38b09c2b07e9 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,3 +1,3 @@
 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
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 a697c004c723..000000000000
--- a/games-board/teg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST teg-0.11.2.tar.gz 5790172 BLAKE2B 8a8084307a278b7b4aa7df7ce416f53b7bcc2dabb5ef13441810dbbe1d545819d4662028947d88d95e225f8e5f7d0ea8a06d6891d874fb88512233e70976e2fa SHA512 ac31b074eb0ff007ba34fc62043200701d6a481e8ad5eb323a111d0a93b998aa69ce3972780ce3bd212729ffd72229eb1a3ef3e73a9c0c6ceedd16c16107f4f2
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/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/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/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 f4e67a4a2da1..a5142954819c 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1 +1,2 @@
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
+DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
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 f99202fd8f11..57c16f64589d 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1 +1,2 @@
 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
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 fc54f9f2dbf0..1847a81b6075 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1 +1,2 @@
 DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
+DIST yelp-3.36.0.tar.xz 1538076 BLAKE2B d3f8817a54506997581ddc5477c87e2b61be0303c275e9174602a005838f141b1b7ad1904b682dfe3cf1118aaf497abbbfc855c5b57e2f7f3fdf6108a90f3ef1 SHA512 533916c61f6c0c830ddd21533c4462bea8493c76246092b1d77fa145f29cda15ae01817a4ac680bdf61ed591513320faf48e0aa727567c677fdb0ad66b6fa0c8
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/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/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/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 5158282ef9fb..7b68da8ed01b 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.2.tar.xz 1039304 BLAKE2B de4052117bdade42fc489cf35ed9f4af4dfe8c1704dea36f2fa36ee8b14b4dd355052d0e9cdc0f32de9dde81e74862d1c10f7fcdde12db8f5e68d4e377e6f5f1 SHA512 c52dea38b8fa483344a840fb0f6eab04fdeb2dfc5f2a554f9fc095ed175c45f4c355fe7f04dceca4446ac483a1e97db2a296b947fb99315fc388a45e6298d7f0
 DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
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 5a47c9ad8d23..19b40567aff3 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 a6034e82c69a..a4739c91e194 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,2 +1 @@
-DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
 DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
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 5b357c514f6a..204a1e46a229 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,2 @@
 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
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 358537a45f1d..78db5f868ac0 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1 +1,2 @@
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
+DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
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 1e06d2b3619a..5d943f080fff 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1 +1,2 @@
+DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
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/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/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/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/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/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/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/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/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/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/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/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/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 bf661020206e..fc911a9a94bb 100644
--- a/media-plugins/ams-lv2/Manifest
+++ b/media-plugins/ams-lv2/Manifest
@@ -1,2 +1,2 @@
-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
+DIST ams-lv2-1.2.2.tar.gz 488234 BLAKE2B 1dfeaa2708bda64aadb00d8ec5f57fd3a7dd35a1fdce5fb2289f52f00fd73d25a11f39c91823c9322a5cd625ff369c4b05fd9de300b1635e172aefabb02825ea SHA512 6c1c6f3179a851f67e162d225a761c38678159d9f178d9bfa3991b84b84ea557f5a44882ea710626204f158c40ae18f0e87f24faec0a0bd6aa64e18eeb81c45f
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/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 16546e6ba2ea..1e2fef6f4711 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,2 +1,3 @@
 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
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 6439ed1d0656..4aa240742c00 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -2,3 +2,5 @@ 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
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 36696ab4fc08..dd0489659ecd 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,2 +1,3 @@
 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
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 4d58c84f983e..de4fd0118868 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -2,3 +2,4 @@ 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
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/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/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/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/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/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/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/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/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/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/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/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/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/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 910df0fff27f..b52eb2a23f64 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,6 @@
-DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 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
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 9fb583bc5d73..1ce2070a1a30 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1 +1,2 @@
 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1
+DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
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/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/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 fbeef715f566..000000000000
--- a/media-sound/guimup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST guimup_0.3.2_src.tar.gz 587543 BLAKE2B 8b8cfc3c6a42360320b44b42710b29ef0038de535d9f1004d19cbfb7d326a8e0f6e87ff1274791dac9960e4ca306299008f3324075c1f2374ce1a46749c757b0 SHA512 64f56b189e17c60432199d72e658ac2091d051d9cde7e53da7f89b96aadb006121a123bdde7ec80634c0b263e3d68ca1517592dda5a55cddf747c8ce85a535e2
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/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 7f5ce5681f39..b820c6aa8d64 100644
--- a/media-sound/music-file-organizer/Manifest
+++ b/media-sound/music-file-organizer/Manifest
@@ -1 +1 @@
-DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0
+DIST music-file-organizer-1.0.3.tar.xz 501856 BLAKE2B 17ceda10c7afa7902272d76b7fa547c13da6aa21d106d2de8c125a48746da310e40d315854874fa182b22318574905199d0b2143e7cd5e9bb9fa64aa4a5ac498 SHA512 9a219af094475c93b0a156c1ba01643c603a598283bf12d7d05c6ee2da96ee8055d0bd7d1ae047651a72e347a4e5580f324acc6466df13495e3c3ab2e6baceef
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/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/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 38056a349916..886aca0080be 100644
--- a/media-sound/vmpk/Manifest
+++ b/media-sound/vmpk/Manifest
@@ -1 +1,2 @@
 DIST vmpk-0.6.2a.tar.bz2 452963 BLAKE2B 490a8f39d2a9f9eeef51abe4d090942a26aa9b84514da8b8852b3abf23bec1c5b8d71c48e456be6a6ac17ae20609440e40dc7a9b62bb4e24e495fe952e608f87 SHA512 89ba161c3ca7ae260d02c175d1116bea7cdfdfddb0f303d8b9177eeb3d77ded8f6126bed43efa6c279daec0a987d0be30c280d59f42a7c145167fb54a7b8db16
+DIST vmpk-0.7.2.tar.bz2 438006 BLAKE2B 78b1f50ce4ec6a430e4b82b500687261c448043d07fcd8e5a8fabcf0554f0488b7a87abf4a208a1d102a86c7b399c0637210c23f7d5b45a5166d6909aeb26b1f SHA512 69e31d6fd91a6604b7482b18840ed0b274723f380d7fe59827391e9031c3c670cb4e331c8bff01aacf6271973689f0bdb8c1dad4b749524095b398063634a477
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/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/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.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/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.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/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 a576e2cdefd2..8e6ae49f88b8 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,2 +1,3 @@
 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
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 b3725bc37de6..ade79073c5ac 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,4 @@
 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
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 e16303da1b8c..32cf75dd5551 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,4 +1,4 @@
 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
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/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/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 d49b6b5fc1a3..53b2c9de54bf 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1 @@
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
-DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
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/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/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/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/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/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/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/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/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 fe4ad53ee4a4..4a20ae4252f7 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1 +1,2 @@
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
+DIST rss2email-3.12.tar.gz 73830 BLAKE2B b9a891e9fbe1a252e15cf5534e2ec5c19da69f14d7af7dbbc5665c87747882370f23bebed01755d6c96c1446ea61ee287c5cd175459c75cc8a74ad3995e9edf2 SHA512 0523c26f13b147ad4fff9c3a9831bc0b6c2475e7f3a4c010641d2b5110aa6ccfbf00077d70c03805437ba148cdb3593a67c32ef42423af0a71d1380c0c48c917
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/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/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/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/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/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 54c02bf41444..bfe21ffa3f4b 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,3 +1 @@
-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
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/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/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/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/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 0c14569032cb..ec386c36bee7 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,3 +1,4 @@
+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
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/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/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/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/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/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/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/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/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/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 2db51683821c..90d4bb472a93 100644
--- a/sci-libs/minfx/Manifest
+++ b/sci-libs/minfx/Manifest
@@ -1,7 +1 @@
-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
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/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/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/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/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/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/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..acbbf6ecac3a
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -0,0 +1 @@
+DIST xdg-desktop-portal-gtk-1.7.1.tar.xz 369932 BLAKE2B 510652a0025fc27d447a0482552a0ae9c8e08f0471166466356043c026c922b1b0779053bcc7902f041f93ccd71e2e71882594eee7f4dda8cea295e419192941 SHA512 2a2326559a4ed7e44ffddc1a6881c25f14822465f5660bc806e7d8a120d66268e2987329f4bc9f7821329eea41ee96b15a39c5f7ac805a1e04d0604a88b31c08
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 201ccd87ea20..7bd122a1005f 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc
 DIST polkit-0.116.tar.gz 1548311 BLAKE2B e9761a2934136d453a47b81dd1f132f9fc96c45b731d5fceb2aa7706f5325b6499f6acbb68032befc1b21878b1b54754685607c916ca8e02a8accca3ca014b31 SHA512 b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5
+DIST polkit-0.117.tar.gz 1554536 BLAKE2B 1cf7e0ff9db19a29be626f4bea96c9e2ef8b1eab4b8287a5f1f4d2a818b86d58c1c4c4a41849d95e31559dba1b18853a31e934ebbadd8e07f94dfd58b45240e0 SHA512 c10ea984f2386fe436e58a2866e5323afc80d24f744f0ee61d966941259aa491bd96b07d911434aa731b300c3cca25b647804b396501175ab5b3c53384e94c70
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/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/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/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 fcb40a674c22..b906ec41388d 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -3,6 +3,7 @@ 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
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 c44a89fa3930..c2a4006437e1 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -4,6 +4,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
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/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/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/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/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 a39e44529963..1f001a7e7af6 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,2 +1,3 @@
 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
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/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 1f48732750e9..22d2c7fb2d23 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -5,8 +5,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
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/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/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/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/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/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/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/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/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 34bc11517640..cc8c3a14c070 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,7 +4,11 @@ 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
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 750f281ae88f..5603341f59f9 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
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 fb0fff6ae2be..c6c85c0c8314 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
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 5a451ea435ef..4feb7c5b8a3a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -7,6 +7,8 @@ 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
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 d0859979d011..fc0ad059fea7 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,9 +4,9 @@ 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
+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
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 0f32dad92dca..736a2a5593d7 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,6 +1,7 @@
 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
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/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/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/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/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/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/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/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/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/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-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-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/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/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/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/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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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 e69de29bb2d1..000000000000
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/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 3a86ce2d8c4a..10e325e2e9e2 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,2 +1,3 @@
 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
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 671b5fa49449..cae76566f507 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,12 +1,3 @@
-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
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 c464a61d7098..29b9a0b5ed3e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,7 @@
 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
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/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/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/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/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/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 7b7ca0feb3c7..0a3ba78b4cd2 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1,2 @@
+DIST libX11-1.6.10.tar.bz2 2294095 BLAKE2B de615b3fb95e709f3e7b4f91c21b7f29adedb591afd76d8e631ea1d88a54530d799c840de6f5ee1af2a5aa48dfb87bc20dcbed2a2902d707ea3c198ec24d8d86 SHA512 ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff
 DIST libX11-1.6.9.tar.bz2 2283814 BLAKE2B 00fb965b9cd19bde79c4e598c677d21058c85a8ac37d9addab7fb0b2faf67e3d65b91e1864bcd7180e5fd8b0ab7ec3cf68ae7f95ac8e82a049529b5a139b43bd SHA512 fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31
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/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/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/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/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/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/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/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/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/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 f8f176ea99ec..e67d06ea76c2 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1 +1,2 @@
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
+DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76
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 e52751918d81..85bc9df119b8 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
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/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/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/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/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 5996d1caa9fd..e92693d811aa 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,3 +1,5 @@
 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
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
+}